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.opendaylight.transportpce.portmapping.rev201012.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.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.OduSwitchingPoolsKey;
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.topology.types.rev181130.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingListKey;
+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.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.OdtuTpnPool;
+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.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.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;
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() {
}
return new TopologyShard(nodes, links);
}
+ 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");
+ }
+ return new TopologyShard(null, links);
+ }
+
+ public static TopologyShard createOtnLinks(List<Link> suppOtu4Links, List<TerminationPoint> oldTps) {
+ 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());
+ }
+ }
+ 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<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);
+ }
+ }
+
+ public static TopologyShard updateOtnLinks(List<Link> suppOdu4Links, List<TerminationPoint> oldTps,
+ String serviceRate, Short tribPortNb, Short tribSoltNb, boolean isDeletion) {
+ List<Link> 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<TerminationPoint> 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<Link> suppOtu4Links, List<TerminationPoint> oldTps) {
+ List<Link> 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<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);
+ }
+ }
+
+ private static List<Link> initialiseOtnLinks(String nodeA, String tpA, String nodeZ, String tpZ,
+ OtnLinkType linkType, String linkIdPrefix) {
+ 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()
+ .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.rev181130.Link1Builder(
+ ietfLinkAZBldr.augmentation(
+ org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class))
+ .setLinkType(OpenroadmLinkType.OTNLINK)
+ .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.rev181130.Link1Builder(
+ ietfLinkZABldr.augmentation(
+ org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class))
+ .setLinkType(OpenroadmLinkType.OTNLINK)
+ .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<Uint16> tsPool = new ArrayList<>();
+ for (int i = 0; i < NB_TRIB_SLOTS; i++) {
+ tsPool.add(Uint16.valueOf(i + 1));
+ }
+ xtpcaBldr.setTsPool(tsPool);
+ List<Uint16> 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<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;
+ }
+ xtpcaBldr.setTsPool(tsPool);
+ List<Uint16> tpnPool;
+ List<OdtuTpnPool> 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<Integer, OtnTopoNode> convertPortMappingToOtnNodeList(Nodes mappingNode) {
- List<Mapping> networkMappings = mappingNode.getMapping().stream().filter(k -> k.getLogicalConnectionPoint()
+ 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()
+ List<Mapping> xpdrNetMaps = mappingNode.nonnullMapping().values()
+ .stream().filter(k -> k.getLogicalConnectionPoint()
.contains("XPDR" + xpdrNb + NETWORK)).collect(Collectors.toList());
- List<Mapping> xpdrClMaps = mappingNode.getMapping().stream().filter(k -> k.getLogicalConnectionPoint()
+ List<Mapping> xpdrClMaps = mappingNode.nonnullMapping().values()
+ .stream().filter(k -> k.getLogicalConnectionPoint()
.contains("XPDR" + xpdrNb + CLIENT)).collect(Collectors.toList());
OtnTopoNode otnNode = null;
if (mapping.getXponderType() != null) {
}
private static Node createTpdr(OtnTopoNode node) {
- //create otn-topology node augmentation
+ // create otn-topology node augmentation
XpdrAttributes xpdrAttr = new XpdrAttributesBuilder()
.setXpdrNumber(Uint16.valueOf(node.getXpdrNb()))
.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<>();
+ // create ietf node augmentation to add TP list
+ Map<TerminationPointKey,TerminationPoint> 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, If100GE.class, false);
+ createTP(tpMap, 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)
+ .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())))
.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();
}
.setXpdrNumber(Uint16.valueOf(node.getXpdrNb()))
.build();
- List<NonBlockingList> nblList = new ArrayList<>();
+ 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);
.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)
+ .setNonBlockingList(nbMap)
.build();
- List<OduSwitchingPools> 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)
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<>();
+ // create ietf node augmentation to add TP list
+ Map<TerminationPointKey, TerminationPoint> 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, If10GEODU2e.class, true);
+ createTP(tpMap, 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)
+ .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())))
.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();
}
tpId = new TpId("XPDR" + node.getXpdrNb() + NETWORK + i);
tpl.add(tpId);
}
- 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)
+ .setNonBlockingList(nbMap)
.build();
- List<OduSwitchingPools> oduSwitchPoolList = new ArrayList<>();
- oduSwitchPoolList.add(oduSwitchPool);
+ Map<OduSwitchingPoolsKey, OduSwitchingPools> oduSwitchPoolList = new HashMap<>();
+ oduSwitchPoolList.put(oduSwitchPool.key(),oduSwitchPool);
SwitchingPools switchingPools = new SwitchingPoolsBuilder()
.setOduSwitchingPools(oduSwitchPoolList)
.build();
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<>();
+ // create ietf node augmentation to add TP list
+ Map<TerminationPointKey, TerminationPoint> 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, If100GEODU4.class, true);
+ createTP(tpMap, 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)
+ .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())))
.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<TerminationPoint> tpList, OtnTopoNode node, OpenroadmTpType tpType,
+ private static void createTP(Map<TerminationPointKey, TerminationPoint> tpMap,
+ OtnTopoNode node, OpenroadmTpType tpType,
Class<? extends SupportedIfCapability> ifCapType, boolean withRate) {
long nbTps = 0;
if (OpenroadmTpType.XPONDERCLIENT.equals(tpType)) {
}
for (int i = 1; i <= nbTps; i++) {
- //openroadm-otn-topoology augmentation
+ // 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)
+ .setSupportedInterfaceCapability(Map.of(supIfCapa.key(),supIfCapa))
.build();
XpdrTpPortConnectionAttributesBuilder xtpcaBldr = new XpdrTpPortConnectionAttributesBuilder();
.setNodeRef(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))
.setTpRef("XPDR" + node.getXpdrNb() + NETWORK + i)
.build();
- List<SupportingTerminationPoint> supportTpList = new ArrayList<>();
- supportTpList.add(stp);
- tpList.add(buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, supportTpList));
+ TerminationPoint ietfTp = buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, Map.of(stp.key(), stp));
+ tpMap.put(ietfTp.key(),ietfTp);
} else if (OpenroadmTpType.XPONDERCLIENT.equals(tpType)) {
TpId tpId = new TpId("XPDR" + node.getXpdrNb() + CLIENT + i);
if (node.getXpdrCliConnectionMap().get(tpId.getValue()) != null) {
tpceTp1Bldr.setAssociatedConnectionMapPort(node.getXpdrCliConnectionMap().get(tpId.getValue()));
}
- tpList.add(buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, null));
+ TerminationPoint ietfTp = buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, null);
+ tpMap.put(ietfTp.key(),ietfTp);
}
}
}
}
}
- 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.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) {
+ private static TerminationPoint buildIetfTp(
+ org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.TerminationPoint1Builder tpceTp1Bldr,
+ TerminationPoint1 otnTp1, OpenroadmTpType tpType, TpId tpId,
+ Map<SupportingTerminationPointKey, SupportingTerminationPoint> supportTpMap) {
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();
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder()
+ .setTpType(tpType).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();
}
}
Code Review / transportpce.git / blobdiff