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();
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;
}
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());
// 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();
}
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;
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;
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;
}
/**
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<String, List<Mapping>> mapDeg = new HashMap();
- Map<String, List<Mapping>> mapSrg = new HashMap();
+ Map<String, List<Mapping>> mapDeg = new HashMap<>();
+ Map<String, List<Mapping>> mapSrg = new HashMap<>();
List<Mapping> mappingList = mappingNode.getMapping();
mappingList.sort(Comparator.comparing(Mapping::getLogicalConnectionPoint));
- List<String> nodeShardList = new ArrayList();
+ List<String> nodeShardList = new ArrayList<>();
for (Mapping mapping : mappingList) {
String str = mapping.getLogicalConnectionPoint().split("-")[0];
if (!nodeShardList.contains(str)) {
}
}
for (String str : nodeShardList) {
- List<Mapping> interList = new ArrayList();
+ List<Mapping> interList = new ArrayList<>();
interList = mappingList.stream().filter(x -> x.getLogicalConnectionPoint().contains(str))
.collect(Collectors.toList());
if (str.contains("DEG")) {
// 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<TerminationPoint> tpList = new ArrayList<>();
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());
}
}
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
.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());
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
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());
.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());
}
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);
<bean id="openRoadmTopology22" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology22">
<argument ref="networkTransactionImpl" />
- <argument ref="deviceTransactionManager" />
</bean>
<bean id="openRoadmOtnTopology22" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmOtnTopology22">
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;
amplifiedLinkValues.add(al);
amplifiedLinkValues.add(al2);
Map<Class<? extends Augmentation<Link>>, Augmentation<Link>> map = Collections.emptyMap();
- Augmentation<Link> aug1 = new Link1Builder().setAdministrativeGroup(Long.valueOf(123))
+ Augmentation<Link> 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<Link> 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<Link> 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<Link> 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() {
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;
// 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(),
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<AmplifiedLink> amplifiedLinkList = omsAttributes.getAmplifiedLink()
} 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);
}
}
} 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);
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<LinkConcatenation> linkConcatenationList = span.getLinkConcatenation();
for (LinkConcatenation linkConcatenation : linkConcatenationList) {
double srlgLength = linkConcatenation.getSRLGLength();
}
} 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);
public void setMapFiberIp(Map<String, IpAddress> mapFiberIp) {
this.mapFiberIp = mapFiberIp;
}
-}
\ No newline at end of file
+}
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;
}
tmplType = link1.getLinkType();
+
if (tmplType == null) {
LOG.error("MapUtils: No Link type available. {}", link.getLinkId().getValue());
return null;
}
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());
}
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;
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;
}
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:
boolean used = true;
LOG.info("initSrgTpList: SRG-PP tp = {} found", tp.getTpId().getValue());
try {
- List<UsedWavelength> usedWavelengths = tp1.getPpAttributes().getUsedWavelength();
+ List<UsedWavelength> usedWavelengths = nttp1.getPpAttributes().getUsedWavelength();
if (usedWavelengths.isEmpty()) {
used = false;
}
}
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 !!");
}
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());
.Node.class, new NodeKey(new NodeId(nodeId))).augmentation(Node1.class).build();
}
+ private InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130
+ .Node1> 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<Node1> getNode1FromDatastore(String nodeId) {
InstanceIdentifier<Node1>
nodeIID = createNode1IID(nodeId);
return nodeOpt;
}
+ private Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130
+ .Node1> getNode2FromDatastore(String nodeId) {
+ InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1>
+ nodeIID = createNode2IID(nodeId);
+ Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1> 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<String> nodeIds, Long wavelengthNumber) {
WriteTransaction nodeWriteTx = this.dataBroker.newWriteOnlyTransaction();
for (String nodeId : nodeIds) {
- Optional<Node1> nodeOpt =
- getNode1FromDatastore(nodeId);
- Node1 node;
- if (nodeOpt.isPresent()) {
- node = nodeOpt.get();
+ Optional<Node1> node1Opt = getNode1FromDatastore(nodeId);
+ Node1 node1;
+ Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1> 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();
node1Builder.setDegreeAttributes(degreeAttributesBuilder.build());
break;
case SRG:
- SrgAttributes srgAttributes = node.getSrgAttributes();
+ SrgAttributes srgAttributes = node1.getSrgAttributes();
SrgAttributesBuilder srgAttributesBuilder;
if (srgAttributes == null) {
srgAttributesBuilder = new SrgAttributesBuilder();
private void deleteAvailableWL(List<String> nodeIds, Long wavelengthNumber) {
WriteTransaction nodeWriteTx = this.dataBroker.newWriteOnlyTransaction();
for (String nodeId : nodeIds) {
- Optional<Node1> nodeOpt = getNode1FromDatastore(nodeId);
- Node1 node;
+ Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1> nodeOpt =
+ getNode2FromDatastore(nodeId);
+ org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 node;
if (nodeOpt.isPresent()) {
node = nodeOpt.get();
} else {
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
.augmentation(TerminationPoint1.class);
}
+ private InstanceIdentifierBuilder<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130
+ .TerminationPoint1> 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<TerminationPoint1> getTerminationPoint1FromDatastore(String nodeId, String tpId) {
InstanceIdentifier<TerminationPoint1> tpIID = createTerminationPoint1IIDBuilder(nodeId, tpId).build();
Optional<TerminationPoint1> tpOpt;
return tpOpt;
}
+ private Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130
+ .TerminationPoint1> getTerminationPoint2FromDatastore(String nodeId, String tpId) {
+ InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130
+ .TerminationPoint1> tpIID = createTerminationPoint2IIDBuilder(nodeId, tpId).build();
+ Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1> 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<NodeIdPair> tpIds) {
WriteTransaction deleteUsedWlTx = this.dataBroker.newWriteOnlyTransaction();
for (NodeIdPair idPair : tpIds) {
- Optional<TerminationPoint1> tpOpt = getTerminationPoint1FromDatastore(idPair.getNodeID(), idPair.getTpID());
+ Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130
+ .TerminationPoint1> 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);
FixedFlexImpl fixedFlex = new FixedFlexImpl(wavelengthIndex);
FrequencyTHz centralTHz = new FrequencyTHz(new BigDecimal(fixedFlex.getCenterFrequency()));
for (NodeIdPair idPair : tpIds) {
- Optional<TerminationPoint1> tpOpt = getTerminationPoint1FromDatastore(idPair.getNodeID(), idPair.getTpID());
-
- TerminationPoint1 tp;
- if (tpOpt.isPresent()) {
- tp = tpOpt.get();
+ Optional<TerminationPoint1> tp1Opt =
+ getTerminationPoint1FromDatastore(idPair.getNodeID(), idPair.getTpID());
+ TerminationPoint1 tp1 = null;
+ Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130
+ .TerminationPoint1> 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();
break;
case DEGREERXTTP:
- RxTtpAttributes rxTtpAttributes = tp.getRxTtpAttributes();
+ RxTtpAttributes rxTtpAttributes = null;
+ if (tp1 != null) {
+ rxTtpAttributes = tp1.getRxTtpAttributes();
+ }
RxTtpAttributesBuilder rxTtpAttributesBuilder;
if (rxTtpAttributes == null) {
rxTtpAttributesBuilder = new RxTtpAttributesBuilder();
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();
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();
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();
break;
case XPONDERNETWORK:
- XpdrNetworkAttributes xpdrNetworkAttributes = tp.getXpdrNetworkAttributes();
+ XpdrNetworkAttributes xpdrNetworkAttributes = null;
+ if (tp1 != null) {
+ xpdrNetworkAttributes = tp1.getXpdrNetworkAttributes();
+ }
XpdrNetworkAttributesBuilder xpdrNetworkAttributesBuilder;
if (xpdrNetworkAttributes == null) {
xpdrNetworkAttributesBuilder = new XpdrNetworkAttributesBuilder();
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();
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
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;
}
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:
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,
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() {
}
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
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;
@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:
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());
}
- private static InstanceIdentifierBuilder<TerminationPoint1> createTerminationPoint1IIDBuilder(String nodeId,
- String tpId) {
+ private static InstanceIdentifierBuilder<TerminationPoint1> createTerminationPoint1IIDBuilder(
+ String nodeId, String tpId) {
return InstanceIdentifier
.builder(Networks.class).child(Network.class,
new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
.augmentation(TerminationPoint1.class);
}
+ private static InstanceIdentifierBuilder<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130
+ .TerminationPoint1> 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<TerminationPoint1> 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<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1>
+ 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<Node1> createNode1IID(String nodeId) {
return InstanceIdentifier
.builder(Networks.class)
.build();
}
+ private static InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130
+ .Node1> 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 {
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<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1> 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<Node1> 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<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130
+ .Node1> nodeIID = createNode2IID(nodeId);
+ return (org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1) TransactionUtils
+ .readTransaction(deviceTransactionManager, nodeId, LogicalDatastoreType.CONFIGURATION, nodeIID);
+ }
}
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;
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;
.equals(OpenroadmLinkType.XPONDERINPUT)).collect(Collectors.toList());
List<Node> 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<String, List<String>> clientPortMap = new HashMap<>();
for (Node node : xpdrNodeList) {
}
List<Node> nodeList = otnTopo.getNode();
List<Node> 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<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node> tapiNodeList =
new ArrayList<>();
<network xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
<network-id>openroadm-topology</network-id>
<node> <node-id>OpenROADM-1-1-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-1-1-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-1-1-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-1-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-1-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-1-1</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-1</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-1-2-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-1-2-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-1-2-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-1-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-1-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-1-2</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-2</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-1-3-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-1-3-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-1-3-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-1-3-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-1-3-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-3</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-1-3</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-3</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-1-4-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-1-4-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-1-4-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-1-4-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-1-4-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-4</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-1-4</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-4</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-2-1-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>3</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-2-1-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>3</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-2-1-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>3</index> </available-wavelengths>
<available-wavelengths> <index>5</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-2-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-2-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-2-1</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-1</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-2-2-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>3</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-2-2-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>3</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-2-2-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>3</index> </available-wavelengths>
<available-wavelengths> <index>5</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-2-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-2-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-2-2</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-2</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-2-3-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>3</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-2-3-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>3</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-2-3-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>3</index> </available-wavelengths>
<available-wavelengths> <index>5</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-2-3-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-2-3-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-3</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-2-3</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-3</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-2-4-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>3</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-2-4-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>3</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-2-4-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>3</index> </available-wavelengths>
<available-wavelengths> <index>5</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-2-4-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-2-4-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-4</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>2</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-2-4</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-4</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-3-1-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-3-1-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-3-1-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
<available-wavelengths> <index>12</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-3-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-3-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-3-1</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-1</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-3-2-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-3-2-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-3-2-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
<available-wavelengths> <index>12</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-3-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-3-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-3-2</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-2</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-3-3-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-3-3-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-3-3-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
<available-wavelengths> <index>12</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-3-3-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-3-3-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-3</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-3-3</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-3</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-3-4-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-3-4-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-3-4-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
<available-wavelengths> <index>12</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-3-4-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-3-4-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-4</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-3-4</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-4</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-4-1-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-4-1-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-4-1-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
<available-wavelengths> <index>13</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-4-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-4-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-4-1</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-1</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-4-2-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-4-2-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-4-2-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
<available-wavelengths> <index>13</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-4-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-4-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-4-2</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-2</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-4-3-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-4-3-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-4-3-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
<available-wavelengths> <index>13</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-4-3-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-4-3-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-3</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-4-3</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-3</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-4-4-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-4-4-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-4-4-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
<available-wavelengths> <index>13</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-4-4-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-4-4-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-4</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-4-4</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-4</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-5-1-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-5-1-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-5-1-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
<available-wavelengths> <index>14</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-5-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-5-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-5-1</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-1</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-5-2-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-5-2-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-5-2-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
<available-wavelengths> <index>14</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-5-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-5-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-5-2</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-2</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-5-3-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-5-3-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-5-3-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
<available-wavelengths> <index>14</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-5-3-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-5-3-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-3</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-5-3</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-3</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-5-4-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-5-4-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-5-4-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
- <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type> </termination-point>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+ <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
<available-wavelengths> <index>14</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-5-4-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-5-4-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-4</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
</node>
<node> <node-id>XPONDER-5-4</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-4</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes> </termination-point>
</node>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">10</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<network xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
<network-id>openroadm-topology</network-id>
<node> <node-id>OpenROADM-1-1-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-1-1-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-1-1-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-1-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-1-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-1</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</srg-attributes>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-RX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-TX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
</node>
<node> <node-id>XPONDER-1-1</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-1</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5</tail-equipment-id> </xpdr-client-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-1-2-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-1-2-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-1-2-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>2</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-1-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-1-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-1-2</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>1</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</srg-attributes>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-RX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-TX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
</node>
<node> <node-id>XPONDER-1-2</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-1-2</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id>
</xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5</tail-equipment-id> </xpdr-client-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-2-1-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>3</index> </available-wavelengths>
<available-wavelengths> <index>4</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-2-1-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>3</index> </available-wavelengths>
<available-wavelengths> <index>4</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-2-1-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>3</index> </available-wavelengths>
<available-wavelengths> <index>4</index> </available-wavelengths>
<available-wavelengths> <index>12</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-2-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-2-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-1</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>3</index> </available-wavelengths>
<available-wavelengths> <index>12</index> </available-wavelengths>
</srg-attributes>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-RX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-TX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
</node>
<node> <node-id>XPONDER-2-1</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-1</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5</tail-equipment-id> </xpdr-client-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-2-2-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>3</index> </available-wavelengths>
<available-wavelengths> <index>4</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-2-2-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>3</index> </available-wavelengths>
<available-wavelengths> <index>4</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-2-2-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>3</index> </available-wavelengths>
<available-wavelengths> <index>4</index> </available-wavelengths>
<available-wavelengths> <index>12</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-2-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-2-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-2-2</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>3</index> </available-wavelengths>
<available-wavelengths> <index>12</index> </available-wavelengths>
</srg-attributes>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-RX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-TX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
</node>
<node> <node-id>XPONDER-2-2</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-2-2</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5</tail-equipment-id> </xpdr-client-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-3-1-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-3-1-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-3-1-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
<available-wavelengths> <index>14</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-3-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-3-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-1</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>14</index> </available-wavelengths>
</srg-attributes>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-RX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-TX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
</node>
<node> <node-id>XPONDER-3-1</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-1</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5</tail-equipment-id> </xpdr-client-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-3-2-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-3-2-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-3-2-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>6</index> </available-wavelengths>
<available-wavelengths> <index>14</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-3-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-3-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-3-2</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>5</index> </available-wavelengths>
<available-wavelengths> <index>14</index> </available-wavelengths>
</srg-attributes>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-RX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-TX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
</node>
<node> <node-id>XPONDER-3-2</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-3-2</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5</tail-equipment-id> </xpdr-client-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-4-1-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-4-1-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-4-1-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
<available-wavelengths> <index>16</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-4-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-4-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-1</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>16</index> </available-wavelengths>
</srg-attributes>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-RX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-TX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
</node>
<node> <node-id>XPONDER-4-1</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-1</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5</tail-equipment-id> </xpdr-client-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-4-2-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-4-2-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-4-2-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>8</index> </available-wavelengths>
<available-wavelengths> <index>16</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-4-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-4-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-4-2</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>7</index> </available-wavelengths>
<available-wavelengths> <index>16</index> </available-wavelengths>
</srg-attributes>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-RX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-TX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
</node>
<node> <node-id>XPONDER-4-2</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-4-2</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5</tail-equipment-id> </xpdr-client-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-5-1-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-5-1-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-5-1-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
<available-wavelengths> <index>18</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-5-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-5-1-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-1</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>18</index> </available-wavelengths>
</srg-attributes>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-RX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-TX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
</node>
<node> <node-id>XPONDER-5-1</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-1</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5</tail-equipment-id> </xpdr-client-attributes> </termination-point>
</node>
<node> <node-id>OpenROADM-5-2-DEG1</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-5-2-DEG2</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref> </supporting-node></node>
<node> <node-id>OpenROADM-5-2-DEG3</node-id>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id> <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-CTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id> <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-RX-TTP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id> <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TX-TTP</tp-type></termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>10</index> </available-wavelengths>
<available-wavelengths> <index>18</index> </available-wavelengths>
</degree-attributes>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref> </supporting-node></node>
-<node> <node-id>OpenROADM-5-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+<node> <node-id>OpenROADM-5-2-SRG1</node-id> <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>OpenROADM-5-2</node-ref> </supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths> <index>9</index> </available-wavelengths>
<available-wavelengths> <index>18</index> </available-wavelengths>
</srg-attributes>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-RX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-CP-TX</tp-id> <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-CP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP1-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP2-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP3-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP4-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-RX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-RX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type> </termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>SRG1-PP5-TX</tp-id> <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TX-PP</tp-type> </termination-point>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type> </termination-point>
</node>
<node> <node-id>XPONDER-5-2</node-id>
<supporting-node><network-ref>Transport-underlay</network-ref><node-ref>XPONDER-5-2</node-ref> </supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW1-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-1</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW1</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW2-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-2</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW2</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW3-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-3</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW3</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW4-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-4</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW4</tail-equipment-id> </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-RX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>XPDR-NW5-TX</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id> </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>Client-5</tp-id> <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology"> <tail-equipment-id>XPDR-NW5</tail-equipment-id> </xpdr-client-attributes> </termination-point>
</node>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-1XPDR-NW5-TX-toOpenROADM-1-1-SRG1-SRG1-PP5-RX</link-id>
<source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source> <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP5-TX-to-XPONDER-1-1XPDR-NW5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-1-SRG1-SRG1-PP5-TX-to-XPONDER-1-1XPDR-NW5-RX</link-id>
<source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source> <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW5-TX-toOpenROADM-1-1-SRG1-SRG1-PP5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-1-2XPDR-NW5-TX-toOpenROADM-1-2-SRG1-SRG1-PP5-RX</link-id>
<source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source> <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP5-TX-to-XPONDER-1-2XPDR-NW5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-1-2-SRG1-SRG1-PP5-TX-to-XPONDER-1-2XPDR-NW5-RX</link-id>
<source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source> <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW5-TX-toOpenROADM-1-2-SRG1-SRG1-PP5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-2-DEG2-to-OpenROADM-1-1-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-to-OpenROADM-1-2-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-1-DEG2-to-OpenROADM-1-2-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-to-OpenROADM-1-1-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-1XPDR-NW5-TX-toOpenROADM-2-1-SRG1-SRG1-PP5-RX</link-id>
<source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source> <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP5-TX-to-XPONDER-2-1XPDR-NW5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-1-SRG1-SRG1-PP5-TX-to-XPONDER-2-1XPDR-NW5-RX</link-id>
<source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source> <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW5-TX-toOpenROADM-2-1-SRG1-SRG1-PP5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-2-2XPDR-NW5-TX-toOpenROADM-2-2-SRG1-SRG1-PP5-RX</link-id>
<source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source> <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP5-TX-to-XPONDER-2-2XPDR-NW5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-2-2-SRG1-SRG1-PP5-TX-to-XPONDER-2-2XPDR-NW5-RX</link-id>
<source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source> <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW5-TX-toOpenROADM-2-2-SRG1-SRG1-PP5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-2-DEG2-to-OpenROADM-2-1-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-to-OpenROADM-2-2-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-1-DEG2-to-OpenROADM-2-2-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-to-OpenROADM-2-1-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-1XPDR-NW5-TX-toOpenROADM-3-1-SRG1-SRG1-PP5-RX</link-id>
<source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source> <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP5-TX-to-XPONDER-3-1XPDR-NW5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-1-SRG1-SRG1-PP5-TX-to-XPONDER-3-1XPDR-NW5-RX</link-id>
<source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source> <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW5-TX-toOpenROADM-3-1-SRG1-SRG1-PP5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-3-2XPDR-NW5-TX-toOpenROADM-3-2-SRG1-SRG1-PP5-RX</link-id>
<source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source> <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP5-TX-to-XPONDER-3-2XPDR-NW5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-3-2-SRG1-SRG1-PP5-TX-to-XPONDER-3-2XPDR-NW5-RX</link-id>
<source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source> <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW5-TX-toOpenROADM-3-2-SRG1-SRG1-PP5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-2-DEG2-to-OpenROADM-3-1-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-to-OpenROADM-3-2-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-1-DEG2-to-OpenROADM-3-2-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-to-OpenROADM-3-1-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-1XPDR-NW5-TX-toOpenROADM-4-1-SRG1-SRG1-PP5-RX</link-id>
<source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source> <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP5-TX-to-XPONDER-4-1XPDR-NW5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-1-SRG1-SRG1-PP5-TX-to-XPONDER-4-1XPDR-NW5-RX</link-id>
<source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source> <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW5-TX-toOpenROADM-4-1-SRG1-SRG1-PP5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-4-2XPDR-NW5-TX-toOpenROADM-4-2-SRG1-SRG1-PP5-RX</link-id>
<source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source> <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP5-TX-to-XPONDER-4-2XPDR-NW5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-4-2-SRG1-SRG1-PP5-TX-to-XPONDER-4-2XPDR-NW5-RX</link-id>
<source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source> <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW5-TX-toOpenROADM-4-2-SRG1-SRG1-PP5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-2-DEG2-to-OpenROADM-4-1-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-to-OpenROADM-4-2-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-1-DEG2-to-OpenROADM-4-2-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-to-OpenROADM-4-1-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-1XPDR-NW5-TX-toOpenROADM-5-1-SRG1-SRG1-PP5-RX</link-id>
<source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source> <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP5-TX-to-XPONDER-5-1XPDR-NW5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-1-SRG1-SRG1-PP5-TX-to-XPONDER-5-1XPDR-NW5-RX</link-id>
<source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source> <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW5-TX-toOpenROADM-5-1-SRG1-SRG1-PP5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
<source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
<source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</link-id>
<source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</link-id>
<source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source> <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</link-id>
<source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</link-id>
<source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source> <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</link-id>
<source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</link-id>
<source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source> <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</link-id>
<source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</link-id>
<source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source> <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>XPONDER-5-2XPDR-NW5-TX-toOpenROADM-5-2-SRG1-SRG1-PP5-RX</link-id>
<source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source> <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP5-TX-to-XPONDER-5-2XPDR-NW5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <link-id>OpenROADM-5-2-SRG1-SRG1-PP5-TX-to-XPONDER-5-2XPDR-NW5-RX</link-id>
<source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source> <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
<opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW5-TX-toOpenROADM-5-2-SRG1-SRG1-PP5-RX</opposite-link>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type></link>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-2-DEG2-to-OpenROADM-5-1-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-to-OpenROADM-5-2-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-1-DEG2-to-OpenROADM-5-2-DEG2</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-to-OpenROADM-5-1-DEG2</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-2-DEG3-to-OpenROADM-2-1-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-to-OpenROADM-1-2-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-1-DEG3-to-OpenROADM-1-2-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-to-OpenROADM-2-1-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-2-2-DEG3-to-OpenROADM-3-1-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-to-OpenROADM-2-2-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-1-DEG3-to-OpenROADM-2-2-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-to-OpenROADM-3-1-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-3-2-DEG3-to-OpenROADM-4-1-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-to-OpenROADM-3-2-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-1-DEG3-to-OpenROADM-3-2-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-to-OpenROADM-4-1-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-4-2-DEG3-to-OpenROADM-5-1-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-to-OpenROADM-4-2-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-1-DEG3-to-OpenROADM-4-2-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-to-OpenROADM-5-1-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-5-2-DEG3-to-OpenROADM-1-1-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-to-OpenROADM-5-2-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
<link-id>OpenROADM-1-1-DEG3-to-OpenROADM-5-2-DEG3</link-id>
<opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-to-OpenROADM-1-1-DEG3</opposite-link>
<link-latency xmlns="http://org/openroadm/network/topology">1</link-latency>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
<destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
"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",
"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",
"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",
"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",
"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",
"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",
"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",
"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",
"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",
"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",
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
},
"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",
},
"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",
},
"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",
},
"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",
},
"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",
},
"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",
},
"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",
},
"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",
},
"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",
},
"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",
},
"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",
},
"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",
},
"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",
},
"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",
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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"
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "SRG",
+ "org-openroadm-common-network:node-type": "SRG",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "DEGREE",
+ "org-openroadm-common-network:node-type": "DEGREE",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "DEGREE",
+ "org-openroadm-common-network:node-type": "DEGREE",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "SRG",
+ "org-openroadm-common-network:node-type": "SRG",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "DEGREE",
+ "org-openroadm-common-network:node-type": "DEGREE",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "DEGREE",
+ "org-openroadm-common-network:node-type": "DEGREE",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "DEGREE",
+ "org-openroadm-common-network:node-type": "DEGREE",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "SRG",
+ "org-openroadm-common-network:node-type": "SRG",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "DEGREE",
+ "org-openroadm-common-network:node-type": "DEGREE",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "DEGREE",
+ "org-openroadm-common-network:node-type": "DEGREE",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "DEGREE",
+ "org-openroadm-common-network:node-type": "DEGREE",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "DEGREE",
+ "org-openroadm-common-network:node-type": "DEGREE",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "SRG",
+ "org-openroadm-common-network:node-type": "SRG",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "DEGREE",
+ "org-openroadm-common-network:node-type": "DEGREE",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "DEGREE",
+ "org-openroadm-common-network:node-type": "DEGREE",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "SRG",
+ "org-openroadm-common-network:node-type": "SRG",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "DEGREE",
+ "org-openroadm-common-network:node-type": "DEGREE",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "DEGREE",
+ "org-openroadm-common-network:node-type": "DEGREE",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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": {
}
]
},
- "org-openroadm-network-topology:node-type": "DEGREE",
+ "org-openroadm-common-network:node-type": "DEGREE",
"supporting-node": [
{
"network-ref":"openroadm-network",
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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",
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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",
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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",
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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",
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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"
}
"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",
<source-node>ROADMA01-DEG2</source-node>
<source-tp>DEG2-CTP-TXRX</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</link-id>
<source-node>ROADMC01-SRG1</source-node>
<source-tp>SRG1-CP-TXRX</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</link-id>
<source-node>ROADMA01-SRG1</source-node>
<source-tp>SRG1-CP-TXRX</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX</link-id>
<source-node>XPDRA01-XPDR1</source-node>
<source-tp>XPDR1-NETWORK1</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</link-id>
<source-node>ROADMA01-DEG1</source-node>
<source-tp>DEG1-CTP-TXRX</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</link-id>
<source-node>ROADMC01-DEG2</source-node>
<source-tp>DEG2-CTP-TXRX</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</link-id>
<source-node>ROADMC01-DEG1</source-node>
<source-tp>DEG1-CTP-TXRX</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</link-id>
<source-node>ROADMA01-DEG1</source-node>
<source-tp>DEG1-CTP-TXRX</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</link-id>
<source-node>ROADMA01-DEG2</source-node>
<source-tp>DEG2-CTP-TXRX</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</link-id>
</link-concatenation>
</span>
</OMS-attributes>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<link-latency xmlns="http://org/openroadm/common/network">0</link-latency>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<source-node>ROADMA01-SRG1</source-node>
<source-tp>SRG1-PP1-TXRX</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</link-id>
</link-concatenation>
</span>
</OMS-attributes>
- <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
<link-latency xmlns="http://org/openroadm/common/network">0</link-latency>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<source-node>ROADMC01-DEG1</source-node>
<source-tp>DEG1-CTP-TXRX</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</link-id>
<source-node>ROADMC01-SRG1</source-node>
<source-tp>SRG1-CP-TXRX</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</link-id>
<source-node>ROADMC01-DEG2</source-node>
<source-tp>DEG2-CTP-TXRX</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>ROADMC01-SRG1-SRG1-PP1-TXRXtoXPDRC01-XPDR1-XPDR1-NETWORK1</link-id>
<source-node>ROADMC01-SRG1</source-node>
<source-tp>SRG1-PP1-TXRX</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</link-id>
<source-node>ROADMA01-SRG1</source-node>
<source-tp>SRG1-CP-TXRX</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<link-id>XPDRC01-XPDR1-XPDR1-NETWORK1toROADMC01-SRG1-SRG1-PP1-TXRX</link-id>
<source-node>XPDRC01-XPDR1</source-node>
<source-tp>XPDR1-NETWORK1</source-tp>
</source>
- <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type>
+ <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
</link>
<network-types>
<openroadm-common-network xmlns="http://org/openroadm/common/network"></openroadm-common-network>
<node-id>ROADMC01-SRG1</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP12-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP15-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP1-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP2-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-CP-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-CP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP5-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP8-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP6-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP9-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP3-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP10-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP14-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP16-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP7-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP11-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP13-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP4-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<supporting-node>
<network-ref>openroadm-network</network-ref>
<index>28</index>
</available-wavelengths>
</srg-attributes>
- <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
</node>
<node>
<node-id>ROADMC01-DEG1</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>DEG1-CTP-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>DEG1-TTP-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
</termination-point>
<supporting-node>
<network-ref>openroadm-network</network-ref>
<node-ref>ROADMC01</node-ref>
</supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<degree-number>1</degree-number>
<available-wavelengths>
<node-id>ROADMC01-DEG2</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>DEG2-TTP-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>DEG2-CTP-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
</termination-point>
<supporting-node>
<network-ref>openroadm-network</network-ref>
<node-ref>ROADMC01</node-ref>
</supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<degree-number>2</degree-number>
<available-wavelengths>
<node-id>ROADMA01-SRG1</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP12-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP15-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP1-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP2-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-CP-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-CP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP5-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP8-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP6-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP9-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP3-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP10-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP14-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP16-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP7-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP11-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP13-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP4-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
</termination-point>
<supporting-node>
<network-ref>openroadm-network</network-ref>
<index>28</index>
</available-wavelengths>
</srg-attributes>
- <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
</node>
<node>
<node-id>XPDRA01-XPDR1</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>XPDR1-NETWORK2</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
</xpdr-client-attributes>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>XPDR1-CLIENT2</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>XPDR1-NETWORK2</tail-equipment-id>
</xpdr-client-attributes>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>XPDR1-CLIENT1</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
</xpdr-client-attributes>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>XPDR1-NETWORK1</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
</xpdr-client-attributes>
<network-ref>openroadm-network</network-ref>
<node-ref>XPDRA01</node-ref>
</supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
</node>
<node>
<node-id>ROADMA01-DEG2</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>DEG2-TTP-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>DEG2-CTP-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
</termination-point>
<supporting-node>
<network-ref>openroadm-network</network-ref>
<node-ref>ROADMA01</node-ref>
</supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<degree-number>2</degree-number>
<available-wavelengths>
<node-id>XPDRC01-XPDR1</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>XPDR1-NETWORK2</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
</xpdr-client-attributes>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>XPDR1-CLIENT2</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>XPDR1-NETWORK2</tail-equipment-id>
</xpdr-client-attributes>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>XPDR1-CLIENT1</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
</xpdr-client-attributes>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>XPDR1-NETWORK1</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
<xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
<tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
</xpdr-client-attributes>
<network-ref>openroadm-network</network-ref>
<node-ref>XPDRC01</node-ref>
</supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
</node>
<node>
<node-id>ROADMA01-DEG1</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>DEG1-CTP-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
</termination-point>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>DEG1-TTP-TXRX</tp-id>
- <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+ <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
</termination-point>
<supporting-node>
<network-ref>openroadm-network</network-ref>
<node-ref>ROADMA01</node-ref>
</supporting-node>
- <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
+ <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<degree-number>1</degree-number>
<available-wavelengths>
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)
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):
'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)
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:
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)
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'):
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
#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'])
#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'])
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'])
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'])
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
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:
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
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
'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'},
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'):
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)
'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)
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']
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':
'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
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'):
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')
#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'])
#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'])
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'])
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'])
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:
'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)
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:"
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)
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')
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):
'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)
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:
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)
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'):
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
#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'])
#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'])
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'])
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'])
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
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:
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
'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'},
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'):
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)
'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)
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']
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':
# 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
# 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')
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'):
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')
#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'])
#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'])
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'])
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'])
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:
'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)
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:"