X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2Futil%2FOpenRoadmOtnTopology.java;h=3f1b5388a6a2c96475560a45608ace57ece6f6fa;hb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;hp=785a872d2f5d6664b2239b922c27142abf83574c;hpb=38da8caec743f447c641ce0f414c242a5ece363b;p=transportpce.git diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java index 785a872d2..3f1b5388a 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java @@ -8,49 +8,70 @@ package org.opendaylight.transportpce.networkmodel.util; +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.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.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.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.opendaylight.transportpce.portmapping.rev210315.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.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.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.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.Node1; +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.SwitchingPools; +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.TpBandwidthSharing; +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.XpdrAttributes; +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.TpSupportedInterfaces; +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.If100GE; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If100GEODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If10GE; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If10GEODU2; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If10GEODU2e; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If1GE; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If1GEODU0; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If400GE; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCH; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCHOTU4ODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOTUCnODUCn; +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.rev201019.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; @@ -61,17 +82,27 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.node.SupportingNodeKey; 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.Link; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkBuilder; 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.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointBuilder; 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; import org.slf4j.LoggerFactory; public final class OpenRoadmOtnTopology { private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmOtnTopology.class); + private static final String CLIENT = "-CLIENT"; + private static final String NETWORK = "-NETWORK"; + private static final String XPDR = "-XPDR"; + 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 OpenRoadmOtnTopology() { } @@ -99,24 +130,266 @@ public final class OpenRoadmOtnTopology { return new TopologyShard(nodes, links); } + public static TopologyShard createOtnLinks(String nodeA, String tpA, String nodeZ, String tpZ, + OtnLinkType linkType) { + List links = null; + if (OtnLinkType.OTU4.equals(linkType)) { + links = initialiseOtnLinks(nodeA, tpA, nodeZ, tpZ, linkType, "OTU4"); + } + return new TopologyShard(null, links); + } + + public static TopologyShard createOtnLinks(List suppOtu4Links, List oldTps) { + List 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()); + } + } + 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")); + } + List 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); + } + } + + public static TopologyShard updateOtnLinks(List suppOdu4Links, List oldTps, + String serviceRate, Short tribPortNb, Short tribSoltNb, boolean isDeletion) { + List links = new ArrayList<>(); + Long bwIncr = 10000L; + if ("1G".equals(serviceRate)) { + bwIncr = 1000L; + } + for (Link link : suppOdu4Links) { + if (link.augmentation(Link1.class) != null && link.augmentation(Link1.class).getAvailableBandwidth() != null + && link.augmentation(Link1.class).getUsedBandwidth() != null) { + Uint32 avlBw = link.augmentation(Link1.class).getAvailableBandwidth(); + Uint32 usedBw = link.augmentation(Link1.class).getUsedBandwidth(); + if (avlBw.toJava() < bwIncr) { + bwIncr = 0L; + } + if (isDeletion) { + links.add(updateOtnLinkBwParameters(link, avlBw.toJava() + bwIncr, + usedBw.toJava() - bwIncr)); + } else { + links.add(updateOtnLinkBwParameters(link, avlBw.toJava() - bwIncr, + usedBw.toJava() + bwIncr)); + } + } else { + LOG.error("Error with otn parameters of supported link {}", link.getLinkId().getValue()); + } + } + List tps = new ArrayList<>(); + for (TerminationPoint tp : oldTps) { + if (bwIncr != 0) { + tps.add(updateNodeTpTsPool(tp, serviceRate, tribPortNb, tribSoltNb, isDeletion)); + } + } + if (!links.isEmpty() && !tps.isEmpty()) { + return new TopologyShard(null, links, tps); + } else { + LOG.error("unable to update otn links"); + return new TopologyShard(null, null, null); + } + } + + public static TopologyShard deleteOtnLinks(List suppOtu4Links, List oldTps) { + List links = new ArrayList<>(); + for (Link link : suppOtu4Links) { + if (link.augmentation(Link1.class) != null) { + links.add(updateOtnLinkBwParameters(link, 100000L, 0L)); + } else { + LOG.error("Error with otn parameters of supported link {}", link.getLinkId().getValue()); + } + } + List 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); + } + } + + private static List initialiseOtnLinks(String nodeA, String tpA, String nodeZ, String tpZ, + OtnLinkType linkType, String linkIdPrefix) { + List links = new ArrayList<>(); + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.Link1 tpceLink1 + = new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.Link1Builder() + .setOtnLinkType(linkType).build(); + Link1 otnLink1 = new Link1Builder() + .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; + } else { + nodeATopo = nodeA + "-" + tpA.split("-")[0]; + nodeZTopo = nodeZ + "-" + tpZ.split("-")[0]; + } + LinkBuilder ietfLinkAZBldr = TopologyUtils.createLink(nodeATopo, nodeZTopo, tpA, tpZ, linkIdPrefix); + ietfLinkAZBldr + .addAugmentation(tpceLink1) + .addAugmentation(otnLink1) + .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()); + links.add(ietfLinkAZBldr.build()); + // create link Z-A + LinkBuilder ietfLinkZABldr = TopologyUtils.createLink(nodeZTopo, nodeATopo, tpZ, tpA, linkIdPrefix); + ietfLinkZABldr + .addAugmentation(tpceLink1) + .addAugmentation(otnLink1) + .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()); + links.add(ietfLinkZABldr.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(updatedLink1Bldr.build()); + return updatedLinkBldr.build(); + } + + private static TerminationPoint updateTp(TerminationPoint originalTp, boolean addingTsTpnPoolTermination) { + LOG.debug("in updateTp"); + TerminationPointBuilder tpBldr = new TerminationPointBuilder(originalTp); + TerminationPoint1Builder otnTp1Bldr = new TerminationPoint1Builder( + tpBldr.augmentation(TerminationPoint1.class)); + XpdrTpPortConnectionAttributesBuilder xtpcaBldr = new XpdrTpPortConnectionAttributesBuilder(otnTp1Bldr + .getXpdrTpPortConnectionAttributes()); + if (addingTsTpnPoolTermination) { + List tsPool = new ArrayList<>(); + for (int i = 0; i < NB_TRIB_SLOTS; i++) { + tsPool.add(Uint16.valueOf(i + 1)); + } + xtpcaBldr.setTsPool(tsPool); + List tpnPool = new ArrayList<>(); + for (int i = 1; i <= NB_TRIB_PORTS; i++) { + tpnPool.add(Uint16.valueOf(i)); + } + OdtuTpnPool oduTpnPool = new OdtuTpnPoolBuilder().setOdtuType(ODTU4TsAllocated.class) + .setTpnPool(tpnPool).build(); + xtpcaBldr.setOdtuTpnPool(ImmutableMap.of(oduTpnPool.key(),oduTpnPool)); + } else { + xtpcaBldr.setTsPool(null); + xtpcaBldr.setOdtuTpnPool(ImmutableMap.of()); + } + return tpBldr.addAugmentation(otnTp1Bldr.setXpdrTpPortConnectionAttributes(xtpcaBldr.build()).build()).build(); + } + + private static TerminationPoint updateNodeTpTsPool(TerminationPoint tp, String serviceRate, Short tribPortNb, + Short tribSlotNb, boolean isDeletion) { + LOG.debug("in updateNodeTpTsPool"); + TerminationPointBuilder tpBldr = new TerminationPointBuilder(tp); + @Nullable + XpdrTpPortConnectionAttributesBuilder xtpcaBldr = new XpdrTpPortConnectionAttributesBuilder( + tpBldr.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes()); + List 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; + } + xtpcaBldr.setTsPool(tsPool); + List tpnPool; + List odtuTpnPoolValues = new ArrayList<>(xtpcaBldr.getOdtuTpnPool().values()); + if (odtuTpnPoolValues.get(0).getTpnPool() != null) { + tpnPool = new ArrayList<>(odtuTpnPoolValues.get(0).getTpnPool()); + if (isDeletion) { + tpnPool.add(Uint16.valueOf(tribPortNb)); + } else { + tpnPool.remove(Uint16.valueOf(tribPortNb)); + } + } else { + tpnPool = new ArrayList<>(); + } + OdtuTpnPool odtuTpnPool = new OdtuTpnPoolBuilder().setOdtuType(ODTU4TsAllocated.class) + .setTpnPool(tpnPool).build(); + xtpcaBldr.setOdtuTpnPool(ImmutableMap.of(odtuTpnPool.key(),odtuTpnPool)); + + tpBldr.addAugmentation(new TerminationPoint1Builder(tp.augmentation(TerminationPoint1.class)) + .setXpdrTpPortConnectionAttributes(xtpcaBldr.build()).build()); + return tpBldr.build(); + } + private static Map convertPortMappingToOtnNodeList(Nodes mappingNode) { - List networkMappings = mappingNode.getMapping().stream().filter(k -> k.getLogicalConnectionPoint() + List networkMappings = mappingNode.nonnullMapping().values() + .stream().filter(k -> k.getLogicalConnectionPoint() .contains("NETWORK")).collect(Collectors.toList()); Map xpdrMap = new HashMap<>(); for (Mapping mapping : networkMappings) { Integer xpdrNb = Integer.parseInt(mapping.getLogicalConnectionPoint().split("XPDR")[1].split("-")[0]); if (!xpdrMap.containsKey(xpdrNb)) { - List xpdrNetMaps = mappingNode.getMapping().stream().filter(k -> k.getLogicalConnectionPoint() - .contains("XPDR" + xpdrNb + "-NETWORK")).collect(Collectors.toList()); - List xpdrClMaps = mappingNode.getMapping().stream().filter(k -> k.getLogicalConnectionPoint() - .contains("XPDR" + xpdrNb + "-CLIENT")).collect(Collectors.toList()); + List xpdrNetMaps = mappingNode.nonnullMapping().values() + .stream().filter(k -> k.getLogicalConnectionPoint() + .contains("XPDR" + xpdrNb + NETWORK)).collect(Collectors.toList()); + List xpdrClMaps = mappingNode.nonnullMapping().values() + .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)); + mapping.getXponderType(), fillConnectionMapLcp(xpdrNetMaps), fillConnectionMapLcp(xpdrClMaps), + xpdrNetMaps, xpdrClMaps); } else { otnNode = new OtnTopoNode(mappingNode.getNodeId(), mappingNode.getNodeInfo().getNodeClli(), xpdrNb, - XpdrNodeTypes.Tpdr, fillConnectionMapLcp(xpdrNetMaps), fillConnectionMapLcp(xpdrClMaps)); + XpdrNodeTypes.Tpdr, fillConnectionMapLcp(xpdrNetMaps), fillConnectionMapLcp(xpdrClMaps), + xpdrNetMaps, xpdrClMaps); } xpdrMap.put(xpdrNb, otnNode); } @@ -140,102 +413,103 @@ public final class OpenRoadmOtnTopology { } private static Node createTpdr(OtnTopoNode node) { - //create otn-topology node augmentation + // create otn-topology node augmentation XpdrAttributes xpdrAttr = new XpdrAttributesBuilder() - .setXpdrNumber(Integer.valueOf(node.getXpdrNb())) + .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 tpList = new ArrayList<>(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 ocnNodeAug = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder() + .setNodeType(OpenroadmNodeType.TPDR) + .setOperationalState(State.InService) + .setAdministrativeState(AdminStates.InService) + .build(); + // create ietf node augmentation to add TP list + Map tpMap = new HashMap<>(); // creation of tps - createTP(tpList, node, OpenroadmTpType.XPONDERCLIENT, If100GE.class, false); - createTP(tpList, node, OpenroadmTpType.XPONDERNETWORK, IfOCHOTU4ODU4.class, true); + createTP(tpMap, node, OpenroadmTpType.XPONDERCLIENT, false); + createTP(tpMap, node, OpenroadmTpType.XPONDERNETWORK, 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) + .setTerminationPoint(tpMap) .build(); - //return ietfNode + // return ietfNode return new NodeBuilder() - .setNodeId(new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb())) - .withKey(new NodeKey(new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb()))) + .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) + .addAugmentation(otnNodeAug) + .addAugmentation(ocnNodeAug) + .addAugmentation(ietfNodeAug) .build(); } private static Node createMuxpdr(OtnTopoNode node) { - //create otn-topology node augmentation - TpBandwidthSharing tpBwSh = new TpBandwidthSharingBuilder().build(); // to be completed + // create otn-topology node augmentation + // TODO: will need to be completed + TpBandwidthSharing tpBwSh = new TpBandwidthSharingBuilder().build(); XpdrAttributes xpdrAttr = new XpdrAttributesBuilder() - .setXpdrNumber(Integer.valueOf(node.getXpdrNb())) + .setXpdrNumber(Uint16.valueOf(node.getXpdrNb())) .build(); - List nblList = new ArrayList<>(); + Map nbMap = new HashMap<>(); for (int i = 1; i <= node.getNbTpClient(); i++) { List tpList = new ArrayList<>(); - TpId tpId = new TpId("XPDR" + node.getXpdrNb() + "-CLIENT" + i); + TpId tpId = new TpId("XPDR" + node.getXpdrNb() + CLIENT + i); tpList.add(tpId); tpId = new TpId("XPDR" + node.getXpdrNb() + "-NETWORK1"); tpList.add(tpId); NonBlockingList nbl = new NonBlockingListBuilder() - .setNblNumber(i) + .setNblNumber(Uint16.valueOf(i)) .setTpList(tpList) - .setAvailableInterconnectBandwidth(Long.valueOf(node.getNbTpNetwork() * 10)) - .setInterconnectBandwidthUnit(Long.valueOf(1000000000)) + .setAvailableInterconnectBandwidth(Uint32.valueOf(node.getNbTpNetwork() * 10L)) + .setInterconnectBandwidthUnit(Uint32.valueOf(1000000000)) .build(); - nblList.add(nbl); + nbMap.put(nbl.key(),nbl); } OduSwitchingPools oduSwitchPool = new OduSwitchingPoolsBuilder() - .setSwitchingPoolNumber(Integer.valueOf(1)) + .setSwitchingPoolNumber(Uint16.valueOf(1)) .setSwitchingPoolType(SwitchingPoolTypes.NonBlocking) - .setNonBlockingList(nblList) + .setNonBlockingList(nbMap) .build(); - List oduSwitchPoolList = new ArrayList<>(); - oduSwitchPoolList.add(oduSwitchPool); SwitchingPools switchingPools = new SwitchingPoolsBuilder() - .setOduSwitchingPools(oduSwitchPoolList) + .setOduSwitchingPools(Map.of(oduSwitchPool.key(),oduSwitchPool)) .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(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 ocnNodeAug = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder() + .setNodeType(OpenroadmNodeType.MUXPDR) + .setAdministrativeState(AdminStates.InService) + .setOperationalState(State.InService) + .build(); - //create ietf node augmentation to add TP list - List tpList = new ArrayList<>(); + // create ietf node augmentation to add TP list + Map tpMap = new HashMap<>(); // creation of tps - createTP(tpList, node, OpenroadmTpType.XPONDERCLIENT, If10GEODU2e.class, true); - createTP(tpList, node, OpenroadmTpType.XPONDERNETWORK, IfOCHOTU4ODU4.class, true); + createTP(tpMap, node, OpenroadmTpType.XPONDERCLIENT, true); + createTP(tpMap, node, OpenroadmTpType.XPONDERNETWORK, 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) + .setTerminationPoint(tpMap) .build(); - //return ietfNode + // return ietfNode return new NodeBuilder() - .setNodeId(new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb())) - .withKey(new NodeKey(new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb()))) + .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) + .addAugmentation(otnNodeAug) + .addAugmentation(ocnNodeAug) + .addAugmentation(ietfNodeAug) .build(); } @@ -243,35 +517,36 @@ public final class OpenRoadmOtnTopology { List tpl = new ArrayList<>(); TpId tpId = null; for (int i = 1; i <= node.getNbTpClient(); i++) { - tpId = new TpId("XPDR" + node.getXpdrNb() + "-CLIENT" + i); + tpId = new TpId("XPDR" + node.getXpdrNb() + CLIENT + i); tpl.add(tpId); } for (int i = 1; i <= node.getNbTpNetwork(); i++) { - tpId = new TpId("XPDR" + node.getXpdrNb() + "-NETWORK" + i); + tpId = new TpId("XPDR" + node.getXpdrNb() + NETWORK + i); tpl.add(tpId); } - List nblList = new ArrayList<>(); + Map nbMap = new HashMap<>(); NonBlockingList nbl = new NonBlockingListBuilder() - .setNblNumber(Integer.valueOf(1)) + .setNblNumber(Uint16.valueOf(1)) .setTpList(tpl) .build(); - nblList.add(nbl); + nbMap.put(nbl.key(),nbl); OduSwitchingPools oduSwitchPool = new OduSwitchingPoolsBuilder() - .setSwitchingPoolNumber(Integer.valueOf(1)) + .setSwitchingPoolNumber(Uint16.valueOf(1)) .setSwitchingPoolType(SwitchingPoolTypes.NonBlocking) - .setNonBlockingList(nblList) + .setNonBlockingList(nbMap) .build(); - List oduSwitchPoolList = new ArrayList<>(); - oduSwitchPoolList.add(oduSwitchPool); + Map oduSwitchPoolList = new HashMap<>(); + oduSwitchPoolList.put(oduSwitchPool.key(),oduSwitchPool); SwitchingPools switchingPools = new SwitchingPoolsBuilder() .setOduSwitchingPools(oduSwitchPoolList) .build(); - //create otn-topology node augmentation - TpBandwidthSharing tpBwSh = new TpBandwidthSharingBuilder().build(); // to be completed + // create otn-topology node augmentation + // TODO: will need to be completed + TpBandwidthSharing tpBwSh = new TpBandwidthSharingBuilder().build(); XpdrAttributes xpdrAttr = new XpdrAttributesBuilder() - .setXpdrNumber(Integer.valueOf(node.getXpdrNb())) + .setXpdrNumber(Uint16.valueOf(node.getXpdrNb())) .build(); Node1 otnNodeAug = new Node1Builder() @@ -279,95 +554,126 @@ public final class OpenRoadmOtnTopology { .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(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 ocnNodeAug = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder() + .setNodeType(OpenroadmNodeType.SWITCH) + .setOperationalState(State.InService) + .setAdministrativeState(AdminStates.InService) + .build(); - //create ietf node augmentation to add TP list - List tpList = new ArrayList<>(); + // create ietf node augmentation to add TP list + Map tpMap = new HashMap<>(); // creation of tps - createTP(tpList, node, OpenroadmTpType.XPONDERCLIENT, If100GEODU4.class, true); - createTP(tpList, node, OpenroadmTpType.XPONDERNETWORK, IfOCHOTU4ODU4.class, true); + createTP(tpMap, node, OpenroadmTpType.XPONDERCLIENT, true); + createTP(tpMap, node, OpenroadmTpType.XPONDERNETWORK, 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) + .setTerminationPoint(tpMap) .build(); - //return ietfNode + // return ietfNode return new NodeBuilder() - .setNodeId(new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb())) - .withKey(new NodeKey(new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb()))) + .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) + .addAugmentation(otnNodeAug) + .addAugmentation(ocnNodeAug) + .addAugmentation(ietfNodeAug) .build(); } - private static void createTP(List tpList, OtnTopoNode node, OpenroadmTpType tpType, - Class 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 tpMap, + OtnTopoNode node, OpenroadmTpType tpType, boolean withRate) { + List 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 supIfCapaList = new ArrayList<>(); - supIfCapaList.add(supIfCapa); - TpSupportedInterfaces tpSupIf = new TpSupportedInterfacesBuilder() - .setSupportedInterfaceCapability(supIfCapaList) - .build(); - - XpdrTpPortConnectionAttributesBuilder xtpcaBldr = new XpdrTpPortConnectionAttributesBuilder(); - if (withRate) { - xtpcaBldr.setRate(fixRate(ifCapType)); + private static void fillTpMap(Map tpMap, OtnTopoNode node, + OpenroadmTpType tpType, boolean withRate, List mappings) { + for (Mapping mapping : mappings) { + // openroadm-otn-topoology augmentation + Map supIfMap = new HashMap<>(); + TerminationPoint1Builder otnTp1Bldr = new TerminationPoint1Builder(); + if (mapping.getSupportedInterfaceCapability() != null) { + XpdrTpPortConnectionAttributesBuilder xtpcaBldr = new XpdrTpPortConnectionAttributesBuilder(); + for (Class supInterCapa : mapping.getSupportedInterfaceCapability()) { + SupportedInterfaceCapability supIfCapa = new SupportedInterfaceCapabilityBuilder() + .withKey(new SupportedInterfaceCapabilityKey(convertSupIfCapa(supInterCapa))) + .setIfCapType(convertSupIfCapa(supInterCapa)) + .build(); + supIfMap.put(supIfCapa.key(), supIfCapa); + } + TpSupportedInterfaces tpSupIf = new TpSupportedInterfacesBuilder() + .setSupportedInterfaceCapability(supIfMap) + .build(); + otnTp1Bldr.setTpSupportedInterfaces(tpSupIf); + if (withRate) { + xtpcaBldr.setRate(fixRate(mapping.getSupportedInterfaceCapability().get(0))); + otnTp1Bldr.setXpdrTpPortConnectionAttributes(xtpcaBldr.build()); + } + } else { + LOG.warn("mapping {} of node {} has no if-cap-type", mapping.getLogicalConnectionPoint(), + node.getNodeId()); } - 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); + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.TerminationPoint1Builder tpceTp1Bldr = + new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.TerminationPoint1Builder(); + TpId tpId = new TpId(mapping.getLogicalConnectionPoint()); + setclientNwTpAttr(tpMap, node, tpId, tpType, otnTp1Bldr.build(), tpceTp1Bldr, mapping); + } + } + + private static void setclientNwTpAttr(Map tpMap, OtnTopoNode node, TpId tpId, + OpenroadmTpType tpType, TerminationPoint1 otnTp1, + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.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) + .setNodeRef(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())) + .setTpRef(tpId.getValue()) .build(); - List 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 fixRate(Class ifCapaType) { - switch (ifCapaType.getSimpleName()) { + private static Class fixRate(Class ifCapType) { + switch (ifCapType.getSimpleName()) { case "If100GEODU4": case "IfOCHOTU4ODU4": return ODU4.class; case "If1GEODU0": return ODU0.class; + case "If10GEODU2": + return ODU2.class; case "If10GEODU2e": return ODU2e.class; default: @@ -375,7 +681,37 @@ public final class OpenRoadmOtnTopology { } } - private static List createSupportingNodes(OtnTopoNode node) { + private static Class convertSupIfCapa(Class ifCapType) { + switch (ifCapType.getSimpleName()) { + case "IfOTUCnODUCn": + return IfOTUCnODUCn.class; + case "IfOCHOTU4ODU4": + return IfOCHOTU4ODU4.class; + case "IfOCH": + return IfOCH.class; + case "If100GEODU4": + return If100GEODU4.class; + case "If10GEODU2e": + return If10GEODU2e.class; + case "If10GEODU2": + return If10GEODU2.class; + case "If1GEODU0": + return If1GEODU0.class; + case "If400GE": + return If400GE.class; + case "If100GE": + return If100GE.class; + case "If10GE": + return If10GE.class; + case "If1GE": + return If1GE.class; + default: + return null; + } + } + + private static Map createSupportingNodes(OtnTopoNode node) { SupportingNode suppNode1 = new SupportingNodeBuilder() .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)) .setNodeRef(new NodeId(node.getNodeId())) @@ -384,9 +720,9 @@ public final class OpenRoadmOtnTopology { .build(); SupportingNode suppNode2 = new SupportingNodeBuilder() .setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)) - .setNodeRef(new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb())) + .setNodeRef(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())) .withKey(new SupportingNodeKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID), - new NodeId(node.getNodeId() + "-XPDR" + node.getXpdrNb()))) + new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))) .build(); SupportingNode suppNode3 = new SupportingNodeBuilder() .setNetworkRef(new NetworkId(NetworkUtils.CLLI_NETWORK_ID)) @@ -394,34 +730,36 @@ public final class OpenRoadmOtnTopology { .withKey(new SupportingNodeKey(new NetworkId(NetworkUtils.CLLI_NETWORK_ID), new NodeId(node.getClli()))) .build(); - List suppNodeList = new ArrayList<>(); - suppNodeList.add(suppNode1); - suppNodeList.add(suppNode2); - suppNodeList.add(suppNode3); - return suppNodeList; + Map 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 supportTpList) { + private static TerminationPoint buildIetfTp( + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.TerminationPoint1Builder tpceTp1Bldr, + TerminationPoint1 otnTp1, OpenroadmTpType tpType, TpId tpId, + Map 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(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1 ocnTp = + 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(); ietfTpBldr.setTpId(tpId) .withKey(new TerminationPointKey(tpId)) - .addAugmentation(TerminationPoint1.class, otnTp1) - .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 - .TerminationPoint1.class, ocnTp); + .addAugmentation(otnTp1) + .addAugmentation(ocnTp); return ietfTpBldr.build(); } }