X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fnetworkanalyzer%2FPceLink.java;h=a38682dec36aa124ea4c6a6ea1dbf28374f15b75;hb=bc9a08be9d7cdeb30ecffd3c82ddd656a3a23043;hp=68b6d12db8ae933ab8a379a38e9250353b1f7b62;hpb=a0c703ac04217369edcc80c55d2fafd1a0efefe4;p=transportpce.git diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java index 68b6d12db..a38682dec 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java @@ -12,10 +12,14 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; +import java.util.Collection; +import java.util.Iterator; import java.util.List; - +import java.util.Map; 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.link.rev181130.span.attributes.LinkConcatenation.FiberType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.span.attributes.LinkConcatenationKey; 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.transportpce.topology.rev200129.OtnLinkType; @@ -25,9 +29,12 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@SuppressWarnings("serial") +@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + value = "SE_NO_SERIALVERSIONID", + justification = "https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID") public class PceLink implements Serializable { - private static final long serialVersionUID = 1L; /* Logging. */ private static final Logger LOG = LoggerFactory.getLogger(PceLink.class); ///////////////////////// LINKS //////////////////// @@ -36,7 +43,6 @@ public class PceLink implements Serializable { */ double weight = 0; private boolean isValid = true; - private boolean isOtnValid = true; // this member is for XPONDER INPUT/OUTPUT links. // it keeps name of client corresponding to NETWORK TP @@ -58,7 +64,8 @@ public class PceLink implements Serializable { private final List srlgList; private final double osnr; private final transient Span omsAttributesSpan; - private static final double CELERITY = 2.99792458 * 1e5; //meter per ms + //meter per ms + private static final double CELERITY = 2.99792458 * 1e5; private static final double NOISE_MASK_A = 0.571429; private static final double NOISE_MASK_B = 39.285714; private static final double UPPER_BOUND_OSNR = 33; @@ -103,7 +110,8 @@ public class PceLink implements Serializable { this.omsAttributesSpan = null; this.srlgList = null; this.latency = 0L; - this.osnr = 100L; //infinite OSNR in DB + //infinite OSNR in DB + this.osnr = 100L; this.availableBandwidth = 0L; this.usedBandwidth = 0L; } @@ -122,48 +130,56 @@ public class PceLink implements Serializable { //Compute the link latency : if the latency is not defined, the latency is computed from the omsAttributesSpan private Long calcLatency(Link link) { - Link1 link1 = null; - Long tmplatency; - link1 = link.augmentation(Link1.class); + Link1 link1 = link.augmentation(Link1.class); if (link1.getLinkLatency() != null) { - tmplatency = link1.getLinkLatency().toJava(); - return tmplatency; + return link1.getLinkLatency().toJava(); } - - try { - double tmp = 0; - for (int i = 0; i < this.omsAttributesSpan.getLinkConcatenation().size(); i++) { - //Length is expressed in meter and latency is expressed in ms according to OpenROADM MSA - tmp += this.omsAttributesSpan.getLinkConcatenation().get(i).getSRLGLength().toJava() / CELERITY; - LOG.info("In PceLink: The latency of link {} == {}",link.getLinkId(),tmp); + if (this.omsAttributesSpan == null) { + return 1L; + } + double tmp = 0; + Map linkConcatenationMap = this.omsAttributesSpan + .nonnullLinkConcatenation(); + for (Map.Entry entry : linkConcatenationMap.entrySet()) { + // Length is expressed in meter and latency is expressed in ms according to OpenROADM MSA + if (entry == null || entry.getValue() == null || entry.getValue().getSRLGLength() == null) { + LOG.debug("In PceLink: cannot compute the latency for the link {}", link.getLinkId().getValue()); + return 1L; } - tmplatency = (long) Math.ceil(tmp); - } catch (NullPointerException e) { - LOG.debug("In PceLink: cannot compute the latency for the link {}",link.getLinkId().getValue()); - tmplatency = 1L; + tmp += entry.getValue().getSRLGLength().toJava() / CELERITY; + LOG.info("In PceLink: The latency of link {} == {}", link.getLinkId(), tmp); } - return tmplatency; + return (long) Math.ceil(tmp); } //Compute the OSNR of a span public double calcSpanOSNR() { - try { - double pout; //power on the output of the previous ROADM (dBm) - pout = retrievePower(this.omsAttributesSpan.getLinkConcatenation().get(0).getFiberType()); - double spanLoss = this.omsAttributesSpan.getSpanlossCurrent().getValue().doubleValue(); // span loss (dB) - double pin = pout - spanLoss; //power on the input of the current ROADM (dBm) - double spanOsnrDb; - spanOsnrDb = NOISE_MASK_A * pin + NOISE_MASK_B; - if (spanOsnrDb > UPPER_BOUND_OSNR) { - spanOsnrDb = UPPER_BOUND_OSNR; - } else if (spanOsnrDb < LOWER_BOUND_OSNR) { - spanOsnrDb = LOWER_BOUND_OSNR; - } - return spanOsnrDb; - } catch (NullPointerException e) { + if (this.omsAttributesSpan == null) { + return 0L; + } + Collection linkConcatenationList = + this.omsAttributesSpan.nonnullLinkConcatenation().values(); + if (linkConcatenationList == null) { LOG.error("in PceLink : Null field in the OmsAttrubtesSpan"); return 0L; } + Iterator linkConcatenationiterator = linkConcatenationList.iterator(); + if (!linkConcatenationiterator.hasNext()) { + return 0L; + } + // power on the output of the previous ROADM (dBm) + double pout = retrievePower(linkConcatenationiterator.next().getFiberType()); + // span loss (dB) + double spanLoss = this.omsAttributesSpan.getSpanlossCurrent().getValue().doubleValue(); + // power on the input of the current ROADM (dBm) + double pin = pout - spanLoss; + double spanOsnrDb = NOISE_MASK_A * pin + NOISE_MASK_B; + if (spanOsnrDb > UPPER_BOUND_OSNR) { + spanOsnrDb = UPPER_BOUND_OSNR; + } else if (spanOsnrDb < LOWER_BOUND_OSNR) { + spanOsnrDb = LOWER_BOUND_OSNR; + } + return spanOsnrDb; } private double retrievePower(FiberType fiberType) { @@ -268,19 +284,7 @@ public class PceLink implements Serializable { isValid = false; LOG.error("PceLink: No Link type or opposite link is available. Link is ignored {}", linkId); } - if ((this.sourceId == null) || (this.destId == null) || (this.sourceTP == null) || (this.destTP == null)) { - isValid = false; - LOG.error("PceLink: No Link source or destination is available. Link is ignored {}", linkId); - } - if ((this.sourceNetworkSupNodeId.equals("")) || (this.destNetworkSupNodeId.equals(""))) { - isValid = false; - LOG.error("PceLink: No Link source SuppNodeID or destination SuppNodeID is available. Link is ignored {}", - linkId); - } - if ((this.sourceCLLI.equals("")) || (this.destCLLI.equals(""))) { - isValid = false; - LOG.error("PceLink: No Link source CLLI or destination CLLI is available. Link is ignored {}", linkId); - } + isValid = checkParams(); if ((this.omsAttributesSpan == null) && (this.linkType == OpenroadmLinkType.ROADMTOROADM)) { isValid = false; LOG.error("PceLink: Error reading Span for OMS link. Link is ignored {}", linkId); @@ -347,6 +351,10 @@ public class PceLink implements Serializable { linkId, serviceType); } + return checkParams(); + } + + private boolean checkParams() { if ((this.linkId == null) || (this.linkType == null) || (this.oppositeLink == null)) { LOG.error("PceLink: No Link type or opposite link is available. Link is ignored {}", linkId); return false;