import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Iterator;
import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
import java.util.TreeMap;
-
import org.opendaylight.transportpce.common.NetworkUtils;
import org.opendaylight.transportpce.pce.constraints.PceConstraints;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.span.attributes.LinkConcatenation;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.link.oms.attributes.Span;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.networks.network.link.oms.attributes.Span;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmLinkType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.link.concatenation.LinkConcatenation;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.link.concatenation.LinkConcatenationKey;
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.SupportingNode;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId;
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.link.SupportingLink;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public final class MapUtils {
+ private static final String MAP_UTILS_NO_LINK_AUGMENTATION_AVAILABLE_MSG =
+ "MapUtils: No Link augmentation available. {}";
/* Logging. */
private static final Logger LOG = LoggerFactory.getLogger(MapUtils.class);
for (Node node : allNodes) {
if (excClliNodes.contains(node.getNodeId().getValue())) {
LOG.debug("mapDiversityConstraints setExcludeCLLI for node {}", node.getNodeId().getValue());
- pceHardConstraints.setExcludeCLLI(Arrays.asList(getCLLI(node)));
+ pceHardConstraints.setExcludeCLLI(List.of(getCLLI(node)));
}
if (excNodes.contains(node.getNodeId().getValue())) {
public static String getCLLI(Node node) {
// TODO STUB retrieve CLLI from node. for now it is supporting node ID of the first supp node
- return node.getSupportingNode().get(0).getNodeRef().getValue();
+ return node.nonnullSupportingNode().values().iterator().next().getNodeRef().getValue();
}
public static List<Long> getSRLG(Link link) {
+ Span omsAttributesSpan = getOmsAttributesSpan(link);
+ if (omsAttributesSpan == null) {
+ LOG.debug("No concatenation for this link");
+ return new ArrayList<>();
+ }
List<Long> srlgList = new ArrayList<>();
- try {
- List<LinkConcatenation> linkList = getOmsAttributesSpan(link).getLinkConcatenation();
- for (LinkConcatenation lc : linkList) {
+ Map<LinkConcatenationKey, LinkConcatenation> linkList = omsAttributesSpan.nonnullLinkConcatenation();
+ for (LinkConcatenation lc : linkList.values()) {
+ if (lc != null && lc.getSRLGId() != null) {
srlgList.add(lc.getSRLGId().toJava());
}
- } catch (NullPointerException e) {
- LOG.debug("No concatenation for this link");
}
return srlgList;
}
public static List<Long> getSRLGfromLink(Link link) {
- List<Long> srlgList = new ArrayList<>();
- org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1 linkC =
- link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class);
+ org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1 linkC = link
+ .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1.class);
if (linkC == null) {
- LOG.error("MapUtils: No Link augmentation available. {}", link.getLinkId().getValue());
-
- } else {
- try {
- List<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.networks.network.link
- .LinkConcatenation> linkConcatenation = linkC.getLinkConcatenation();
-
-
- for (org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.networks.network.link
- .LinkConcatenation lc : linkConcatenation) {
- srlgList.add(lc.getSRLGId().toJava());
- }
- } catch (NullPointerException e) {
- LOG.debug("No concatenation for this link");
+ LOG.error(MAP_UTILS_NO_LINK_AUGMENTATION_AVAILABLE_MSG, link.getLinkId().getValue());
+ return new ArrayList<>();
+ }
+ List<Long> srlgList = new ArrayList<>();
+ for (LinkConcatenation lc : linkC.nonnullLinkConcatenation().values()) {
+ if (lc != null && lc.getSRLGId() != null) {
+ srlgList.add(lc.getSRLGId().toJava());
+ } else {
+ LOG.debug("No concatenation or SLRG id for this link");
}
}
return srlgList;
}
public static String getSupNetworkNode(Node node) {
- List<SupportingNode> supNodes = node.getSupportingNode();
- for (SupportingNode snode : supNodes) {
+ for (SupportingNode snode : node.nonnullSupportingNode().values()) {
if (NetworkUtils.UNDERLAY_NETWORK_ID.equals(snode.getNetworkRef().getValue())) {
return snode.getNodeRef().getValue();
}
}
public static String getSupClliNode(Node node) {
- List<SupportingNode> supNodes = node.getSupportingNode();
- for (SupportingNode snode : supNodes) {
+ for (SupportingNode snode : node.nonnullSupportingNode().values()) {
if (NetworkUtils.CLLI_NETWORK_ID.equals(snode.getNetworkRef().getValue())) {
return snode.getNodeRef().getValue();
}
return null;
}
- public static TreeMap<String, String> getAllSupNode(Node node) {
+ public static SortedMap<String, String> getAllSupNode(Node node) {
TreeMap<String, String> allSupNodes = new TreeMap<>();
- List<SupportingNode> supNodes = new ArrayList<>();
- try {
- supNodes = node.getSupportingNode();
- } catch (NullPointerException e) {
- LOG.debug("No Supporting Node for the node {}", node);
- }
- for (SupportingNode supnode :supNodes) {
+ for (SupportingNode supnode : node.nonnullSupportingNode().values()) {
allSupNodes.put(supnode.getNetworkRef().getValue(),
supnode.getNodeRef().getValue());
}
}
public static String getSupLink(Link link) {
- String supLink = "";
- try {
- supLink = link.getSupportingLink().get(0).getLinkRef().toString();
- } catch (NullPointerException e) {
- LOG.debug("No Supporting Link for the link {}", link);
+ Iterator<SupportingLink> supportingLinkIterator = link.nonnullSupportingLink().values().iterator();
+ if (!supportingLinkIterator.hasNext()) {
+ return "";
+ }
+ SupportingLink first = supportingLinkIterator.next();
+ if (first == null || first.getLinkRef() == null) {
+ return "";
}
- return supLink;
+ return first.getLinkRef().toString();
}
public static Long getAvailableBandwidth(Link link) {
- if (link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130
+ if (link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210
.Link1.class) != null
- && link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130
+ && link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210
.Link1.class).getAvailableBandwidth() != null) {
- return link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130
+ return link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210
.Link1.class).getAvailableBandwidth().toJava();
} else {
LOG.warn("MapUtils: no Available Bandwidth available for link {}", link.getLinkId());
}
public static Long getUsedBandwidth(Link link) {
- if (link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130
+ if (link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210
.Link1.class) != null
- && link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130
+ && link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210
.Link1.class).getUsedBandwidth() != null) {
- return link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130
+ return link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210
.Link1.class).getUsedBandwidth().toJava();
} else {
LOG.warn("MapUtils: no Available Bandwidth available for link {}", link.getLinkId());
// ID and type
link1 = link.augmentation(Link1.class);
if (link1 == null) {
- LOG.error("MapUtils: No Link augmentation available. {}", link.getLinkId().getValue());
+ LOG.error(MAP_UTILS_NO_LINK_AUGMENTATION_AVAILABLE_MSG, link.getLinkId().getValue());
return null;
}
}
public static Span getOmsAttributesSpan(Link link) {
- org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Link1 link1 = null;
- Span tempSpan = null;
+ org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.Link1 link1 = null;
link1 =
- link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Link1.class);
+ link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.Link1.class);
if (link1 == null) {
- LOG.error("MapUtils: No Link augmentation available. {}", link.getLinkId().getValue());
- }
- try {
- tempSpan = link1.getOMSAttributes().getSpan();
+ LOG.error(MAP_UTILS_NO_LINK_AUGMENTATION_AVAILABLE_MSG, link.getLinkId().getValue());
+ return null;
}
- catch (NullPointerException e) {
+ if (link1.getOMSAttributes() == null) {
LOG.error("MapUtils: No Link getOMSAttributes available. {}", link.getLinkId().getValue());
+ return null;
}
-
- return tempSpan;
+ return link1.getOMSAttributes().getSpan();
}
public static LinkId extractOppositeLink(Link link) {
LinkId tmpoppositeLink = null;
- org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1 linkOpposite
- = link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class);
+ org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1 linkOpposite
+ = link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1.class);
tmpoppositeLink = linkOpposite.getOppositeLink();
LOG.debug("PceLink: reading oppositeLink. {}", linkOpposite);
if (tmpoppositeLink == null) {
Code Review / transportpce.git / blobdiff