X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=blobdiff_plain;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fnetworkanalyzer%2FPceLink.java;h=dbec53d6fbdc5894ce7bbb2b39e9c0b56fd9df1a;hp=9e28aa9bdec02f9acb68469af2dab6d777e16b9e;hb=HEAD;hpb=56d1795b647693ec1d620d6aca2c4003e3b302ca 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 9e28aa9bd..dbec53d6f 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,21 +8,23 @@ package org.opendaylight.transportpce.pce.networkanalyzer; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.Serializable; import java.util.Collection; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.OtnLinkType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates; -import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev211210.span.attributes.LinkConcatenation1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev211210.span.attributes.LinkConcatenation1.FiberType; -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.http.org.openroadm.link.rev230526.span.attributes.LinkConcatenation1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev230526.span.attributes.LinkConcatenation1.FiberType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526.networks.network.link.oms.attributes.Span; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.OpenroadmLinkType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.link.concatenation.LinkConcatenation; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.link.concatenation.LinkConcatenationKey; 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.topology.rev180226.LinkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId; @@ -31,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings("serial") -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( +@SuppressFBWarnings( value = "SE_NO_SERIALVERSIONID", justification = "https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID") public class PceLink implements Serializable { @@ -47,7 +49,8 @@ public class PceLink implements Serializable { // this member is for XPONDER INPUT/OUTPUT links. // it keeps name of client corresponding to NETWORK TP - private String client = ""; + private String clientA = ""; + private String clientZ = ""; private final LinkId linkId; private final OpenroadmLinkType linkType; private final NodeId sourceId; @@ -65,14 +68,16 @@ public class PceLink implements Serializable { private final Long availableBandwidth; private final Long usedBandwidth; private final List srlgList; - private final double osnr; +// private final double osnr; + private final Double length; + private final Double cd; + private final Double pmd2; + private final Double spanLoss; + private final Double powerCorrection; private final transient Span omsAttributesSpan; //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; - private static final double LOWER_BOUND_OSNR = 0.1; + private static final double GLASSCELERITY = 2.99792458 * 1e5 / 1.5; + private static final double PMD_CONSTANT = 0.04; public PceLink(Link link, PceNode source, PceNode dest) { LOG.debug("PceLink: : PceLink start "); @@ -97,29 +102,45 @@ public class PceLink implements Serializable { this.adminStates = link.augmentation(Link1.class).getAdministrativeState(); this.state = link.augmentation(Link1.class).getOperationalState(); - - if (this.linkType == OpenroadmLinkType.ROADMTOROADM) { - this.omsAttributesSpan = MapUtils.getOmsAttributesSpan(link); - this.srlgList = MapUtils.getSRLG(link); - this.latency = calcLatency(link); - this.osnr = calcSpanOSNR(); - this.availableBandwidth = 0L; - this.usedBandwidth = 0L; - } else if (this.linkType == OpenroadmLinkType.OTNLINK) { - this.availableBandwidth = MapUtils.getAvailableBandwidth(link); - this.usedBandwidth = MapUtils.getUsedBandwidth(link); - this.srlgList = MapUtils.getSRLGfromLink(link); - this.osnr = 0.0; - this.latency = 0L; - this.omsAttributesSpan = null; - } else { - this.omsAttributesSpan = null; - this.srlgList = null; - this.latency = 0L; - //infinite OSNR in DB - this.osnr = 100L; - this.availableBandwidth = 0L; - this.usedBandwidth = 0L; + switch (this.linkType) { + case ROADMTOROADM: + this.omsAttributesSpan = MapUtils.getOmsAttributesSpan(link); + this.length = calcLength(link); + this.srlgList = MapUtils.getSRLG(link); + this.latency = calcLatency(link); + this.availableBandwidth = 0L; + this.usedBandwidth = 0L; + Map spanLossMap = calcSpanLoss(link); + this.spanLoss = spanLossMap.get("SpanLoss"); + this.powerCorrection = spanLossMap.get("PoutCorrection"); + Map cdAndPmdMap = calcCDandPMD(link); + this.cd = cdAndPmdMap.get("CD"); + this.pmd2 = cdAndPmdMap.get("PMD2"); + break; + case OTNLINK: + this.availableBandwidth = MapUtils.getAvailableBandwidth(link); + this.usedBandwidth = MapUtils.getUsedBandwidth(link); + this.srlgList = MapUtils.getSRLGfromLink(link); + this.latency = 0L; + this.length = 0.0; + this.omsAttributesSpan = null; + this.spanLoss = 0.0; + this.powerCorrection = 0.0; + this.cd = 0.0; + this.pmd2 = 0.0; + break; + default: + this.omsAttributesSpan = null; + this.srlgList = null; + this.latency = 0L; + this.length = 0.0; + this.availableBandwidth = 0L; + this.usedBandwidth = 0L; + this.spanLoss = 0.0; + this.powerCorrection = 0.0; + this.cd = 0.0; + this.pmd2 = 0.0; + break; } LOG.debug("PceLink: created PceLink {}", linkId); } @@ -134,83 +155,186 @@ public class PceLink implements Serializable { return tmpoppositeLink; } - //Compute the link latency : if the latency is not defined, the latency is computed from the omsAttributesSpan + //Compute the link latency : if the latency is not defined, the latency is computed from the length private Long calcLatency(Link link) { - Link1 link1 = link.augmentation(Link1.class); - if (link1.getLinkLatency() != null) { - return link1.getLinkLatency().toJava(); + var augLinkLatency = link.augmentation(Link1.class).getLinkLatency(); + if (augLinkLatency != null) { + return augLinkLatency.toJava(); } - if (this.omsAttributesSpan == null) { + Double linkLength = calcLength(link); + if (linkLength == null) { + LOG.debug("In PceLink: cannot compute the latency for the link {}", link.getLinkId().getValue()); return 1L; } - double tmp = 0; - Map linkConcatenationMap = this.omsAttributesSpan - .nonnullLinkConcatenation(); + LOG.debug("In PceLink: The latency of link {} is extrapolated from link length and == {}", + link.getLinkId(), linkLength / GLASSCELERITY); + return (long) Math.ceil(linkLength / GLASSCELERITY); + } + + private Double calcLength(Link link) { + var augLinkLength = link.augmentation(Link1.class).getLinkLength(); + if (augLinkLength != null) { + return augLinkLength.doubleValue(); + } + if (this.omsAttributesSpan == null) { + LOG.debug("In PceLink: cannot compute the length for the link {}", link.getLinkId().getValue()); + return null; + } + double linkLength = 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 + // Length is expressed in meter 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; + LOG.debug("In PceLink: cannot compute the length for the link {}", link.getLinkId().getValue()); + return null; } - tmp += entry.getValue().getSRLGLength().doubleValue() / CELERITY; - LOG.debug("In PceLink: The latency of link {} == {}", link.getLinkId(), tmp); + linkLength += entry.getValue().getSRLGLength().doubleValue(); + LOG.debug("In PceLink: The length of the link {} == {}", link.getLinkId(), linkLength / 1000.0); } - return (long) Math.ceil(tmp); + return linkLength / 1000.0; + } + + //Calculate CD and PMD of the link from link length + private Map calcCDandPMDfromLength() { + return this.length == null + ? new HashMap<>() + : new HashMap<>( + Map.of( + "CD", 16.5 * this.length, + "PMD2", Math.pow(this.length * PMD_CONSTANT, 2))); } - //Compute the OSNR of a span - private double calcSpanOSNR() { + //Calculate CD and PMD of the link + private Map calcCDandPMD(Link link) { + double linkCd = 0.0; + double linkPmd2 = 0.0; if (this.omsAttributesSpan == null) { - return 0L; + LOG.debug("In PceLink {} no OMS present, assume G.652 fiber, calculation based on fiber length of {} km", + link.getLinkId(), this.length); + return calcCDandPMDfromLength(); + } + Map linkConcatenationMap = + this.omsAttributesSpan.nonnullLinkConcatenation(); + for (Map.Entry entry : linkConcatenationMap.entrySet()) { + // If the link-concatenation list is not populated or partially populated CD & + // PMD shall be derived from link-length (expressed in km in OR topology) + if (entry == null || entry.getValue() == null || entry.getValue().getSRLGLength() == null + || entry.getValue().augmentation(LinkConcatenation1.class).getFiberType() == null) { + if (this.length > 0.0) { + LOG.debug("In PceLink: no OMS present; cd and PMD for the link {} extrapolated from link length {}" + + "assuming SMF fiber type", link.getLinkId().getValue(), this.length); + return calcCDandPMDfromLength(); + } + // If Link-length upper attributes not present or incorrectly populated, no way + // to calculate CD & PMD + LOG.error("In PceLink: no Link length declared and no OMS present for the link {}." + + " No Way to compute CD and PMD", link.getLinkId().getValue()); + return Map.of(); + } + // SRLG length is expressed in OR topology in meter + var entryAug = entry.getValue().augmentation(LinkConcatenation1.class); + linkCd += entry.getValue().getSRLGLength().doubleValue() / 1000.0 + * retrieveCdFromFiberType(entryAug.getFiberType()); + if (entryAug.getPmd() == null + || entryAug.getPmd().getValue().doubleValue() == 0.0 + || entryAug.getPmd().getValue().toString().isEmpty()) { + linkPmd2 += Math.pow( + entry.getValue().getSRLGLength().doubleValue() / 1000.0 + * retrievePmdFromFiberType(entryAug.getFiberType()), + 2); + } else { + linkPmd2 += Math.pow(entryAug.getPmd().getValue().doubleValue(), 2); + } + } + LOG.debug("In PceLink: The CD and PMD2 of link {} are respectively {} ps and {} ps", + link.getLinkId(), linkCd, linkPmd2); + return Map.of("CD", linkCd, "PMD2", linkPmd2); + } + + // compute default spanLoss and power correction from fiber length + // when no OMS attribute defined + private Map calcDefaultSpanLoss(Link link) { + var augLinkLength = link.augmentation(Link1.class).getLinkLength(); + if (augLinkLength == null || augLinkLength.doubleValue() == 0) { + LOG.error("In PceLink, no link length present or length declared = 0," + + " unable to calculate default span Loss "); + return new HashMap<>(); + } + long linkLength = augLinkLength.longValue(); + LOG.warn("In PceLink {}, assume G.652 fiber, calculation " + + "based on fiber length of {} km and typical loss of 0.25dB per Km ", + link.getLinkId(), linkLength); + return new HashMap<>( + Map.of( + "SpanLoss", linkLength * 0.25, + "PoutCorrection", retrievePower(FiberType.Smf) + )); + } + + // Compute the attenuation of a span from OMS attribute + private Map calcSpanLoss(Link link) { + if (this.omsAttributesSpan == null) { + return calcDefaultSpanLoss(link); } Collection linkConcatenationList = this.omsAttributesSpan.nonnullLinkConcatenation().values(); if (linkConcatenationList == null) { LOG.error("in PceLink : Null field in the OmsAttrubtesSpan"); - return 0L; + return calcDefaultSpanLoss(link); } Iterator linkConcatenationiterator = linkConcatenationList.iterator(); if (!linkConcatenationiterator.hasNext()) { - return 0L; + return calcDefaultSpanLoss(link); } - // power on the output of the previous ROADM (dBm) - double pout = retrievePower(linkConcatenationiterator.next().augmentation(LinkConcatenation1.class) - .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; + // Reference of power to be launched at input of ROADM (dBm) + return new HashMap<>(Map.of( + "PoutCorrection", retrievePower( + linkConcatenationiterator.next().augmentation(LinkConcatenation1.class).getFiberType()) - 2.0, + "SpanLoss", this.omsAttributesSpan.getSpanlossCurrent().getValue().doubleValue())); } private double retrievePower(FiberType fiberType) { - double power; switch (fiberType) { case Smf: - power = 2; - break; + return 2; case Eleaf: - power = 1; - break; + return 1; case Truewavec: - power = -1; - break; + return -1; case Oleaf: case Dsf: case Truewave: case NzDsf: case Ull: default: - power = 0; - break; + return 0; + } + } + + private double retrievePmdFromFiberType(FiberType fiberType) { + return fiberType.toString().equalsIgnoreCase("Dsf") + ? 0.2 + : PMD_CONSTANT; + } + + private double retrieveCdFromFiberType(FiberType fiberType) { + switch (fiberType) { + case Dsf: + return 0.0; + case Truewavec: + return 3.0; + case Eleaf: + case Oleaf: + case NzDsf: + return 4.3; + case Truewave: + return 4.4; + case Smf: + case Ull: + default: + return 16.5; } - return power; } public LinkId getOppositeLink() { @@ -249,12 +373,24 @@ public class PceLink implements Serializable { return destId; } - public String getClient() { - return client; + public String getClientA() { + return clientA; + } + + public Double getLength() { + return length; + } + + public void setClientA(String client) { + this.clientA = client; } - public void setClient(String client) { - this.client = client; + public String getClientZ() { + return clientZ; + } + + public void setClientZ(String client) { + this.clientZ = client; } // Double for transformer of JUNG graph @@ -282,10 +418,6 @@ public class PceLink implements Serializable { return srlgList; } - public double getosnr() { - return osnr; - } - public String getsourceCLLI() { return sourceCLLI; } @@ -294,17 +426,40 @@ public class PceLink implements Serializable { return destCLLI; } + public Double getspanLoss() { + return spanLoss; + } + + public Double getcd() { + return cd; + } + + public Double getpmd2() { + return pmd2; + } + + public Double getpowerCorrection() { + return powerCorrection; + } + public boolean isValid() { - if ((this.linkId == null) || (this.linkType == null) || (this.oppositeLink == null)) { + if (this.linkId == null || this.linkType == null || this.oppositeLink == null) { isValid = false; LOG.error("PceLink: No Link type or opposite link 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); + if (this.linkType == OpenroadmLinkType.ROADMTOROADM && (this.length == null || this.length == 0.0)) { + if (this.omsAttributesSpan == null) { + isValid = false; + LOG.error("PceLink: Error reading Span for OMS link, and no available generic link information." + + " Link is ignored {}", linkId); + } else if (this.omsAttributesSpan.getSpanlossCurrent() == null) { + isValid = false; + LOG.error("PceLink: Error reading Span for OMS link, and no available generic link information." + + " Link is ignored {}", linkId); + } } - if ((this.srlgList != null) && (this.srlgList.isEmpty())) { + if (this.srlgList != null && this.srlgList.isEmpty()) { isValid = false; LOG.error("PceLink: Empty srlgList for OMS link. Link is ignored {}", linkId); } @@ -318,10 +473,6 @@ public class PceLink implements Serializable { return false; } - OtnLinkType otnLinkType = link - .augmentation(org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils - .rev220630.Link1.class) - .getOtnLinkType(); if (this.availableBandwidth == 0L) { LOG.error("PceLink: No bandwidth available for OTN Link, link {} is ignored ", linkId); return false; @@ -343,7 +494,7 @@ public class PceLink implements Serializable { return false; } neededBW = 300000L; - // hange otn-link-type + // change otn-link-type neededType = OtnLinkType.OTUC3; break; case "ODUC4": @@ -388,35 +539,38 @@ public class PceLink implements Serializable { LOG.error("PceLink: isOtnValid Link {} unsupported serviceType {} ", linkId, serviceType); return false; } - - if ((this.availableBandwidth >= neededBW) - && ((neededType == null) || (neededType.equals(otnLinkType)))) { + if (this.availableBandwidth >= neededBW + && (neededType == null + || neededType.equals( + link.augmentation( + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630 + .Link1.class) + .getOtnLinkType()))) { LOG.debug("PceLink: Selected Link {} has available bandwidth and is eligible for {} creation ", linkId, serviceType); } - return checkParams(); } private boolean checkParams() { - if ((this.linkId == null) || (this.linkType == null) || (this.oppositeLink == null)) { + 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; } - if ((this.adminStates == null) || (this.state == null)) { + if (this.adminStates == null || this.state == null) { LOG.error("PceLink: Link is not available. Link is ignored {}", linkId); return false; } - if ((this.sourceId == null) || (this.destId == null) || (this.sourceTP == null) || (this.destTP == null)) { + if (this.sourceId == null || this.destId == null || this.sourceTP == null || this.destTP == null) { LOG.error("PceLink: No Link source or destination is available. Link is ignored {}", linkId); return false; } - if ((this.sourceNetworkSupNodeId.equals("")) || (this.destNetworkSupNodeId.equals(""))) { + if (this.sourceNetworkSupNodeId.equals("") || this.destNetworkSupNodeId.equals("")) { LOG.error("PceLink: No Link source SuppNodeID or destination SuppNodeID is available. Link is ignored {}", linkId); return false; } - if ((this.sourceCLLI.equals("")) || (this.destCLLI.equals(""))) { + if (this.sourceCLLI.equals("") || this.destCLLI.equals("")) { LOG.error("PceLink: No Link source CLLI or destination CLLI is available. Link is ignored {}", linkId); return false; }