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=b92b8c3909354a65c0f66fd13a136d13fe735cd5;hb=refs%2Fchanges%2F46%2F100646%2F27;hp=a7c72816efa7b6c9fc53e17a47cc7acb754eead1;hpb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;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 a7c72816e..b92b8c390 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 @@ -41,42 +41,42 @@ import org.opendaylight.transportpce.olm.power.PowerMgmt; import org.opendaylight.transportpce.olm.util.OlmUtils; import org.opendaylight.transportpce.olm.util.OtsPmHolder; import org.opendaylight.transportpce.olm.util.RoadmLinks; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerResetInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerResetOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.calculate.spanloss.base.output.Spans; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.calculate.spanloss.base.output.SpansBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.Measurements; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.OpenroadmNodeVersion; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.mapping.Mapping; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.CalculateSpanlossBaseInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.CalculateSpanlossBaseOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.CalculateSpanlossBaseOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.CalculateSpanlossCurrentInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.CalculateSpanlossCurrentOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.CalculateSpanlossCurrentOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPmInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPmInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPmOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPmOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerResetInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerResetOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerSetupInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerSetupOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerSetupOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerTurndownInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerTurndownOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerTurndownOutputBuilder; +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.rev220316.OpenroadmNodeVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.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; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmLinkType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmLinkType; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.Interface1; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.Interface1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.ots.container.Ots; 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.rev201211.PmNamesEnum; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.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; @@ -91,6 +91,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Decimal64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -134,8 +135,8 @@ public class OlmPowerServiceImpl implements OlmPowerService { case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1: openroadmVersion = OpenroadmNodeVersion._221; break; - case StringConstants.OPENROADM_DEVICE_VERSION_7_1_0: - openroadmVersion = OpenroadmNodeVersion._710; + case StringConstants.OPENROADM_DEVICE_VERSION_7_1: + openroadmVersion = OpenroadmNodeVersion._71; break; default: LOG.error("Unknown device version"); @@ -187,9 +188,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 +215,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 +272,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); } } @@ -416,15 +417,17 @@ public class OlmPowerServiceImpl implements OlmPowerService { spanLossRx = ots.getSpanLossReceive(); spanLossTx = ots.getSpanLossTransmit(); } else { - spanLossRx = new RatioDB(spanLoss); - spanLossTx = new RatioDB(spanLoss); + spanLossRx = new RatioDB(Decimal64.valueOf(spanLoss)); + spanLossTx = new RatioDB(Decimal64.valueOf(spanLoss)); } Interface1Builder intf1Builder = new Interface1Builder(); if (direction.equals("TX")) { - otsBuilder.setSpanLossTransmit(new RatioDB(spanLoss)); + otsBuilder.setSpanLossTransmit(new RatioDB(Decimal64.valueOf(spanLoss))); otsBuilder.setSpanLossReceive(spanLossRx); } else { - otsBuilder.setSpanLossTransmit(spanLossTx).setSpanLossReceive(new RatioDB(spanLoss)); + otsBuilder + .setSpanLossTransmit(spanLossTx) + .setSpanLossReceive(new RatioDB(Decimal64.valueOf(spanLoss))); } interfaceBuilder.addAugmentation(intf1Builder.setOts(otsBuilder.build()).build()); openRoadmInterfaces.postInterface(realNodeId,interfaceBuilder); @@ -468,9 +471,9 @@ public class OlmPowerServiceImpl implements OlmPowerService { spanLossTx = ots.getSpanLossTransmit(); } else { spanLossRx = new org.opendaylight.yang.gen.v1.http.org - .openroadm.common.types.rev181019.RatioDB(spanLoss); + .openroadm.common.types.rev181019.RatioDB(Decimal64.valueOf(spanLoss)); spanLossTx = new org.opendaylight.yang.gen.v1.http.org - .openroadm.common.types.rev181019.RatioDB(spanLoss); + .openroadm.common.types.rev181019.RatioDB(Decimal64.valueOf(spanLoss)); } org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces .rev181019.Interface1Builder intf1Builder = @@ -478,12 +481,14 @@ public class OlmPowerServiceImpl implements OlmPowerService { .transport.interfaces.rev181019.Interface1Builder(); if (direction.equals("TX")) { otsBuilder.setSpanLossTransmit(new org.opendaylight.yang.gen.v1.http.org - .openroadm.common.types.rev181019.RatioDB(spanLoss)); + .openroadm.common.types.rev181019.RatioDB(Decimal64.valueOf(spanLoss))); otsBuilder.setSpanLossReceive(spanLossRx); } else { - otsBuilder.setSpanLossTransmit(spanLossTx).setSpanLossReceive( - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.RatioDB(spanLoss) - ); + otsBuilder + .setSpanLossTransmit(spanLossTx) + .setSpanLossReceive( + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.RatioDB( + Decimal64.valueOf(spanLoss))); } interfaceBuilder.addAugmentation(intf1Builder.setOts(otsBuilder.build()).build()); openRoadmInterfaces.postInterface(realNodeId,interfaceBuilder); @@ -527,34 +532,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; }