X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=olm%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Folm%2Fservice%2FOlmPowerServiceImpl.java;h=cd96910b290bc9efec42e8f102c430a16cb4dd46;hb=refs%2Fchanges%2F93%2F96193%2F16;hp=1ec57e79f784b242d8adaf784a12fafb05a4d414;hpb=b6a727c9d0deb594826d50321346685aa1655830;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 1ec57e79f..cd96910b2 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.rev200827.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfo.OpenroadmVersion; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.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.rev210927.OpenroadmNodeVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.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; 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.rev181130.OpenroadmLinkType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.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.rev200615.PmNamesEnum; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.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; @@ -125,17 +125,24 @@ public class OlmPowerServiceImpl implements OlmPowerService { @Override public GetPmOutput getPm(GetPmInput pmInput) { - OpenroadmVersion openroadmVersion; - if (mappingUtils.getOpenRoadmVersion(pmInput.getNodeId()) - .equals(StringConstants.OPENROADM_DEVICE_VERSION_1_2_1)) { - LOG.info("Device version is 1.2.1"); - openroadmVersion = OpenroadmVersion._121; - } else { - openroadmVersion = OpenroadmVersion._221; - LOG.info("Device version is 2.2.1"); + OpenroadmNodeVersion openroadmVersion; + GetPmOutputBuilder pmOutputBuilder = new GetPmOutputBuilder(); + switch (mappingUtils.getOpenRoadmVersion(pmInput.getNodeId())) { + case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1: + openroadmVersion = OpenroadmNodeVersion._121; + break; + case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1: + openroadmVersion = OpenroadmNodeVersion._221; + break; + case StringConstants.OPENROADM_DEVICE_VERSION_7_1: + openroadmVersion = OpenroadmNodeVersion._71; + break; + default: + LOG.error("Unknown device version"); + return pmOutputBuilder.build(); } LOG.info("Now calling get pm data"); - GetPmOutputBuilder pmOutputBuilder = OlmUtils.pmFetch(pmInput, deviceTransactionManager, + pmOutputBuilder = OlmUtils.pmFetch(pmInput, deviceTransactionManager, openroadmVersion); return pmOutputBuilder.build(); } @@ -180,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); @@ -207,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); } @@ -264,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); } } @@ -355,13 +362,13 @@ public class OlmPowerServiceImpl implements OlmPowerService { .build(); GetPmOutput otsPmOutput = getPm(getPmInput); - if (otsPmOutput == null) { + if (otsPmOutput == null || otsPmOutput.getMeasurements() == null) { LOG.info("OTS PM not found for NodeId: {} TP Id:{} PMName:{}", realNodeId, tpID, pmName); return null; } try { for (Measurements measurement : otsPmOutput.getMeasurements()) { - if (pmName.equals(measurement.getPmparameterName())) { + if (pmName.equalsIgnoreCase(measurement.getPmparameterName())) { return new OtsPmHolder(pmName, Double.parseDouble(measurement.getPmparameterValue()), mapping.getSupportingOts()); } @@ -520,24 +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"); - OtsPmHolder destOtsPmHoler = getPmMeasurements(destNodeId, destTpId, "OpticalPowerInput"); - if (srcOtsPmHoler.getOtsInterfaceName() == null || destOtsPmHoler.getOtsInterfaceName() == null) { - LOG.warn("OTS is not present for the link {}", link); - continue; + 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; + } } - spanLoss = BigDecimal.valueOf(srcOtsPmHoler.getOtsParameterVal() - destOtsPmHoler.getOtsParameterVal()) + 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(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 (!setSpanLoss(sourceNodeId, srcOtsPmHoler.getOtsInterfaceName(), spanLoss, "TX")) { + if (spanLoss.intValue() <= 0) { + spanLoss = BigDecimal.valueOf(0); + } + 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; }