package org.opendaylight.transportpce.networkmodel.util;
-import com.google.common.collect.ImmutableList;
-
+import com.google.common.collect.ImmutableMap;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-
import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.transportpce.common.NetworkUtils;
import org.opendaylight.transportpce.networkmodel.dto.OtnTopoNode;
import org.opendaylight.transportpce.networkmodel.dto.TopologyShard;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.XpdrNodeTypes;
-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.OduSwitchingPoolsBuilder;
-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.topology.types.rev181130.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingListBuilder;
-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;
-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.network.types.rev181130.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.ODTU4TsAllocated;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.ODU0;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.ODU2e;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.ODU4;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.OduRateIdentity;
-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.Link1Builder;
-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.Node1Builder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.TerminationPoint1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.TerminationPoint1Builder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.SwitchingPools;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.SwitchingPoolsBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.TpBandwidthSharing;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.TpBandwidthSharingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.XpdrAttributes;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.XpdrAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.termination.point.TpSupportedInterfaces;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.termination.point.TpSupportedInterfacesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.termination.point.XpdrTpPortConnectionAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181130.If100GE;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181130.If100GEODU4;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181130.If10GEODU2e;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181130.IfOCHOTU4ODU4;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181130.SupportedIfCapability;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.switching.pool.types.rev181130.SwitchingPoolTypes;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev181130.xpdr.otn.tp.attributes.OdtuTpnPoolBuilder;
-import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.OtnLinkType;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.XpdrNodeTypes;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.OduSwitchingPools;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.OduSwitchingPoolsBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.OduSwitchingPoolsKey;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingListBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingListKey;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmLinkType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmNodeType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmTpType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.xpdr.tp.supported.interfaces.SupportedInterfaceCapability;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityKey;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODTU4TsAllocated;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODTUCnTs;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODU0;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODU2;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODU2e;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODU4;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.OdtuTypeIdentity;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.OduRateIdentity;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Link1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Link1Builder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Node1Builder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.TerminationPoint1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.TerminationPoint1Builder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.SwitchingPoolsBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.TpBandwidthSharingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.XpdrAttributesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.termination.point.TpSupportedInterfacesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.termination.point.XpdrTpPortConnectionAttributesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.SupportedIfCapability;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.switching.pool.types.rev191129.SwitchingPoolTypes;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev200529.xpdr.otn.tp.attributes.OdtuTpnPool;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev200529.xpdr.otn.tp.attributes.OdtuTpnPoolBuilder;
+import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.OtnLinkType;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId;
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.networks.network.node.TerminationPointKey;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.termination.point.SupportingTerminationPoint;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.termination.point.SupportingTerminationPointBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.termination.point.SupportingTerminationPointKey;
import org.opendaylight.yangtools.yang.common.Uint16;
import org.opendaylight.yangtools.yang.common.Uint32;
import org.slf4j.Logger;
private static final String CLIENT = "-CLIENT";
private static final String NETWORK = "-NETWORK";
private static final String XPDR = "-XPDR";
+ private static final String OTN_PARAMS_ERROR = "Error with otn parameters of supported link {}";
private static final int NB_TRIB_PORTS = 80;
private static final int NB_TRIB_SLOTS = 80;
- private static final int NB_TRIB_SLOT_PER_10GE = 8;
+
+ private static Map<String, Class<? extends OduRateIdentity>> rateMap = Map.of(
+ "If100GEODU4", ODU4.class,
+ "IfOCHOTU4ODU4", ODU4.class,
+ "If1GEODU0", ODU0.class,
+ "If10GEODU2", ODU2.class,
+ "If10GEODU2e", ODU2e.class);
+ private static Map<OtnLinkType, Long> otnLinkTypeBwMap = Map.of(
+ OtnLinkType.ODTU4, 100000L,
+ OtnLinkType.ODUC4, 400000L,
+ OtnLinkType.ODUC3, 300000L,
+ OtnLinkType.ODUC2, 200000L);
+ private static Map<OtnLinkType, Long> otnOtuLinkTypeBwMap = Map.of(
+ OtnLinkType.OTU4, 100000L,
+ OtnLinkType.OTUC4, 400000L);
+ private static Map<Uint32, Long> serviceRateBwIncrMap = Map.of(
+ Uint32.valueOf(1), 1000L,
+ Uint32.valueOf(10), 10000L,
+ Uint32.valueOf(100), 100000L);
+ private static Map<Uint32, Class<? extends OdtuTypeIdentity>> serviceRateOdtuTypeClassMap = Map.of(
+ Uint32.valueOf(1), ODTU4TsAllocated.class,
+ Uint32.valueOf(10), ODTU4TsAllocated.class,
+ Uint32.valueOf(100), ODTUCnTs.class);
private OpenRoadmOtnTopology() {
}
}
public static TopologyShard createOtnLinks(String nodeA, String tpA, String nodeZ, String tpZ,
- OtnLinkType linkType) {
- List<Link> links = null;
- if (OtnLinkType.OTU4.equals(linkType)) {
- links = initialiseOtnLinks(nodeA, tpA, nodeZ, tpZ, linkType, "OTU4");
+ OtnLinkType linkType) {
+
+ return new TopologyShard(
+ null,
+ otnOtuLinkTypeBwMap.containsKey(linkType)
+ ? initialiseOtnLinks(nodeA, tpA, nodeZ, tpZ, linkType)
+ : null);
+ }
+
+ public static TopologyShard createOtnLinks(
+ org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.renderer.rpc.result.sp
+ .Link notifLink,
+ OtnLinkType linkType) {
+
+ return new TopologyShard(
+ null,
+ initialiseOtnLinks(notifLink.getATermination().getNodeId(),
+ notifLink.getATermination().getTpId(),
+ notifLink.getZTermination().getNodeId(),
+ notifLink.getZTermination().getTpId(),
+ linkType));
+ }
+
+ public static TopologyShard createOtnLinks(
+ org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.renderer.rpc.result.sp
+ .Link notifLink,
+ List<Link> supportedOtu4links, List<TerminationPoint> supportedTPs, OtnLinkType linkType) {
+
+ if (otnOtuLinkTypeBwMap.containsKey(linkType)) {
+ return new TopologyShard(
+ null,
+ initialiseOtnLinks(
+ notifLink.getATermination().getNodeId(), notifLink.getATermination().getTpId(),
+ notifLink.getZTermination().getNodeId(), notifLink.getZTermination().getTpId(), linkType));
+ } else if (otnLinkTypeBwMap.containsKey(linkType)) {
+ List<Link> links = initialiseOtnLinks(
+ notifLink.getATermination().getNodeId(), notifLink.getATermination().getTpId(),
+ notifLink.getZTermination().getNodeId(), notifLink.getZTermination().getTpId(), linkType);
+ links.addAll(updateOtnLinkBwParameters(supportedOtu4links, linkType));
+ List<TerminationPoint> updatedTPs = new ArrayList<>();
+ for (TerminationPoint tp : supportedTPs) {
+ updatedTPs.add(updateTp(tp, true, linkType));
+ }
+ return new TopologyShard(null, links, updatedTPs);
+ } else {
+ return null;
}
- return new TopologyShard(null, links);
}
- public static TopologyShard createOtnLinks(List<Link> suppOtu4Links, List<TerminationPoint> oldTps) {
+ public static TopologyShard createOtnLinks(List<Link> suppOtuLinks, List<TerminationPoint> oldTps,
+ OtnLinkType linkType) {
+
List<Link> links = new ArrayList<>();
- for (Link link : suppOtu4Links) {
- if (link.augmentation(Link1.class) != null
- && link.augmentation(Link1.class).getAvailableBandwidth().equals(Uint32.valueOf(100000))) {
- links.add(updateOtnLinkBwParameters(link, 0L, 100000L));
- } else {
- LOG.error("Error with otn parameters of supported link {}", link.getLinkId().getValue());
+ for (Link link : suppOtuLinks) {
+ if (link.augmentation(Link1.class) == null) {
+ LOG.error("Error with OTN parameters of supported link {}", link.getLinkId().getValue());
+ continue;
+ }
+ if (!otnLinkTypeBwMap.containsKey(linkType)) {
+ LOG.error("Error with link {} : unsupported OTN link type", link.getLinkId().getValue());
+ continue;
+ }
+ if (link.augmentation(Link1.class).getAvailableBandwidth().longValue() < otnLinkTypeBwMap.get(linkType)) {
+ LOG.error("Error with link {} : unsufficient available bandwith", link.getLinkId().getValue());
+ continue;
}
+ links.add(updateOtnLinkBwParameters(link, 0L, otnLinkTypeBwMap.get(linkType)));
}
if (links.size() == 2) {
- links.addAll(initialiseOtnLinks(suppOtu4Links.get(0).getSource().getSourceNode().getValue(),
- suppOtu4Links.get(0).getSource().getSourceTp().toString(),
- suppOtu4Links.get(0).getDestination().getDestNode().getValue(),
- suppOtu4Links.get(0).getDestination().getDestTp().toString(),
- OtnLinkType.ODTU4, "ODU4"));
+ links.addAll(initialiseOtnLinks(suppOtuLinks.get(0).getSource().getSourceNode().getValue(),
+ suppOtuLinks.get(0).getSource().getSourceTp().getValue(),
+ suppOtuLinks.get(0).getDestination().getDestNode().getValue(),
+ suppOtuLinks.get(0).getDestination().getDestTp().getValue(),
+ linkType));
}
List<TerminationPoint> tps = new ArrayList<>();
for (TerminationPoint tp : oldTps) {
- tps.add(updateTp(tp, true));
- }
- if (links.size() == 4 && tps.size() == 2) {
- return new TopologyShard(null, links, tps);
- } else {
- return new TopologyShard(null, null, null);
+ tps.add(updateTp(tp, true, linkType));
}
+ return links.size() == 4 && tps.size() == 2
+ ? new TopologyShard(null, links, tps)
+ : new TopologyShard(null, null, null);
}
- public static TopologyShard updateOtnLinks(List<Link> suppOdu4Links, List<TerminationPoint> oldTps,
- String serviceRate, Short tribPortNb, Short tribSoltNb, boolean isDeletion) {
+ public static TopologyShard updateOtnLinks(List<Link> suppOduLinks, List<TerminationPoint> oldTps,
+ Uint32 serviceRate, Short tribPortNb, Short minTribSlotNb, Short maxTribSlotNb, boolean isDeletion) {
+
List<Link> links = new ArrayList<>();
- for (Link link : suppOdu4Links) {
- if (link.augmentation(Link1.class) != null && link.augmentation(Link1.class).getAvailableBandwidth() != null
- && link.augmentation(Link1.class).getUsedBandwidth() != null) {
- Long avlBwIncr = 10000L;
- Long usedBwIncr = 10000L;
- if ("1G".equals(serviceRate)) {
- avlBwIncr = 1000L;
- usedBwIncr = 1000L;
- }
+ if (!serviceRateBwIncrMap.containsKey(serviceRate)) {
+ LOG.warn("Error with not managed service rate {}", serviceRate.toString());
+ return new TopologyShard(null, null, null);
+ }
+ Long bwIncr = serviceRateBwIncrMap.get(serviceRate);
+ for (Link link : suppOduLinks) {
+ if (link.augmentation(Link1.class) == null
+ || link.augmentation(Link1.class).getAvailableBandwidth() == null
+ || link.augmentation(Link1.class).getUsedBandwidth() == null) {
+ LOG.error(OTN_PARAMS_ERROR, link.getLinkId().getValue());
+ } else {
Uint32 avlBw = link.augmentation(Link1.class).getAvailableBandwidth();
Uint32 usedBw = link.augmentation(Link1.class).getUsedBandwidth();
- if (isDeletion) {
- links.add(updateOtnLinkBwParameters(link, avlBw.toJava() + avlBwIncr,
- usedBw.toJava() - usedBwIncr));
- } else {
- links.add(updateOtnLinkBwParameters(link, avlBw.toJava() - avlBwIncr,
- usedBw.toJava() + usedBwIncr));
+ if (avlBw.toJava() < bwIncr) {
+ bwIncr = 0L;
}
- } else {
- LOG.error("Error with otn parameters of supported link {}", link.getLinkId().getValue());
+ links.add(
+ isDeletion
+ ? updateOtnLinkBwParameters(link, avlBw.toJava() + bwIncr, usedBw.toJava() - bwIncr)
+ : updateOtnLinkBwParameters(link, avlBw.toJava() - bwIncr, usedBw.toJava() + bwIncr)
+ );
}
}
List<TerminationPoint> tps = new ArrayList<>();
for (TerminationPoint tp : oldTps) {
- tps.add(updateNodeTpTsPool(tp, serviceRate, tribPortNb, tribSoltNb, isDeletion));
+ if (bwIncr > 0L) {
+ tps.add(updateNodeTpTsPool(tp, serviceRate, tribPortNb, minTribSlotNb, maxTribSlotNb, isDeletion));
+ }
}
- if (!links.isEmpty() && !tps.isEmpty()) {
- return new TopologyShard(null, links, tps);
- } else {
+ if (links.isEmpty() || tps.isEmpty()) {
+ LOG.error("unable to update otn links");
return new TopologyShard(null, null, null);
+ } else {
+ return new TopologyShard(null, links, tps);
}
}
- public static TopologyShard deleteOtnLinks(List<Link> suppOtu4Links, List<TerminationPoint> oldTps) {
+ public static TopologyShard updateOtnLinks(List<Link> suppOtuLinks, boolean isDeletion) {
+
List<Link> links = new ArrayList<>();
- for (Link link : suppOtu4Links) {
- if (link.augmentation(Link1.class) != null) {
- links.add(updateOtnLinkBwParameters(link, 100000L, 0L));
+ for (Link link : suppOtuLinks) {
+ if (link.augmentation(Link1.class) == null
+ || link.augmentation(Link1.class).getAvailableBandwidth() == null
+ || link.augmentation(Link1.class).getUsedBandwidth() == null) {
+ LOG.error(OTN_PARAMS_ERROR, link.getLinkId().getValue());
} else {
- LOG.error("Error with otn parameters of supported link {}", link.getLinkId().getValue());
+ links.add(
+ isDeletion
+ ? updateOtnLinkBwParameters(link, Long.valueOf(100000), Long.valueOf(0))
+ : updateOtnLinkBwParameters(link, Long.valueOf(0), Long.valueOf(100000))
+ );
+ }
+ }
+ if (links.isEmpty()) {
+ LOG.error("unable to update otn links");
+ return new TopologyShard(null, null, null);
+ } else {
+ return new TopologyShard(null, links, null);
+ }
+ }
+
+ public static TopologyShard deleteOtnLinks(List<Link> suppOtuLinks, List<TerminationPoint> oldTps,
+ OtnLinkType linkType) {
+
+ List<Link> links = new ArrayList<>();
+ for (Link link : suppOtuLinks) {
+ if (link.augmentation(Link1.class) == null
+ || link.augmentation(
+ org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1.class) == null) {
+ LOG.error(OTN_PARAMS_ERROR, link.getLinkId().getValue());
+ return new TopologyShard(null, null, null);
+ }
+ OtnLinkType otnLinkType = link.augmentation(
+ org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1.class).getOtnLinkType();
+ if (!otnOtuLinkTypeBwMap.containsKey(otnLinkType)) {
+ //TODO shouldn't other link type listed in otnLinkTypeBwMap be handled too ?
+ LOG.warn("Unexpected otn-link-type {} for link {}", otnLinkType, link.getLinkId());
+ continue;
}
+ links.add(updateOtnLinkBwParameters(link, otnOtuLinkTypeBwMap.get(otnLinkType) , 0L));
}
List<TerminationPoint> tps = new ArrayList<>();
for (TerminationPoint tp : oldTps) {
- tps.add(updateTp(tp, false));
- }
- if (links.size() == 2 && tps.size() == 2) {
- return new TopologyShard(null, links, tps);
- } else {
- return new TopologyShard(null, null, null);
+ tps.add(updateTp(tp, false, linkType));
}
+ return
+ links.isEmpty() || tps.isEmpty()
+ ? new TopologyShard(null, null, null)
+ : new TopologyShard(null, links, tps);
}
private static List<Link> initialiseOtnLinks(String nodeA, String tpA, String nodeZ, String tpZ,
- OtnLinkType linkType, String linkIdPrefix) {
+ OtnLinkType linkType) {
+
List<Link> links = new ArrayList<>();
- org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.Link1 tpceLink1
- = new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.Link1Builder()
- .setOtnLinkType(linkType).build();
- Link1 otnLink1 = new Link1Builder()
- .setLinkType(OpenroadmLinkType.OTNLINK)
- .setAvailableBandwidth(Uint32.valueOf(100000))
- .setUsedBandwidth(Uint32.valueOf(0))
- .build();
- // create link A-Z
- String nodeATopo;
- String nodeZTopo;
- if (nodeA.contains(XPDR) && nodeZ.contains(XPDR)) {
- nodeATopo = nodeA;
- nodeZTopo = nodeZ;
+ String nodeATopo = formatNodeName(nodeA, tpA);
+ String nodeZTopo = formatNodeName(nodeZ, tpZ);
+ org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1 tpceLink1
+ = new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1Builder()
+ .setOtnLinkType(linkType).build();
+ Link1Builder otnLink1Bldr = new Link1Builder()
+ .setUsedBandwidth(Uint32.valueOf(0));
+ if (otnOtuLinkTypeBwMap.containsKey(linkType)) {
+ otnLink1Bldr.setAvailableBandwidth(Uint32.valueOf(otnOtuLinkTypeBwMap.get(linkType)));
+ } else if (otnLinkTypeBwMap.containsKey(linkType)) {
+ otnLink1Bldr.setAvailableBandwidth(Uint32.valueOf(otnLinkTypeBwMap.get(linkType)));
} else {
- nodeATopo = nodeA + "-" + tpA.split("-")[0];
- nodeZTopo = nodeZ + "-" + tpZ.split("-")[0];
+ LOG.error("unable to set available bandwidth to unknown link type");
}
- LinkBuilder ietfLinkAZBldr = TopologyUtils.createLink(nodeATopo, nodeZTopo, tpA, tpZ, linkIdPrefix);
- ietfLinkAZBldr.addAugmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.Link1.class,
- tpceLink1)
- .addAugmentation(Link1.class, otnLink1);
- links.add(ietfLinkAZBldr.build());
+ // create link A-Z
+ LinkBuilder ietfLinkAZBldr = TopologyUtils.createLink(nodeATopo, nodeZTopo, tpA, tpZ, linkType.getName());
+ links.add(ietfLinkAZBldr
+ .addAugmentation(tpceLink1)
+ .addAugmentation(otnLink1Bldr.build())
+ .addAugmentation(
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder(
+ ietfLinkAZBldr.augmentation(
+ org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1.class))
+ .setLinkType(OpenroadmLinkType.OTNLINK)
+ .setOperationalState(State.InService)
+ .setAdministrativeState(AdminStates.InService)
+ .build())
+ .build());
// create link Z-A
- LinkBuilder ietfLinkZABldr = TopologyUtils.createLink(nodeZTopo, nodeATopo, tpZ, tpA, linkIdPrefix);
- ietfLinkZABldr.addAugmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.Link1.class,
- tpceLink1)
- .addAugmentation(Link1.class, otnLink1);
- links.add(ietfLinkZABldr.build());
+ LinkBuilder ietfLinkZABldr = TopologyUtils.createLink(nodeZTopo, nodeATopo, tpZ, tpA, linkType.getName());
+ links.add(ietfLinkZABldr
+ .addAugmentation(tpceLink1)
+ .addAugmentation(otnLink1Bldr.build())
+ .addAugmentation(
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder(
+ ietfLinkZABldr.augmentation(
+ org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1.class))
+ .setLinkType(OpenroadmLinkType.OTNLINK)
+ .setOperationalState(State.InService)
+ .setAdministrativeState(AdminStates.InService)
+ .build())
+ .build());
return links;
}
private static Link updateOtnLinkBwParameters(Link link, Long availBw, Long usedBw) {
+
LOG.debug("in updateOtnLinkBwParameters with availBw = {}, usedBw = {}", availBw, usedBw);
- LinkBuilder updatedLinkBldr = new LinkBuilder(link);
- Link1Builder updatedLink1Bldr = new Link1Builder(link.augmentation(Link1.class))
- .setAvailableBandwidth(Uint32.valueOf(availBw))
- .setUsedBandwidth(Uint32.valueOf(usedBw));
- updatedLinkBldr.addAugmentation(Link1.class, updatedLink1Bldr.build());
- return updatedLinkBldr.build();
+ return new LinkBuilder(link)
+ .addAugmentation(
+ new Link1Builder(link.augmentation(Link1.class))
+ .setAvailableBandwidth(Uint32.valueOf(availBw))
+ .setUsedBandwidth(Uint32.valueOf(usedBw))
+ .build())
+ .build();
}
- private static TerminationPoint updateTp(TerminationPoint originalTp, boolean addingTsTpnPoolTermination) {
+ private static List<Link> updateOtnLinkBwParameters(List<Link> supportedLinks, OtnLinkType linkType) {
+
+ LOG.debug("in updateOtnLinkBwParameters with supportedLinks = {}, linkType = {}", supportedLinks, linkType);
+ List<Link> updatedlinks = new ArrayList<>();
+ for (Link link : supportedLinks) {
+ updatedlinks.add(
+ new LinkBuilder(link)
+ .addAugmentation(new Link1Builder(link.augmentation(Link1.class))
+ .setAvailableBandwidth(Uint32.valueOf(0))
+ .setUsedBandwidth(
+ otnLinkTypeBwMap.containsKey(linkType)
+ ? Uint32.valueOf(otnLinkTypeBwMap.get(linkType))
+ : Uint32.valueOf(0))
+ .build())
+ .build());
+ }
+ return updatedlinks;
+ }
+
+ private static TerminationPoint updateTp(TerminationPoint originalTp, boolean addingTsTpnPoolTermination,
+ OtnLinkType linkType) {
+
LOG.debug("in updateTp");
TerminationPointBuilder tpBldr = new TerminationPointBuilder(originalTp);
- TerminationPoint1Builder otnTp1Bldr = new TerminationPoint1Builder(
- tpBldr.augmentation(TerminationPoint1.class));
- XpdrTpPortConnectionAttributesBuilder xtpcaBldr = new XpdrTpPortConnectionAttributesBuilder(otnTp1Bldr
- .getXpdrTpPortConnectionAttributes());
+ TerminationPoint1Builder otnTp1Bldr =
+ new TerminationPoint1Builder(tpBldr.augmentation(TerminationPoint1.class));
+ XpdrTpPortConnectionAttributesBuilder xtpcaBldr =
+ new XpdrTpPortConnectionAttributesBuilder(otnTp1Bldr.getXpdrTpPortConnectionAttributes());
if (addingTsTpnPoolTermination) {
List<Uint16> tsPool = new ArrayList<>();
- for (int i = 0; i < NB_TRIB_SLOTS; i++) {
- tsPool.add(Uint16.valueOf(i + 1));
+ for (int i = 1; i <= NB_TRIB_SLOTS; i++) {
+ tsPool.add(Uint16.valueOf(i));
}
xtpcaBldr.setTsPool(tsPool);
List<Uint16> tpnPool = new ArrayList<>();
- for (int i = 1; i <= NB_TRIB_PORTS; i++) {
+ int nbTribPort = NB_TRIB_PORTS;
+ if (OtnLinkType.ODUC4.equals(linkType)) {
+ nbTribPort = 4;
+ }
+ for (int i = 1; i <= nbTribPort; i++) {
tpnPool.add(Uint16.valueOf(i));
}
- xtpcaBldr.setOdtuTpnPool(ImmutableList.of(new OdtuTpnPoolBuilder().setOdtuType(ODTU4TsAllocated.class)
- .setTpnPool(tpnPool).build()));
+ OdtuTpnPool oduTpnPool = new OdtuTpnPoolBuilder()
+ .setOdtuType(ODTU4TsAllocated.class)
+ .setTpnPool(tpnPool)
+ .build();
+ xtpcaBldr.setOdtuTpnPool(ImmutableMap.of(oduTpnPool.key(),oduTpnPool));
} else {
xtpcaBldr.setTsPool(null);
- xtpcaBldr.setOdtuTpnPool(null);
+ xtpcaBldr.setOdtuTpnPool(ImmutableMap.of());
}
- return tpBldr.addAugmentation(TerminationPoint1.class,
- otnTp1Bldr.setXpdrTpPortConnectionAttributes(xtpcaBldr.build()).build()).build();
+ return tpBldr.addAugmentation(otnTp1Bldr.setXpdrTpPortConnectionAttributes(xtpcaBldr.build()).build()).build();
}
- private static TerminationPoint updateNodeTpTsPool(TerminationPoint tp, String serviceRate, Short tribPortNb,
- Short tribSlotNb, boolean isDeletion) {
+ private static TerminationPoint updateNodeTpTsPool(TerminationPoint tp, Uint32 serviceRate, Short tribPortNb,
+ Short minTribSlotNb, Short maxTribSlotNb, boolean isDeletion) {
+
LOG.debug("in updateNodeTpTsPool");
TerminationPointBuilder tpBldr = new TerminationPointBuilder(tp);
@Nullable
- XpdrTpPortConnectionAttributesBuilder xtpcaBldr = new XpdrTpPortConnectionAttributesBuilder(
- tpBldr.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes());
+ XpdrTpPortConnectionAttributesBuilder xtpcaBldr =
+ new XpdrTpPortConnectionAttributesBuilder(
+ tpBldr.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes());
List<Uint16> tsPool = new ArrayList<>(xtpcaBldr.getTsPool());
- switch (serviceRate) {
- case "1G":
- if (isDeletion) {
- tsPool.add(Uint16.valueOf(tribSlotNb));
- } else {
- tsPool.remove(Uint16.valueOf(tribSlotNb));
- }
- break;
- case "10G":
- if (isDeletion) {
- for (int i = 0; i < NB_TRIB_SLOT_PER_10GE; i++) {
- tsPool.add(Uint16.valueOf(tribSlotNb + i));
- }
- } else {
- for (int i = 0; i < NB_TRIB_SLOT_PER_10GE; i++) {
- tsPool.remove(Uint16.valueOf(tribSlotNb + i));
- }
- }
- break;
- default:
- LOG.error("error updating tpn and ts pool for tp {}", tp.getTpId().getValue());
- break;
+ if (isDeletion) {
+ for (int i = minTribSlotNb; i <= maxTribSlotNb; i++) {
+ tsPool.add(Uint16.valueOf(i));
+ }
+ } else {
+ for (int i = minTribSlotNb; i <= maxTribSlotNb; i++) {
+ tsPool.remove(Uint16.valueOf(i));
+ }
}
xtpcaBldr.setTsPool(tsPool);
List<Uint16> tpnPool;
- if (xtpcaBldr.getOdtuTpnPool().get(0).getTpnPool() != null) {
- tpnPool = new ArrayList<>(xtpcaBldr.getOdtuTpnPool().get(0).getTpnPool());
+ List<OdtuTpnPool> odtuTpnPoolValues = new ArrayList<>(xtpcaBldr.getOdtuTpnPool().values());
+ if (odtuTpnPoolValues.get(0).getTpnPool() == null) {
+ tpnPool = new ArrayList<>();
+ } else {
+ tpnPool = new ArrayList<>(odtuTpnPoolValues.get(0).getTpnPool());
if (isDeletion) {
tpnPool.add(Uint16.valueOf(tribPortNb));
} else {
tpnPool.remove(Uint16.valueOf(tribPortNb));
}
+ }
+ Class<? extends OdtuTypeIdentity> odtuType;
+ if (serviceRateOdtuTypeClassMap.containsKey(serviceRate)) {
+ odtuType = serviceRateOdtuTypeClassMap.get(serviceRate);
} else {
- tpnPool = new ArrayList<>();
+ odtuType = null;
+ LOG.warn("Unable to set the odtu-type");
}
- xtpcaBldr.setOdtuTpnPool(ImmutableList.of(new OdtuTpnPoolBuilder().setOdtuType(ODTU4TsAllocated.class)
- .setTpnPool(tpnPool).build()));
-
- tpBldr.addAugmentation(TerminationPoint1.class,
- new TerminationPoint1Builder().setXpdrTpPortConnectionAttributes(xtpcaBldr.build()).build());
- return tpBldr.build();
+ OdtuTpnPool odtuTpnPool = new OdtuTpnPoolBuilder()
+ .setOdtuType(odtuType)
+ .setTpnPool(tpnPool)
+ .build();
+ return tpBldr
+ .addAugmentation(
+ new TerminationPoint1Builder(tp.augmentation(TerminationPoint1.class))
+ .setXpdrTpPortConnectionAttributes(
+ xtpcaBldr
+ .setOdtuTpnPool(ImmutableMap.of(odtuTpnPool.key(),odtuTpnPool))
+ .build())
+ .build())
+ .build();
}
private static Map<Integer, OtnTopoNode> convertPortMappingToOtnNodeList(Nodes mappingNode) {
- List<Mapping> networkMappings = mappingNode.getMapping().stream().filter(k -> k.getLogicalConnectionPoint()
- .contains("NETWORK")).collect(Collectors.toList());
+
+ List<Mapping> networkMappings =
+ mappingNode.nonnullMapping().values().stream()
+ .filter(k -> k.getLogicalConnectionPoint().contains("NETWORK"))
+ .collect(Collectors.toList());
Map<Integer, OtnTopoNode> xpdrMap = new HashMap<>();
for (Mapping mapping : networkMappings) {
Integer xpdrNb = Integer.parseInt(mapping.getLogicalConnectionPoint().split("XPDR")[1].split("-")[0]);
if (!xpdrMap.containsKey(xpdrNb)) {
- List<Mapping> xpdrNetMaps = mappingNode.getMapping().stream().filter(k -> k.getLogicalConnectionPoint()
- .contains("XPDR" + xpdrNb + NETWORK)).collect(Collectors.toList());
- List<Mapping> xpdrClMaps = mappingNode.getMapping().stream().filter(k -> k.getLogicalConnectionPoint()
- .contains("XPDR" + xpdrNb + CLIENT)).collect(Collectors.toList());
- OtnTopoNode otnNode = null;
- if (mapping.getXponderType() != null) {
- otnNode = new OtnTopoNode(mappingNode.getNodeId(), mappingNode.getNodeInfo().getNodeClli(), xpdrNb,
- mapping.getXponderType(), fillConnectionMapLcp(xpdrNetMaps), fillConnectionMapLcp(xpdrClMaps));
- } else {
- otnNode = new OtnTopoNode(mappingNode.getNodeId(), mappingNode.getNodeInfo().getNodeClli(), xpdrNb,
- XpdrNodeTypes.Tpdr, fillConnectionMapLcp(xpdrNetMaps), fillConnectionMapLcp(xpdrClMaps));
- }
- xpdrMap.put(xpdrNb, otnNode);
+ List<Mapping> xpdrNetMaps =
+ mappingNode.nonnullMapping().values().stream()
+ .filter(k -> k.getLogicalConnectionPoint().contains("XPDR" + xpdrNb + NETWORK))
+ .collect(Collectors.toList());
+ List<Mapping> xpdrClMaps =
+ mappingNode.nonnullMapping().values().stream()
+ .filter(k -> k.getLogicalConnectionPoint().contains("XPDR" + xpdrNb + CLIENT))
+ .collect(Collectors.toList());
+ xpdrMap.put(
+ xpdrNb,
+ new OtnTopoNode(
+ mappingNode.getNodeId(),
+ mappingNode.getNodeInfo().getNodeClli(),
+ xpdrNb,
+ mapping.getXponderType() == null
+ ? XpdrNodeTypes.Tpdr
+ : mapping.getXponderType(),
+ fillConnectionMapLcp(xpdrNetMaps),
+ fillConnectionMapLcp(xpdrClMaps),
+ xpdrNetMaps,
+ xpdrClMaps
+ ));
}
}
LOG.debug("there are {} xpdr to build", xpdrMap.size());
- xpdrMap.forEach((k, v) -> LOG.debug("xpdr {} = {} - {} - {} - {}", k, v.getNodeId(), v.getNodeType(),
- v.getNbTpClient(), v.getNbTpNetwork()));
+ xpdrMap.forEach((k, v) -> LOG.debug("xpdr {} = {} - {} - {} - {}",
+ k, v.getNodeId(), v.getNodeType(), v.getNbTpClient(), v.getNbTpNetwork()));
return xpdrMap;
}
private static Map<String, String> fillConnectionMapLcp(List<Mapping> mappingList) {
+
Map<String, String> xpdrConnectionMap = new HashMap<>();
for (Mapping map : mappingList) {
- if (map.getConnectionMapLcp() != null) {
- xpdrConnectionMap.put(map.getLogicalConnectionPoint(), map.getConnectionMapLcp());
- } else {
- xpdrConnectionMap.put(map.getLogicalConnectionPoint(), null);
- }
+ xpdrConnectionMap.put(map.getLogicalConnectionPoint(), map.getConnectionMapLcp());
}
return xpdrConnectionMap;
}
private static Node createTpdr(OtnTopoNode node) {
- // create otn-topology node augmentation
- XpdrAttributes xpdrAttr = new XpdrAttributesBuilder()
- .setXpdrNumber(Uint16.valueOf(node.getXpdrNb()))
- .build();
- Node1 otnNodeAug = new Node1Builder()
- .setXpdrAttributes(xpdrAttr)
- .build();
- org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 ocnNodeAug =
- new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder()
- .setNodeType(OpenroadmNodeType.TPDR).build();
- // create ietf node augmentation to add TP list
- List<TerminationPoint> tpList = new ArrayList<>();
- // creation of tps
- createTP(tpList, node, OpenroadmTpType.XPONDERCLIENT, If100GE.class, false);
- createTP(tpList, node, OpenroadmTpType.XPONDERNETWORK, IfOCHOTU4ODU4.class, true);
-
- org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1 ietfNodeAug =
- new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1Builder()
- .setTerminationPoint(tpList)
- .build();
+ // prepare ietf node augmentation to add TP list
+ Map<TerminationPointKey,TerminationPoint> tpMap = new HashMap<>();
+ createTP(tpMap, node, OpenroadmTpType.XPONDERCLIENT, false);
+ createTP(tpMap, node, OpenroadmTpType.XPONDERNETWORK, true);
// return ietfNode
return new NodeBuilder()
.setNodeId(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))
.withKey(new NodeKey(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())))
.setSupportingNode(createSupportingNodes(node))
- .addAugmentation(Node1.class, otnNodeAug)
- .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class,
- ocnNodeAug)
.addAugmentation(
- org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1.class,
- ietfNodeAug)
+ new Node1Builder()
+ .setXpdrAttributes(
+ new XpdrAttributesBuilder()
+ .setXpdrNumber(Uint16.valueOf(node.getXpdrNb()))
+ .build())
+ .build())
+ .addAugmentation(
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder()
+ .setNodeType(OpenroadmNodeType.TPDR)
+ .setOperationalState(State.InService)
+ .setAdministrativeState(AdminStates.InService)
+ .build())
+ .addAugmentation(
+ new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226
+ .Node1Builder()
+ .setTerminationPoint(tpMap)
+ .build())
.build();
}
private static Node createMuxpdr(OtnTopoNode node) {
- // create otn-topology node augmentation
- // TODO: will need to be completed
- TpBandwidthSharing tpBwSh = new TpBandwidthSharingBuilder().build();
- XpdrAttributes xpdrAttr = new XpdrAttributesBuilder()
- .setXpdrNumber(Uint16.valueOf(node.getXpdrNb()))
- .build();
- List<NonBlockingList> nblList = new ArrayList<>();
+ // prepare otn-topology node augmentation
+ // TODO: will need to be completed
+ Map<NonBlockingListKey, NonBlockingList> nbMap = new HashMap<>();
for (int i = 1; i <= node.getNbTpClient(); i++) {
List<TpId> tpList = new ArrayList<>();
- TpId tpId = new TpId("XPDR" + node.getXpdrNb() + CLIENT + i);
- tpList.add(tpId);
- tpId = new TpId("XPDR" + node.getXpdrNb() + "-NETWORK1");
- tpList.add(tpId);
+ tpList.add(new TpId("XPDR" + node.getXpdrNb() + CLIENT + i));
+ tpList.add(new TpId("XPDR" + node.getXpdrNb() + "-NETWORK1"));
NonBlockingList nbl = new NonBlockingListBuilder()
.setNblNumber(Uint16.valueOf(i))
.setTpList(tpList)
.setAvailableInterconnectBandwidth(Uint32.valueOf(node.getNbTpNetwork() * 10L))
.setInterconnectBandwidthUnit(Uint32.valueOf(1000000000))
.build();
- nblList.add(nbl);
+ nbMap.put(nbl.key(),nbl);
}
OduSwitchingPools oduSwitchPool = new OduSwitchingPoolsBuilder()
.setSwitchingPoolNumber(Uint16.valueOf(1))
.setSwitchingPoolType(SwitchingPoolTypes.NonBlocking)
- .setNonBlockingList(nblList)
- .build();
- List<OduSwitchingPools> oduSwitchPoolList = new ArrayList<>();
- oduSwitchPoolList.add(oduSwitchPool);
- SwitchingPools switchingPools = new SwitchingPoolsBuilder()
- .setOduSwitchingPools(oduSwitchPoolList)
- .build();
- Node1 otnNodeAug = new Node1Builder()
- .setTpBandwidthSharing(tpBwSh)
- .setXpdrAttributes(xpdrAttr)
- .setSwitchingPools(switchingPools)
- .build();
- org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 ocnNodeAug =
- new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder()
- .setNodeType(OpenroadmNodeType.MUXPDR).build();
-
- // create ietf node augmentation to add TP list
- List<TerminationPoint> tpList = new ArrayList<>();
- // creation of tps
- createTP(tpList, node, OpenroadmTpType.XPONDERCLIENT, If10GEODU2e.class, true);
- createTP(tpList, node, OpenroadmTpType.XPONDERNETWORK, IfOCHOTU4ODU4.class, true);
-
- org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1 ietfNodeAug =
- new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1Builder()
- .setTerminationPoint(tpList)
+ .setNonBlockingList(nbMap)
.build();
-
+ // prepare ietf node augmentation to add TP list
+ Map<TerminationPointKey, TerminationPoint> tpMap = new HashMap<>();
+ createTP(tpMap, node, OpenroadmTpType.XPONDERCLIENT, true);
+ createTP(tpMap, node, OpenroadmTpType.XPONDERNETWORK, true);
// return ietfNode
return new NodeBuilder()
.setNodeId(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))
.withKey(new NodeKey(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())))
.setSupportingNode(createSupportingNodes(node))
- .addAugmentation(Node1.class, otnNodeAug)
- .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class,
- ocnNodeAug)
.addAugmentation(
- org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1.class,
- ietfNodeAug)
+ new Node1Builder()
+ .setTpBandwidthSharing(new TpBandwidthSharingBuilder().build())
+ .setXpdrAttributes(
+ new XpdrAttributesBuilder()
+ .setXpdrNumber(Uint16.valueOf(node.getXpdrNb()))
+ .build())
+ .setSwitchingPools(
+ new SwitchingPoolsBuilder()
+ .setOduSwitchingPools(Map.of(oduSwitchPool.key(),oduSwitchPool))
+ .build())
+ .build())
+ .addAugmentation(
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder()
+ .setNodeType(OpenroadmNodeType.MUXPDR)
+ .setAdministrativeState(AdminStates.InService)
+ .setOperationalState(State.InService)
+ .build())
+ .addAugmentation(
+ new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226
+ .Node1Builder()
+ .setTerminationPoint(tpMap)
+ .build())
.build();
}
private static Node createSwitch(OtnTopoNode node) {
+
List<TpId> tpl = new ArrayList<>();
- TpId tpId = null;
for (int i = 1; i <= node.getNbTpClient(); i++) {
- tpId = new TpId("XPDR" + node.getXpdrNb() + CLIENT + i);
- tpl.add(tpId);
+ tpl.add(new TpId("XPDR" + node.getXpdrNb() + CLIENT + i));
}
for (int i = 1; i <= node.getNbTpNetwork(); i++) {
- tpId = new TpId("XPDR" + node.getXpdrNb() + NETWORK + i);
- tpl.add(tpId);
+ tpl.add(new TpId("XPDR" + node.getXpdrNb() + NETWORK + i));
}
- List<NonBlockingList> nblList = new ArrayList<>();
+ Map<NonBlockingListKey, NonBlockingList> nbMap = new HashMap<>();
NonBlockingList nbl = new NonBlockingListBuilder()
.setNblNumber(Uint16.valueOf(1))
.setTpList(tpl)
.build();
- nblList.add(nbl);
-
+ nbMap.put(nbl.key(),nbl);
OduSwitchingPools oduSwitchPool = new OduSwitchingPoolsBuilder()
.setSwitchingPoolNumber(Uint16.valueOf(1))
.setSwitchingPoolType(SwitchingPoolTypes.NonBlocking)
- .setNonBlockingList(nblList)
- .build();
- List<OduSwitchingPools> oduSwitchPoolList = new ArrayList<>();
- oduSwitchPoolList.add(oduSwitchPool);
- SwitchingPools switchingPools = new SwitchingPoolsBuilder()
- .setOduSwitchingPools(oduSwitchPoolList)
- .build();
-
- // create otn-topology node augmentation
- // TODO: will need to be completed
- TpBandwidthSharing tpBwSh = new TpBandwidthSharingBuilder().build();
- XpdrAttributes xpdrAttr = new XpdrAttributesBuilder()
- .setXpdrNumber(Uint16.valueOf(node.getXpdrNb()))
- .build();
-
- Node1 otnNodeAug = new Node1Builder()
- .setTpBandwidthSharing(tpBwSh)
- .setXpdrAttributes(xpdrAttr)
- .setSwitchingPools(switchingPools)
- .build();
- org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 ocnNodeAug =
- new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder()
- .setNodeType(OpenroadmNodeType.SWITCH).build();
-
- // create ietf node augmentation to add TP list
- List<TerminationPoint> tpList = new ArrayList<>();
- // creation of tps
- createTP(tpList, node, OpenroadmTpType.XPONDERCLIENT, If100GEODU4.class, true);
- createTP(tpList, node, OpenroadmTpType.XPONDERNETWORK, IfOCHOTU4ODU4.class, true);
- org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1 ietfNodeAug =
- new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1Builder()
- .setTerminationPoint(tpList)
+ .setNonBlockingList(nbMap)
.build();
-
+ Map<OduSwitchingPoolsKey, OduSwitchingPools> oduSwitchPoolList = new HashMap<>();
+ oduSwitchPoolList.put(oduSwitchPool.key(),oduSwitchPool);
+ // prepare ietf node augmentation to add TP list
+ Map<TerminationPointKey, TerminationPoint> tpMap = new HashMap<>();
+ createTP(tpMap, node, OpenroadmTpType.XPONDERCLIENT, true);
+ createTP(tpMap, node, OpenroadmTpType.XPONDERNETWORK, true);
// return ietfNode
return new NodeBuilder()
.setNodeId(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))
.withKey(new NodeKey(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())))
.setSupportingNode(createSupportingNodes(node))
- .addAugmentation(Node1.class, otnNodeAug)
- .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class,
- ocnNodeAug)
.addAugmentation(
- org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1.class,
- ietfNodeAug)
+ new Node1Builder()
+ .setTpBandwidthSharing(new TpBandwidthSharingBuilder().build())
+ .setXpdrAttributes(
+ new XpdrAttributesBuilder()
+ .setXpdrNumber(Uint16.valueOf(node.getXpdrNb()))
+ .build())
+ .setSwitchingPools(
+ new SwitchingPoolsBuilder()
+ .setOduSwitchingPools(oduSwitchPoolList)
+ .build())
+ .build())
+ .addAugmentation(
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder()
+ .setNodeType(OpenroadmNodeType.SWITCH)
+ .setOperationalState(State.InService)
+ .setAdministrativeState(AdminStates.InService)
+ .build())
+ .addAugmentation(
+ new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226
+ .Node1Builder()
+ .setTerminationPoint(tpMap)
+ .build())
.build();
}
- private static void createTP(List<TerminationPoint> tpList, OtnTopoNode node, OpenroadmTpType tpType,
- Class<? extends SupportedIfCapability> ifCapType, boolean withRate) {
- long nbTps = 0;
- if (OpenroadmTpType.XPONDERCLIENT.equals(tpType)) {
- nbTps = node.getNbTpClient();
- } else if (OpenroadmTpType.XPONDERNETWORK.equals(tpType)) {
- nbTps = node.getNbTpNetwork();
- } else {
- LOG.warn("Wrong tp-type {}, cannot create tp {}", tpType, tpType.getName());
+ private static void createTP(Map<TerminationPointKey, TerminationPoint> tpMap,
+ OtnTopoNode node, OpenroadmTpType tpType, boolean withRate) {
+
+ List<Mapping> mappings = null;
+ switch (tpType) {
+ case XPONDERNETWORK:
+ mappings = node.getXpdrNetMappings();
+ break;
+ case XPONDERCLIENT:
+ mappings = node.getXpdrClMappings();
+ break;
+ default:
+ LOG.error("Error with Termination Point type {}", tpType);
+ return;
}
+ fillTpMap(tpMap, node, tpType, withRate, mappings);
+ }
- for (int i = 1; i <= nbTps; i++) {
- // openroadm-otn-topoology augmentation
- SupportedInterfaceCapability supIfCapa = new SupportedInterfaceCapabilityBuilder()
- .setIfCapType(ifCapType)
- .build();
- List<SupportedInterfaceCapability> supIfCapaList = new ArrayList<>();
- supIfCapaList.add(supIfCapa);
- TpSupportedInterfaces tpSupIf = new TpSupportedInterfacesBuilder()
- .setSupportedInterfaceCapability(supIfCapaList)
- .build();
+ private static void fillTpMap(Map<TerminationPointKey, TerminationPoint> tpMap, OtnTopoNode node,
+ OpenroadmTpType tpType, boolean withRate, List<Mapping> mappings) {
- XpdrTpPortConnectionAttributesBuilder xtpcaBldr = new XpdrTpPortConnectionAttributesBuilder();
- if (withRate) {
- xtpcaBldr.setRate(fixRate(ifCapType));
+ for (Mapping mapping : mappings) {
+ // openroadm-otn-topoology augmentation
+ Map<SupportedInterfaceCapabilityKey, SupportedInterfaceCapability> supIfMap = new HashMap<>();
+ TerminationPoint1Builder otnTp1Bldr = new TerminationPoint1Builder();
+ if (mapping.getSupportedInterfaceCapability() == null) {
+ LOG.warn("mapping {} of node {} has no if-cap-type",
+ mapping.getLogicalConnectionPoint(), node.getNodeId());
+ } else {
+ XpdrTpPortConnectionAttributesBuilder xtpcaBldr = new XpdrTpPortConnectionAttributesBuilder();
+ for (Class<? extends SupportedIfCapability> supInterCapa : mapping.getSupportedInterfaceCapability()) {
+ SupportedInterfaceCapability supIfCapa = new SupportedInterfaceCapabilityBuilder()
+ .withKey(new SupportedInterfaceCapabilityKey(supInterCapa))
+ .setIfCapType(supInterCapa)
+ .build();
+ supIfMap.put(supIfCapa.key(), supIfCapa);
+ }
+ otnTp1Bldr.setTpSupportedInterfaces(
+ new TpSupportedInterfacesBuilder()
+ .setSupportedInterfaceCapability(supIfMap)
+ .build()
+ );
+ //TODO: It is not logical to assign a priori one of the possible rate to the TP.
+ //Would be worth assigning per default "unallocated" at the tp creation step,
+ //and updating it with correct rate when it supports a specific service.
+ if (withRate) {
+ otnTp1Bldr.setXpdrTpPortConnectionAttributes(
+ xtpcaBldr.setRate(fixRate(mapping.getSupportedInterfaceCapability())).build());
+ }
}
- TerminationPoint1 otnTp1 = new TerminationPoint1Builder()
- .setTpSupportedInterfaces(tpSupIf)
- .setXpdrTpPortConnectionAttributes(xtpcaBldr.build())
- .build();
- org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.TerminationPoint1Builder tpceTp1Bldr =
- new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.TerminationPoint1Builder();
- if (OpenroadmTpType.XPONDERNETWORK.equals(tpType)) {
- TpId tpId = new TpId("XPDR" + node.getXpdrNb() + NETWORK + i);
+ setclientNwTpAttr(
+ tpMap,
+ node,
+ new TpId(mapping.getLogicalConnectionPoint()),
+ tpType,
+ otnTp1Bldr.build(),
+ new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1Builder(),
+ mapping);
+ }
+ }
+
+ private static void setclientNwTpAttr(Map<TerminationPointKey, TerminationPoint> tpMap, OtnTopoNode node, TpId tpId,
+ OpenroadmTpType tpType, TerminationPoint1 otnTp1,
+ org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1Builder tpceTp1Bldr,
+ Mapping mapping) {
+
+ switch (tpType) {
+ case XPONDERNETWORK:
if (node.getXpdrNetConnectionMap().get(tpId.getValue()) != null) {
tpceTp1Bldr.setAssociatedConnectionMapPort(node.getXpdrNetConnectionMap().get(tpId.getValue()));
}
SupportingTerminationPoint stp = new SupportingTerminationPointBuilder()
.setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))
.setNodeRef(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))
- .setTpRef("XPDR" + node.getXpdrNb() + NETWORK + i)
+ .setTpRef(tpId)
.build();
- List<SupportingTerminationPoint> supportTpList = new ArrayList<>();
- supportTpList.add(stp);
- tpList.add(buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, supportTpList));
- } else if (OpenroadmTpType.XPONDERCLIENT.equals(tpType)) {
- TpId tpId = new TpId("XPDR" + node.getXpdrNb() + CLIENT + i);
+ TerminationPoint ietfTpNw =
+ buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, Map.of(stp.key(), stp), mapping);
+ tpMap.put(ietfTpNw.key(),ietfTpNw);
+ break;
+ case XPONDERCLIENT:
if (node.getXpdrCliConnectionMap().get(tpId.getValue()) != null) {
tpceTp1Bldr.setAssociatedConnectionMapPort(node.getXpdrCliConnectionMap().get(tpId.getValue()));
}
- tpList.add(buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, null));
- }
+ TerminationPoint ietfTpCl = buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, null, mapping);
+ tpMap.put(ietfTpCl.key(),ietfTpCl);
+ break;
+ default:
+ LOG.error("Undefined tpType for Termination point {} of {}", tpId.getValue(), node.getNodeId());
+ break;
}
}
- private static Class<? extends OduRateIdentity> fixRate(Class<? extends SupportedIfCapability> ifCapaType) {
- switch (ifCapaType.getSimpleName()) {
- case "If100GEODU4":
- case "IfOCHOTU4ODU4":
- return ODU4.class;
- case "If1GEODU0":
- return ODU0.class;
- case "If10GEODU2e":
- return ODU2e.class;
- default:
- return null;
+ private static Class<? extends OduRateIdentity> fixRate(List<Class<? extends SupportedIfCapability>> list) {
+
+ for (Class<? extends SupportedIfCapability> class1 : list) {
+ if (rateMap.containsKey(class1.getSimpleName())) {
+ return rateMap.get(class1.getSimpleName());
+ }
}
+ return null;
}
- private static List<SupportingNode> createSupportingNodes(OtnTopoNode node) {
+ private static Map<SupportingNodeKey,SupportingNode> createSupportingNodes(OtnTopoNode node) {
+
SupportingNode suppNode1 = new SupportingNodeBuilder()
.setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID))
.setNodeRef(new NodeId(node.getNodeId()))
- .withKey(new SupportingNodeKey(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID),
- new NodeId(node.getNodeId())))
+ .withKey(
+ new SupportingNodeKey(
+ new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID),
+ new NodeId(node.getNodeId())))
.build();
SupportingNode suppNode2 = new SupportingNodeBuilder()
.setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))
.setNodeRef(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))
- .withKey(new SupportingNodeKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID),
- new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())))
+ .withKey(
+ new SupportingNodeKey(
+ new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID),
+ new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())))
.build();
SupportingNode suppNode3 = new SupportingNodeBuilder()
.setNetworkRef(new NetworkId(NetworkUtils.CLLI_NETWORK_ID))
.setNodeRef(new NodeId(node.getClli()))
- .withKey(new SupportingNodeKey(new NetworkId(NetworkUtils.CLLI_NETWORK_ID),
- new NodeId(node.getClli())))
+ .withKey(
+ new SupportingNodeKey(
+ new NetworkId(NetworkUtils.CLLI_NETWORK_ID),
+ new NodeId(node.getClli())))
.build();
- List<SupportingNode> suppNodeList = new ArrayList<>();
- suppNodeList.add(suppNode1);
- suppNodeList.add(suppNode2);
- suppNodeList.add(suppNode3);
- return suppNodeList;
+ Map<SupportingNodeKey,SupportingNode> suppNodeMap = new HashMap<>();
+ suppNodeMap.put(suppNode1.key(),suppNode1);
+ suppNodeMap.put(suppNode2.key(),suppNode2);
+ suppNodeMap.put(suppNode3.key(),suppNode3);
+ return suppNodeMap;
}
private static TerminationPoint buildIetfTp(
- org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.TerminationPoint1Builder tpceTp1Bldr,
- TerminationPoint1 otnTp1, OpenroadmTpType tpType, TpId tpId,
- List<SupportingTerminationPoint> supportTpList) {
+ org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1Builder tpceTp1Bldr,
+ TerminationPoint1 otnTp1, OpenroadmTpType tpType, TpId tpId,
+ Map<SupportingTerminationPointKey, SupportingTerminationPoint> supportTpMap, Mapping mapping) {
TerminationPointBuilder ietfTpBldr = new TerminationPointBuilder();
if (tpceTp1Bldr.getAssociatedConnectionMapPort() != null) {
- ietfTpBldr.addAugmentation(
- org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.TerminationPoint1.class,
- tpceTp1Bldr.build());
+ ietfTpBldr.addAugmentation(tpceTp1Bldr.build());
}
- if (supportTpList != null) {
- ietfTpBldr.setSupportingTerminationPoint(supportTpList);
+ if (supportTpMap != null) {
+ ietfTpBldr.setSupportingTerminationPoint(supportTpMap);
}
- org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1 ocnTp =
- new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder()
- .setTpType(tpType).build();
-
- ietfTpBldr.setTpId(tpId)
+ return ietfTpBldr
+ .setTpId(tpId)
.withKey(new TerminationPointKey(tpId))
- .addAugmentation(TerminationPoint1.class, otnTp1)
+ .addAugmentation(otnTp1)
.addAugmentation(
- org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1.class,
- ocnTp);
- return ietfTpBldr.build();
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder()
+ .setTpType(tpType)
+ .setAdministrativeState(TopologyUtils.setNetworkAdminState(mapping.getPortAdminState()))
+ .setOperationalState(TopologyUtils.setNetworkOperState(mapping.getPortOperState()))
+ .build())
+ .build();
+ }
+
+ private static String formatNodeName(String nodeName, String tpName) {
+
+ return nodeName.contains(XPDR)
+ ? nodeName
+ : new StringBuilder(nodeName).append("-").append(tpName.split("-")[0]).toString();
}
}
Code Review / transportpce.git / blobdiff