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=cf303055bb2d6e0ebec098a88f9f3154787a51be;hb=a00f3ee60b16735f27af765a5bf357c56a091bc5;hp=92b483d65da9fc8b81dd9d3e9bf07435f09eec9c;hpb=38da8caec743f447c641ce0f414c242a5ece363b;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 92b483d65..cf303055b 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 @@ -8,10 +8,19 @@ package org.opendaylight.transportpce.pce.networkanalyzer; +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.eclipse.jdt.annotation.NonNull; 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; @@ -21,7 +30,10 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class PceLink { +@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 { /* Logging. */ private static final Logger LOG = LoggerFactory.getLogger(PceLink.class); @@ -40,8 +52,8 @@ public class PceLink { private final OpenroadmLinkType linkType; private final NodeId sourceId; private final NodeId destId; - private final Object sourceTP; - private final Object destTP; + private transient Object sourceTP; + private transient Object destTP; private final String sourceNetworkSupNodeId; private final String destNetworkSupNodeId; private final String sourceCLLI; @@ -52,7 +64,7 @@ public class PceLink { private final Long usedBandwidth; private final List srlgList; private final double osnr; - private final Span omsAttributesSpan; + private final transient Span omsAttributesSpan; private static final double CELERITY = 2.99792458 * 1e5; //meter per ms private static final double NOISE_MASK_A = 0.571429; private static final double NOISE_MASK_B = 39.285714; @@ -102,7 +114,7 @@ public class PceLink { this.availableBandwidth = 0L; this.usedBandwidth = 0L; } - LOG.debug("PceLink: created PceLink {}", toString()); + LOG.debug("PceLink: created PceLink {}", linkId); } //Retrieve the opposite link @@ -115,20 +127,24 @@ public class PceLink { return tmpoppositeLink; } - //Compute the link latency : if the latency is not defined, the latency it is computed from the omsAttributesSpan + //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); - Long tmplatency = link1.getLinkLatency(); - if (tmplatency != null) { + if (link1.getLinkLatency() != null) { + tmplatency = link1.getLinkLatency().toJava(); return tmplatency; } try { double tmp = 0; - for (int i = 0; i < this.omsAttributesSpan.getLinkConcatenation().size(); i++) { + @NonNull + 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 - tmp += this.omsAttributesSpan.getLinkConcatenation().get(i).getSRLGLength() / CELERITY; + tmp += entry.getValue().getSRLGLength().toJava() / CELERITY; LOG.info("In PceLink: The latency of link {} == {}",link.getLinkId(),tmp); } tmplatency = (long) Math.ceil(tmp); @@ -141,23 +157,31 @@ public class PceLink { //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(); + double pin = pout - spanLoss; // power on the input of the current ROADM (dBm) + 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) { @@ -230,7 +254,7 @@ public class PceLink { } public Long getUsedBandwidth() { - return availableBandwidth; + return usedBandwidth; } public String getsourceNetworkSupNodeId() { @@ -301,7 +325,7 @@ public class PceLink { return false; } - long neededBW = 0L; + long neededBW; OtnLinkType neededType = null; switch (serviceType) { @@ -362,8 +386,20 @@ public class PceLink { return true; } + @Override public String toString() { return "PceLink type=" + linkType + " ID=" + linkId.getValue() + " latency=" + latency; } + private void writeObject(ObjectOutputStream out) throws IOException { + out.defaultWriteObject(); + out.writeObject(this.sourceTP); + out.writeObject(this.destTP); + } + + private void readObject(ObjectInputStream in) throws IOException,ClassNotFoundException { + in.defaultReadObject(); + this.sourceTP = in.readObject(); + this.destTP = in.readObject(); + } }