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=a7c72816efa7b6c9fc53e17a47cc7acb754eead1;hb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;hp=6a6b9af05df5d2e45296496316e450264b2b9603;hpb=34cbca4ad81fbd29e833197f0e4b09128daa8b95;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 6a6b9af05..a7c72816e 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 @@ -23,6 +23,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; +import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; @@ -61,21 +62,21 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev17 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.rev200113.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.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.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.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.rev170907.PmNamesEnum; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.get.pm.input.ResourceIdentifierBuilder; +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.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; @@ -124,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_0: + openroadmVersion = OpenroadmNodeVersion._710; + 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(); } @@ -318,12 +326,12 @@ public class OlmPowerServiceImpl implements OlmPowerService { return Collections.emptyList(); } - List networkLinks = networkOptional.get().getLink(); + @Nullable Map networkLinks = networkOptional.get().getLink(); if ((networkLinks == null) || networkLinks.isEmpty()) { LOG.warn("Links are not present in {} topology.", NetworkUtils.OVERLAY_NETWORK_ID); return Collections.emptyList(); } - return networkLinks; + return new ArrayList<>(networkLinks.values()); } /** @@ -354,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()); } @@ -418,7 +426,7 @@ public class OlmPowerServiceImpl implements OlmPowerService { } else { otsBuilder.setSpanLossTransmit(spanLossTx).setSpanLossReceive(new RatioDB(spanLoss)); } - interfaceBuilder.addAugmentation(Interface1.class, intf1Builder.setOts(otsBuilder.build()).build()); + interfaceBuilder.addAugmentation(intf1Builder.setOts(otsBuilder.build()).build()); openRoadmInterfaces.postInterface(realNodeId,interfaceBuilder); LOG.info("Spanloss Value update completed successfully"); return true; @@ -477,9 +485,7 @@ public class OlmPowerServiceImpl implements OlmPowerService { new org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.RatioDB(spanLoss) ); } - interfaceBuilder.addAugmentation(org.opendaylight.yang.gen.v1.http - .org.openroadm.optical.transport.interfaces.rev181019.Interface1.class, - intf1Builder.setOts(otsBuilder.build()).build()); + interfaceBuilder.addAugmentation(intf1Builder.setOts(otsBuilder.build()).build()); openRoadmInterfaces.postInterface(realNodeId,interfaceBuilder); LOG.info("Spanloss Value update completed successfully"); return true; @@ -490,7 +496,7 @@ public class OlmPowerServiceImpl implements OlmPowerService { } } catch (OpenRoadmInterfaceException e) { // TODO Auto-generated catch block - LOG.error("OpenRoadmInterfaceException occured {}",e); + LOG.error("OpenRoadmInterfaceException occured: ",e); } /**catch (InterruptedException e) { // TODO Auto-generated catch block } catch (ExecutionException e) { @@ -513,23 +519,37 @@ public class OlmPowerServiceImpl implements OlmPowerService { * @return map with list of spans with their spanloss value */ private Map getLinkSpanloss(List roadmLinks) { - Map map = new HashMap(); + Map map = new HashMap<>(); LOG.info("Executing GetLinkSpanLoss"); - BigDecimal spanLoss = new BigDecimal(0); + BigDecimal spanLoss; for (RoadmLinks link : roadmLinks) { - String sourceNodeId = link.getSrcNodeId().toString(); + String sourceNodeId = link.getSrcNodeId(); String sourceTpId = link.getSrcTpId(); - String destNodeId = link.getDestNodeId().toString(); + 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"); - spanLoss = new BigDecimal(srcOtsPmHoler.getOtsParameterVal() - destOtsPmHoler.getOtsParameterVal()) - .setScale(0, RoundingMode.HALF_UP); + if (destOtsPmHoler == null) { + destOtsPmHoler = getPmMeasurements(destNodeId, destTpId, "OpticalPowerInputOSC"); + } + + if (srcOtsPmHoler.getOtsInterfaceName() == null || destOtsPmHoler.getOtsInterfaceName() == null) { + LOG.warn("OTS is not present for the link {}", link); + continue; + } + spanLoss = BigDecimal.valueOf(srcOtsPmHoler.getOtsParameterVal() - destOtsPmHoler.getOtsParameterVal()) + .setScale(1, RoundingMode.HALF_UP); LOG.info("Spanloss Calculated as :{}={}-{}", spanLoss, srcOtsPmHoler.getOtsParameterVal(), destOtsPmHoler.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")) { LOG.info("Setting spanLoss failed for {}", sourceNodeId); return null; @@ -550,7 +570,7 @@ public class OlmPowerServiceImpl implements OlmPowerService { try (ReadTransaction readOnlyTransaction = this.dataBroker.newReadOnlyTransaction()) { realNode = readOnlyTransaction.read(LogicalDatastoreType.CONFIGURATION, mappedNodeII).get(); } catch (InterruptedException | ExecutionException e) { - LOG.error(e.getMessage(), e); + LOG.error("Error on getRealNodeId {} :", mappedNodeId, e); throw new IllegalStateException(e); } if (!realNode.isPresent() || (realNode.get().getSupportingNode() == null)) { @@ -558,7 +578,7 @@ public class OlmPowerServiceImpl implements OlmPowerService { throw new IllegalArgumentException( String.format("Could not find node %s, or supporting node is not present", mappedNodeId)); } - List collect = realNode.get().getSupportingNode().stream() + List collect = realNode.get().nonnullSupportingNode().values().stream() .filter(node -> (node.getNetworkRef() != null) && NetworkUtils.UNDERLAY_NETWORK_ID.equals(node.getNetworkRef().getValue()) && (node.getNodeRef() != null) && !Strings.isNullOrEmpty(node.getNodeRef().getValue()))