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=4f0d931575bbaebd8e62c2b1c7edb0fbfc837963;hb=c8c92c9ac1c175fe200dd347081a8395820798c8;hp=e39505d599e4383df19279bae29d78f08943da8a;hpb=695a5251d67a1133d16c6b81b6bc45d646a671ad;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 e39505d59..4f0d93157 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,9 +23,10 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +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; import org.opendaylight.transportpce.common.InstanceIdentifiers; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.common.ResponseCodes; @@ -61,20 +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.rev170228.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfo.OpenroadmVersion; +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.topology.rev181130.Link1; -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; @@ -123,16 +125,13 @@ public class OlmPowerServiceImpl implements OlmPowerService { @Override public GetPmOutput getPm(GetPmInput pmInput) { - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping - .rev170228.network.Nodes.OpenroadmVersion openroadmVersion; + OpenroadmVersion openroadmVersion; if (mappingUtils.getOpenRoadmVersion(pmInput.getNodeId()) .equals(StringConstants.OPENROADM_DEVICE_VERSION_1_2_1)) { LOG.info("Device version is 1.2.1"); - openroadmVersion = org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping - .rev170228.network.Nodes.OpenroadmVersion._121; + openroadmVersion = OpenroadmVersion._121; } else { - openroadmVersion = org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping - .rev170228.network.Nodes.OpenroadmVersion._221; + openroadmVersion = OpenroadmVersion._221; LOG.info("Device version is 2.2.1"); } LOG.info("Now calling get pm data"); @@ -145,7 +144,6 @@ public class OlmPowerServiceImpl implements OlmPowerService { public ServicePowerSetupOutput servicePowerSetup(ServicePowerSetupInput powerSetupInput) { ServicePowerSetupOutputBuilder powerSetupOutput = new ServicePowerSetupOutputBuilder(); boolean successValPowerCalculation = powerMgmt.setPower(powerSetupInput); - if (successValPowerCalculation) { powerSetupOutput.setResult(ResponseCodes.SUCCESS_RESULT); } else { @@ -304,10 +302,10 @@ public class OlmPowerServiceImpl implements OlmPowerService { .augmentation(Network1.class) .build(); Optional networkOptional; - try (ReadOnlyTransaction rtx = this.dataBroker.newReadOnlyTransaction()) { + try (ReadTransaction rtx = this.dataBroker.newReadOnlyTransaction()) { //TODO change to constant from Timeouts class when it will be merged. networkOptional = rtx.read(LogicalDatastoreType.CONFIGURATION, networkIID).get(Timeouts.DATASTORE_READ, - TimeUnit.MILLISECONDS).toJavaUtil(); + TimeUnit.MILLISECONDS); } catch (InterruptedException | ExecutionException | TimeoutException e) { LOG.warn("Read of {} topology failed", NetworkUtils.OVERLAY_NETWORK_ID); @@ -321,12 +319,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()); } /** @@ -421,13 +419,12 @@ 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; } else { - LOG.error("Interface not found for nodeId: {} and interfaceName: {}", - nodeId,interfaceName); + LOG.error("Interface not found for nodeId: {} and interfaceName: {}", nodeId, interfaceName); return false; } } else if (mappingUtils.getOpenRoadmVersion(realNodeId) @@ -481,21 +478,18 @@ 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; } else { - LOG.error("Interface not found for nodeId: {} and interfaceName: {}", - nodeId,interfaceName); + LOG.error("Interface not found for nodeId: {} and interfaceName: {}", nodeId,interfaceName); return false; } } } 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) { @@ -518,31 +512,36 @@ 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"); OtsPmHolder destOtsPmHoler = getPmMeasurements(destNodeId, destTpId, "OpticalPowerInput"); - spanLoss = new BigDecimal(srcOtsPmHoler.getOtsParameterVal() - destOtsPmHoler.getOtsParameterVal()) - .setScale(0, RoundingMode.HALF_UP); - LOG.info("Spanloss Calculated as :" + spanLoss + "=" + srcOtsPmHoler.getOtsParameterVal() + "-" - + destOtsPmHoler.getOtsParameterVal()); - if ((spanLoss.doubleValue() < 28) && (spanLoss.doubleValue() > 0)) { - if (!setSpanLoss(sourceNodeId, srcOtsPmHoler.getOtsInterfaceName(), spanLoss, "TX")) { - LOG.info("Setting spanLoss failed for " + sourceNodeId); - return null; - } - if (!setSpanLoss(destNodeId, destOtsPmHoler.getOtsInterfaceName(), spanLoss, "RX")) { - LOG.info("Setting spanLoss failed for " + destNodeId); - return null; - } - map.put(link.getLinkId(), spanLoss); + 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 (!setSpanLoss(sourceNodeId, srcOtsPmHoler.getOtsInterfaceName(), spanLoss, "TX")) { + LOG.info("Setting spanLoss failed for {}", sourceNodeId); + return null; + } + if (!setSpanLoss(destNodeId, destOtsPmHoler.getOtsInterfaceName(), spanLoss, "RX")) { + LOG.info("Setting spanLoss failed for {}", destNodeId); + return null; } + map.put(link.getLinkId(), spanLoss); } return map; } @@ -550,11 +549,11 @@ public class OlmPowerServiceImpl implements OlmPowerService { private String getRealNodeId(String mappedNodeId) { KeyedInstanceIdentifier mappedNodeII = InstanceIdentifiers.OVERLAY_NETWORK_II.child(Node.class, new NodeKey(new NodeId(mappedNodeId))); - com.google.common.base.Optional realNode; - try (ReadOnlyTransaction readOnlyTransaction = this.dataBroker.newReadOnlyTransaction()) { + Optional realNode; + 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)) { @@ -562,7 +561,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())) @@ -583,10 +582,10 @@ public class OlmPowerServiceImpl implements OlmPowerService { .augmentation(Network1.class).child(Link.class, new LinkKey(linkId)) .build(); Optional linkOptional; - try (ReadOnlyTransaction rtx = dataBroker.newReadOnlyTransaction()) { + try (ReadTransaction rtx = dataBroker.newReadOnlyTransaction()) { //TODO change to constant from Timeouts class when it will be merged. linkOptional = rtx.read(LogicalDatastoreType.CONFIGURATION, linkIID).get(Timeouts.DATASTORE_READ, - TimeUnit.MILLISECONDS).toJavaUtil(); + TimeUnit.MILLISECONDS); return linkOptional.get(); } catch (InterruptedException | ExecutionException | TimeoutException e) { LOG.warn("Read of {} topology failed", NetworkUtils.OVERLAY_NETWORK_ID);