X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=olm%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Folm%2Fservice%2FOlmPowerServiceImpl.java;h=9677ec3de7de1cd2c33f13ab7b97b3c5e0530df7;hb=refs%2Fchanges%2F05%2F99305%2F2;hp=aa72dfee064e8d0ed12891779a1abaeaf67039a6;hpb=c725528fb8a0b09ce24adac744c888a10cf90f72;p=transportpce.git diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java index aa72dfee0..9677ec3de 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java @@ -62,8 +62,8 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev21 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.calculate.spanloss.base.output.Spans; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.calculate.spanloss.base.output.SpansBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.get.pm.output.Measurements; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.OpenroadmNodeVersion; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.OpenroadmNodeVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.RatioDB; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.Interface; @@ -75,8 +75,8 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfa import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.ots.container.OtsBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev161014.PmGranularity; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.PmNamesEnum; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.olm.get.pm.input.ResourceIdentifierBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.PmNamesEnum; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.olm.get.pm.input.ResourceIdentifierBuilder; 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.Networks; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; @@ -187,9 +187,9 @@ public class OlmPowerServiceImpl implements OlmPowerService { if (inputLink != null) { RoadmLinks roadmLink = new RoadmLinks(); roadmLink.setSrcNodeId(inputLink.getSource().getSourceNode().getValue()); - roadmLink.setSrcTpId(inputLink.getSource().getSourceTp().toString()); + roadmLink.setSrcTpId(inputLink.getSource().getSourceTp().getValue()); roadmLink.setDestNodeId(inputLink.getDestination().getDestNode().getValue()); - roadmLink.setDestTpid(inputLink.getDestination().getDestTp().toString()); + roadmLink.setDestTpid(inputLink.getDestination().getDestTp().getValue()); roadmLink.setLinkId(inputLink.getLinkId()); roadmLinks.add(roadmLink); spanLossResult = getLinkSpanloss(roadmLinks); @@ -214,9 +214,9 @@ public class OlmPowerServiceImpl implements OlmPowerService { // Only calculate spanloss for Roadm-to-Roadm links RoadmLinks roadmLink = new RoadmLinks(); roadmLink.setSrcNodeId(link.getSource().getSourceNode().getValue()); - roadmLink.setSrcTpId(link.getSource().getSourceTp().toString()); + roadmLink.setSrcTpId(link.getSource().getSourceTp().getValue()); roadmLink.setDestNodeId(link.getDestination().getDestNode().getValue()); - roadmLink.setDestTpid(link.getDestination().getDestTp().toString()); + roadmLink.setDestTpid(link.getDestination().getDestTp().getValue()); roadmLink.setLinkId(link.getLinkId()); roadmLinks.add(roadmLink); } @@ -271,9 +271,9 @@ public class OlmPowerServiceImpl implements OlmPowerService { // Only calculate spanloss for Roadm-to-Roadm links RoadmLinks roadmLink = new RoadmLinks(); roadmLink.setSrcNodeId(link.getSource().getSourceNode().getValue()); - roadmLink.setSrcTpId(link.getSource().getSourceTp().toString()); + roadmLink.setSrcTpId(link.getSource().getSourceTp().getValue()); roadmLink.setDestNodeId(link.getDestination().getDestNode().getValue()); - roadmLink.setDestTpid(link.getDestination().getDestTp().toString()); + roadmLink.setDestTpid(link.getDestination().getDestTp().getValue()); roadmLinks.add(roadmLink); } } @@ -527,34 +527,37 @@ public class OlmPowerServiceImpl implements OlmPowerService { String sourceTpId = link.getSrcTpId(); String destNodeId = link.getDestNodeId(); String destTpId = link.getDestTpid(); - OtsPmHolder srcOtsPmHoler = getPmMeasurements(sourceNodeId, sourceTpId, "OpticalPowerOutput"); - if (srcOtsPmHoler == null) { - srcOtsPmHoler = getPmMeasurements(sourceNodeId, sourceTpId, "OpticalPowerOutputOSC"); - } - OtsPmHolder destOtsPmHoler = getPmMeasurements(destNodeId, destTpId, "OpticalPowerInput"); - if (destOtsPmHoler == null) { - destOtsPmHoler = getPmMeasurements(destNodeId, destTpId, "OpticalPowerInputOSC"); + OtsPmHolder srcOtsPmHolder = getPmMeasurements(sourceNodeId, sourceTpId, "OpticalPowerOutput"); + if (srcOtsPmHolder == null) { + srcOtsPmHolder = getPmMeasurements(sourceNodeId, sourceTpId, "OpticalPowerOutputOSC"); + if (srcOtsPmHolder == null) { + LOG.warn("OTS configuration issue at {} - {}", sourceNodeId, sourceTpId); + continue; + } } - - if (srcOtsPmHoler.getOtsInterfaceName() == null || destOtsPmHoler.getOtsInterfaceName() == null) { - LOG.warn("OTS is not present for the link {}", link); - continue; + OtsPmHolder destOtsPmHolder = getPmMeasurements(destNodeId, destTpId, "OpticalPowerInput"); + if (destOtsPmHolder == null) { + destOtsPmHolder = getPmMeasurements(destNodeId, destTpId, "OpticalPowerInputOSC"); + if (destOtsPmHolder == null) { + LOG.warn("OTS configuration issue at {} - {}", destNodeId, destTpId); + continue; + } } - spanLoss = BigDecimal.valueOf(srcOtsPmHoler.getOtsParameterVal() - destOtsPmHoler.getOtsParameterVal()) + spanLoss = BigDecimal.valueOf(srcOtsPmHolder.getOtsParameterVal() - destOtsPmHolder.getOtsParameterVal()) .setScale(1, RoundingMode.HALF_UP); LOG.info("Spanloss Calculated as :{}={}-{}", - spanLoss, srcOtsPmHoler.getOtsParameterVal(), destOtsPmHoler.getOtsParameterVal()); + spanLoss, srcOtsPmHolder.getOtsParameterVal(), destOtsPmHolder.getOtsParameterVal()); if (spanLoss.doubleValue() > 28) { LOG.warn("Span Loss is out of range of OpenROADM specifications"); } if (spanLoss.intValue() <= 0) { spanLoss = BigDecimal.valueOf(0); } - if (!setSpanLoss(sourceNodeId, srcOtsPmHoler.getOtsInterfaceName(), spanLoss, "TX")) { + if (!setSpanLoss(sourceNodeId, srcOtsPmHolder.getOtsInterfaceName(), spanLoss, "TX")) { LOG.info("Setting spanLoss failed for {}", sourceNodeId); return null; } - if (!setSpanLoss(destNodeId, destOtsPmHoler.getOtsInterfaceName(), spanLoss, "RX")) { + if (!setSpanLoss(destNodeId, destOtsPmHolder.getOtsInterfaceName(), spanLoss, "RX")) { LOG.info("Setting spanLoss failed for {}", destNodeId); return null; }