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=700409635aac0fb13be7e34b2dbd6917a065b869;hpb=a3b392eb5a1fe451ac504583be578000a8ff3b5f;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 700409635..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 @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.olm.service; import com.google.common.base.Strings; -import com.google.common.util.concurrent.ListenableFuture; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; @@ -21,68 +20,75 @@ import java.util.Map.Entry; import java.util.Optional; import java.util.Set; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; 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; +import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.Timeouts; -import org.opendaylight.transportpce.common.device.DeviceTransaction; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; +import org.opendaylight.transportpce.common.mapping.MappingUtils; import org.opendaylight.transportpce.common.mapping.PortMapping; +import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; +import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; 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.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.device.rev170206.interfaces.grp.InterfaceKey; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.OrgOpenroadmDevice; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Link1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev170929.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.olm.get.pm.input.ResourceIdentifierBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.Network; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkId; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkKey; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NodeId; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.network.Node; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.network.NodeKey; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.network.node.SupportingNode; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.LinkId; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Network1; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.network.Link; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossBaseInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossBaseOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossBaseOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossCurrentInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossCurrentOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossCurrentOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerResetInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerResetOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.calculate.spanloss.base.output.Spans; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.calculate.spanloss.base.output.SpansBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.get.pm.output.Measurements; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.Mapping; +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; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.NetworkKey; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.Node; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.NodeKey; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.node.SupportingNode; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link; +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.slf4j.Logger; @@ -90,19 +96,22 @@ import org.slf4j.LoggerFactory; public class OlmPowerServiceImpl implements OlmPowerService { private static final Logger LOG = LoggerFactory.getLogger(OlmPowerServiceImpl.class); - private static final String SUCCESS = "Success"; - private static final String FAILED = "Failed"; + private final MappingUtils mappingUtils; + private final OpenRoadmInterfaces openRoadmInterfaces; private final DataBroker dataBroker; private final PowerMgmt powerMgmt; private final DeviceTransactionManager deviceTransactionManager; private final PortMapping portMapping; public OlmPowerServiceImpl(DataBroker dataBroker, PowerMgmt powerMgmt, - DeviceTransactionManager deviceTransactionManager, PortMapping portMapping) { + DeviceTransactionManager deviceTransactionManager, PortMapping portMapping, + MappingUtils mappingUtils, OpenRoadmInterfaces openRoadmInterfaces) { this.dataBroker = dataBroker; this.powerMgmt = powerMgmt; this.portMapping = portMapping; this.deviceTransactionManager = deviceTransactionManager; + this.mappingUtils = mappingUtils; + this.openRoadmInterfaces = openRoadmInterfaces; } public void init() { @@ -113,21 +122,39 @@ public class OlmPowerServiceImpl implements OlmPowerService { LOG.info("close ..."); } + @Override public GetPmOutput getPm(GetPmInput pmInput) { - GetPmOutputBuilder pmOutputBuilder = OlmUtils.pmFetch(pmInput, this.deviceTransactionManager); + 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"); + pmOutputBuilder = OlmUtils.pmFetch(pmInput, deviceTransactionManager, + openroadmVersion); return pmOutputBuilder.build(); } @Override public ServicePowerSetupOutput servicePowerSetup(ServicePowerSetupInput powerSetupInput) { ServicePowerSetupOutputBuilder powerSetupOutput = new ServicePowerSetupOutputBuilder(); - boolean successValPowerCalculation = this.powerMgmt.setPower(powerSetupInput); - + boolean successValPowerCalculation = powerMgmt.setPower(powerSetupInput); if (successValPowerCalculation) { - powerSetupOutput.setResult(SUCCESS); + powerSetupOutput.setResult(ResponseCodes.SUCCESS_RESULT); } else { - powerSetupOutput.setResult(FAILED); + powerSetupOutput.setResult(ResponseCodes.FAILED_RESULT); } return powerSetupOutput.build(); } @@ -138,54 +165,74 @@ public class OlmPowerServiceImpl implements OlmPowerService { ServicePowerTurndownOutputBuilder powerTurnDownOutput = new ServicePowerTurndownOutputBuilder(); // TODO add flag or return failure instead of string - if (this.powerMgmt.powerTurnDown(powerTurndownInput)) { - powerTurnDownOutput.setResult(SUCCESS); + if (powerMgmt.powerTurnDown(powerTurndownInput)) { + powerTurnDownOutput.setResult(ResponseCodes.SUCCESS_RESULT); } else { - powerTurnDownOutput.setResult(FAILED); + powerTurnDownOutput.setResult(ResponseCodes.FAILED_RESULT); } return powerTurnDownOutput.build(); } @Override public CalculateSpanlossBaseOutput calculateSpanlossBase(CalculateSpanlossBaseInput spanlossBaseInput) { - LOG.info("CalculateSpanlossBase Request received for source type {}", spanlossBaseInput.getSrcType()); - - List networkLinks = getNetworkLinks(); - if (networkLinks.isEmpty()) { - LOG.warn("Failed to get links form {} topology.", NetworkUtils.OVERLAY_NETWORK_ID); - return new CalculateSpanlossBaseOutputBuilder().setResult(FAILED).build(); - } - - if (!CalculateSpanlossBaseInput.SrcType.All.equals(spanlossBaseInput.getSrcType())) { - networkLinks = networkLinks.stream() - .filter(link -> link.getLinkId().equals(spanlossBaseInput.getLinkId())) - .collect(Collectors.toList()); - } - - List roadmLinks = new ArrayList<>(); - for (Link link : networkLinks) { - Link1 roadmLinkAugmentation = link.augmentation(Link1.class); - if (roadmLinkAugmentation == null) { - LOG.debug("Missing OpenRoadm link augmentation in link {} from {} topology.", - link.getLinkId().getValue(), NetworkUtils.OVERLAY_NETWORK_ID); - continue; - } - if (OpenroadmLinkType.ROADMTOROADM.equals(roadmLinkAugmentation.getLinkType())) { - roadmLinks.add(link); - } - } - - if (roadmLinks.isEmpty()) { - LOG.warn("Topology {} does not have any Roadm-to-Roadm links.", NetworkUtils.OVERLAY_NETWORK_ID); - return new CalculateSpanlossBaseOutputBuilder().setResult(FAILED).build(); - } - - Map spanLossResult = getLinkSpanloss(roadmLinks); + List roadmLinks = new ArrayList<>(); CalculateSpanlossBaseOutputBuilder spanLossBaseBuilder = new CalculateSpanlossBaseOutputBuilder(); + Map spanLossResult = null; + //Depending on the source type do the calculation + switch (spanlossBaseInput.getSrcType()) { + case Link: + LOG.debug("Calculate SpanLossBase for a linkId: {}",spanlossBaseInput.getLinkId()); + Link inputLink = getNetworkLinkById(spanlossBaseInput.getLinkId()); + if (inputLink != null) { + RoadmLinks roadmLink = new RoadmLinks(); + roadmLink.setSrcNodeId(inputLink.getSource().getSourceNode().getValue()); + roadmLink.setSrcTpId(inputLink.getSource().getSourceTp().toString()); + roadmLink.setDestNodeId(inputLink.getDestination().getDestNode().getValue()); + roadmLink.setDestTpid(inputLink.getDestination().getDestTp().toString()); + roadmLink.setLinkId(inputLink.getLinkId()); + roadmLinks.add(roadmLink); + spanLossResult = getLinkSpanloss(roadmLinks); + } + break; + case All: + LOG.info("Do something for all"); + List networkLinks = getNetworkLinks(); + if (networkLinks.isEmpty()) { + LOG.warn("Failed to get links form {} topology.", NetworkUtils.OVERLAY_NETWORK_ID); + return new CalculateSpanlossBaseOutputBuilder().setResult(ResponseCodes.FAILED_RESULT).build(); + } + //else for all other links + for (Link link : networkLinks) { + Link1 roadmLinkAugmentation = link.augmentation(Link1.class); + if (roadmLinkAugmentation == null) { + LOG.debug("Missing OpenRoadm link augmentation in link {} from {} topology.", + link.getLinkId().getValue(), NetworkUtils.OVERLAY_NETWORK_ID); + continue; + } + if (OpenroadmLinkType.ROADMTOROADM.equals(roadmLinkAugmentation.getLinkType())) { + // 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.setDestNodeId(link.getDestination().getDestNode().getValue()); + roadmLink.setDestTpid(link.getDestination().getDestTp().toString()); + roadmLink.setLinkId(link.getLinkId()); + roadmLinks.add(roadmLink); + } + } + if (roadmLinks.isEmpty()) { + LOG.warn("Topology {} does not have any Roadm-to-Roadm links.", NetworkUtils.OVERLAY_NETWORK_ID); + return new CalculateSpanlossBaseOutputBuilder().setResult(ResponseCodes.FAILED_RESULT).build(); + } + spanLossResult = getLinkSpanloss(roadmLinks); + break; + default: + LOG.info("Invalid input in request"); + } if (spanLossResult != null && !spanLossResult.isEmpty()) { - spanLossBaseBuilder.setResult(SUCCESS); + spanLossBaseBuilder.setResult(ResponseCodes.SUCCESS_RESULT); List listSpans = new ArrayList<>(); Set> spanLossResultSet = spanLossResult.entrySet(); for (Entry entry : spanLossResultSet) { @@ -197,12 +244,13 @@ public class OlmPowerServiceImpl implements OlmPowerService { return spanLossBaseBuilder.build(); } else { LOG.warn("Spanloss calculation failed"); - spanLossBaseBuilder.setResult(FAILED); + spanLossBaseBuilder.setResult(ResponseCodes.FAILED_RESULT); return spanLossBaseBuilder.build(); } } + @Override public CalculateSpanlossCurrentOutput calculateSpanlossCurrent(CalculateSpanlossCurrentInput input) { LOG.info("calculateSpanlossCurrent Request received for all links in network model."); @@ -211,7 +259,7 @@ public class OlmPowerServiceImpl implements OlmPowerService { LOG.warn("Failed to get links form {} topology.", NetworkUtils.OVERLAY_NETWORK_ID); return null; } - List roadmLinks = new ArrayList<>(); + List roadmLinks = new ArrayList<>(); for (Link link : networkLinks) { Link1 roadmLinkAugmentation = link.augmentation(Link1.class); if (roadmLinkAugmentation == null) { @@ -221,7 +269,12 @@ public class OlmPowerServiceImpl implements OlmPowerService { } if (OpenroadmLinkType.ROADMTOROADM.equals(roadmLinkAugmentation.getLinkType())) { // Only calculate spanloss for Roadm-to-Roadm links - roadmLinks.add(link); + RoadmLinks roadmLink = new RoadmLinks(); + roadmLink.setSrcNodeId(link.getSource().getSourceNode().getValue()); + roadmLink.setSrcTpId(link.getSource().getSourceTp().toString()); + roadmLink.setDestNodeId(link.getDestination().getDestNode().getValue()); + roadmLink.setDestTpid(link.getDestination().getDestTp().toString()); + roadmLinks.add(roadmLink); } } @@ -233,11 +286,11 @@ public class OlmPowerServiceImpl implements OlmPowerService { Map spanLossResult = getLinkSpanloss(roadmLinks); CalculateSpanlossCurrentOutputBuilder spanLossCurrentBuilder = new CalculateSpanlossCurrentOutputBuilder(); if (spanLossResult != null && !spanLossResult.isEmpty()) { - spanLossCurrentBuilder.setResult(SUCCESS); + spanLossCurrentBuilder.setResult(ResponseCodes.SUCCESS_RESULT); return spanLossCurrentBuilder.build(); } else { LOG.error("Spanloss Current calculation failed"); - spanLossCurrentBuilder.setResult(FAILED); + spanLossCurrentBuilder.setResult(ResponseCodes.FAILED_RESULT); return spanLossCurrentBuilder.build(); } } @@ -251,72 +304,71 @@ public class OlmPowerServiceImpl implements OlmPowerService { private List getNetworkLinks() { NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); - InstanceIdentifier networkIID = InstanceIdentifier.builder(Network.class, overlayTopologyKey) - .augmentation(Network1.class) - .build(); + InstanceIdentifier networkIID = InstanceIdentifier.builder(Networks.class) + .child(Network.class, overlayTopologyKey) + .augmentation(Network1.class) + .build(); Optional networkOptional; - try (ReadOnlyTransaction rtx = this.dataBroker.newReadOnlyTransaction()) { - // TODO change to constant from Timeouts class when it will be - // merged. + 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); return Collections.emptyList(); } - if (!networkOptional.isPresent()) { + if (! networkOptional.isPresent()) { LOG.warn("Network augmentation with links data is not present in {} topology.", NetworkUtils.OVERLAY_NETWORK_ID); + 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()); } /** - * This method retrieves OTS PM from current PM list by nodeId and TPId: - * Steps: + * This method retrieves OTS PM from current PM list by nodeId and TPId: Steps: * *

- * 1. Get OTS interface name from port mapping by TPId 2. Call getPm RPC to - * get OTS PM + * 1. Get OTS interface name from port mapping by TPId 2. Call getPm RPC to get OTS PM * *

* - * @param nodeId - * Node-id of the NE. - * @param tpID - * Termination point Name. - * @param pmName - * PM name which need to be retrieved + * @param nodeId Node-id of the NE. + * @param tpID Termination point Name. + * @param pmName PM name which need to be retrieved * @return reference to OtsPmHolder */ private OtsPmHolder getPmMeasurements(String nodeId, String tpID, String pmName) { String realNodeId = getRealNodeId(nodeId); - Mapping mapping = this.portMapping.getMapping(realNodeId, tpID); + Mapping mapping = portMapping.getMapping(realNodeId, tpID); if (mapping == null) { return null; } GetPmInput getPmInput = new GetPmInputBuilder().setNodeId(realNodeId) - .setResourceType(ResourceTypeEnum.Interface).setGranularity(PmGranularity._15min) + .setResourceType(ResourceTypeEnum.Interface) .setResourceIdentifier( new ResourceIdentifierBuilder().setResourceName(mapping.getSupportingOts()).build()) + .setPmNameType(PmNamesEnum.valueOf(pmName)) + .setGranularity(PmGranularity._15min) .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()); } @@ -336,79 +388,120 @@ public class OlmPowerServiceImpl implements OlmPowerService { *

* 2. Set spanloss * - * @param nodeId - * nodeId of NE on which spanloss need to be updated - * @param interfaceName - * OTS interface for NE on which spanloss is cacluated - * @param spanLoss - * calculated spanloss value - * @param direction - * for which spanloss is calculated.It can be either Tx or Rx + * @param nodeId nodeId of NE on which spanloss need to be updated + * @param interfaceName OTS interface for NE on which spanloss is cacluated + * @param spanLoss calculated spanloss value + * @param direction for which spanloss is calculated.It can be either Tx or Rx * @return true/false */ private boolean setSpanLoss(String nodeId, String interfaceName, BigDecimal spanLoss, String direction) { String realNodeId = getRealNodeId(nodeId); - switch (direction) { - case "TX": - LOG.info("Setting 'span-loss-transmit' in device: {}, Interface: {}", realNodeId, interfaceName); - break; - case "RX": - LOG.info("Setting 'span-loss-receive' in device: {}, Interface: {}", realNodeId, interfaceName); - break; - default: - LOG.error("Impossible to set spanloss in device: {}, Interface: {}", realNodeId, interfaceName); - break; - } - InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Interface.class, new InterfaceKey(interfaceName)); - com.google.common.base.Optional interfaceObject; try { - Future> deviceTxFuture = - this.deviceTransactionManager.getDeviceTransaction(realNodeId); - java.util.Optional deviceTxOpt = deviceTxFuture.get(); - DeviceTransaction deviceTx; - if (deviceTxOpt.isPresent()) { - deviceTx = deviceTxOpt.get(); - } else { - LOG.error("Device transaction for device {} was not found!", nodeId); - return false; - } - interfaceObject = deviceTx.read(LogicalDatastoreType.CONFIGURATION, interfacesIID).get(); - BigDecimal initialSpanloss = new BigDecimal(0); - RatioDB spanLossRx = new RatioDB(initialSpanloss); - RatioDB spanLossTx = new RatioDB(initialSpanloss); - if (interfaceObject.isPresent()) { - Interface intf = interfaceObject.get(); - InterfaceBuilder interfaceBuilder = new InterfaceBuilder(intf); - OtsBuilder otsBuilder = new OtsBuilder(); - if ((intf.augmentation(Interface1.class) != null) - && (intf.augmentation(Interface1.class).getOts() != null)) { - Ots ots = intf.augmentation(Interface1.class).getOts(); - otsBuilder.setFiberType(ots.getFiberType()); - spanLossRx = ots.getSpanLossReceive(); - spanLossTx = ots.getSpanLossTransmit(); + LOG.info("Setting Spanloss in device for {}, InterfaceName: {}", realNodeId, interfaceName); + if (mappingUtils.getOpenRoadmVersion(realNodeId) + .equals(StringConstants.OPENROADM_DEVICE_VERSION_1_2_1)) { + RatioDB spanLossRx; + RatioDB spanLossTx; + + Optional interfaceObject; + interfaceObject = openRoadmInterfaces.getInterface(realNodeId, interfaceName); + if (interfaceObject.isPresent()) { + InterfaceBuilder interfaceBuilder = new InterfaceBuilder(interfaceObject.get()); + OtsBuilder otsBuilder = new OtsBuilder(); + Interface intf = interfaceObject.get(); + if (intf.augmentation(Interface1.class) != null + && intf.augmentation(Interface1.class).getOts() != null) { + Ots ots = intf.augmentation(Interface1.class).getOts(); + otsBuilder.setFiberType(ots.getFiberType()); + spanLossRx = ots.getSpanLossReceive(); + spanLossTx = ots.getSpanLossTransmit(); + } else { + spanLossRx = new RatioDB(spanLoss); + spanLossTx = new RatioDB(spanLoss); + } + Interface1Builder intf1Builder = new Interface1Builder(); + if (direction.equals("TX")) { + otsBuilder.setSpanLossTransmit(new RatioDB(spanLoss)); + otsBuilder.setSpanLossReceive(spanLossRx); + } else { + otsBuilder.setSpanLossTransmit(spanLossTx).setSpanLossReceive(new RatioDB(spanLoss)); + } + interfaceBuilder.addAugmentation(intf1Builder.setOts(otsBuilder.build()).build()); + openRoadmInterfaces.postInterface(realNodeId,interfaceBuilder); + LOG.info("Spanloss Value update completed successfully"); + return true; } else { - spanLossRx = new RatioDB(spanLoss); - spanLossTx = new RatioDB(spanLoss); + LOG.error("Interface not found for nodeId: {} and interfaceName: {}", nodeId, interfaceName); + return false; } - Interface1Builder intf1Builder = new Interface1Builder(); - if (direction.equals("TX")) { - otsBuilder.setSpanLossTransmit(new RatioDB(spanLoss)); - otsBuilder.setSpanLossReceive(spanLossRx); + } else if (mappingUtils.getOpenRoadmVersion(realNodeId) + .equals(StringConstants.OPENROADM_DEVICE_VERSION_2_2_1)) { + + org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.RatioDB spanLossRx; + org.opendaylight.yang.gen.v1.http.org.openroadm.common.types + .rev181019.RatioDB spanLossTx; + Optional interfaceObject = + openRoadmInterfaces.getInterface(realNodeId, interfaceName); + if (interfaceObject.isPresent()) { + org.opendaylight.yang.gen.v1.http.org.openroadm.device + .rev181019.interfaces.grp.InterfaceBuilder interfaceBuilder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.device + .rev181019.interfaces.grp.InterfaceBuilder(interfaceObject.get()); + org.opendaylight.yang.gen.v1.http.org.openroadm.optical + .transport.interfaces.rev181019.ots.container.OtsBuilder otsBuilder = + new org.opendaylight.yang.gen.v1.http.org.openroadm + .optical.transport.interfaces.rev181019.ots.container.OtsBuilder(); + org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp.Interface intf = + interfaceObject.get(); + if (intf.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.optical + .transport.interfaces.rev181019.Interface1.class) != null + && intf.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport + .interfaces.rev181019.Interface1.class).getOts() != null) { + org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces + .rev181019.ots.container.Ots ots = + intf.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.optical + .transport.interfaces.rev181019.Interface1.class).getOts(); + + otsBuilder.setFiberType(ots.getFiberType()); + spanLossRx = ots.getSpanLossReceive(); + spanLossTx = ots.getSpanLossTransmit(); + } else { + spanLossRx = new org.opendaylight.yang.gen.v1.http.org + .openroadm.common.types.rev181019.RatioDB(spanLoss); + spanLossTx = new org.opendaylight.yang.gen.v1.http.org + .openroadm.common.types.rev181019.RatioDB(spanLoss); + } + org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces + .rev181019.Interface1Builder intf1Builder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.optical + .transport.interfaces.rev181019.Interface1Builder(); + if (direction.equals("TX")) { + otsBuilder.setSpanLossTransmit(new org.opendaylight.yang.gen.v1.http.org + .openroadm.common.types.rev181019.RatioDB(spanLoss)); + otsBuilder.setSpanLossReceive(spanLossRx); + } else { + otsBuilder.setSpanLossTransmit(spanLossTx).setSpanLossReceive( + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.RatioDB(spanLoss) + ); + } + interfaceBuilder.addAugmentation(intf1Builder.setOts(otsBuilder.build()).build()); + openRoadmInterfaces.postInterface(realNodeId,interfaceBuilder); + LOG.info("Spanloss Value update completed successfully"); + return true; } else { - otsBuilder.setSpanLossTransmit(spanLossTx).setSpanLossReceive(new RatioDB(spanLoss)); + LOG.error("Interface not found for nodeId: {} and interfaceName: {}", nodeId,interfaceName); + return false; } - interfaceBuilder.addAugmentation(Interface1.class, intf1Builder.setOts(otsBuilder.build()).build()); - deviceTx.put(LogicalDatastoreType.CONFIGURATION, interfacesIID, interfaceBuilder.build()); - ListenableFuture submit = - deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); - submit.get(); - LOG.info("Spanloss Value update completed successfully"); - return true; } - } catch (InterruptedException | ExecutionException e) { - LOG.warn("Unable to set spanloss", e); - } + } catch (OpenRoadmInterfaceException e) { + // TODO Auto-generated catch block + LOG.error("OpenRoadmInterfaceException occured: ",e); + } /**catch (InterruptedException e) { + // TODO Auto-generated catch block + } catch (ExecutionException e) { + // TODO Auto-generated catch block + }**/ return false; } @@ -425,32 +518,47 @@ public class OlmPowerServiceImpl implements OlmPowerService { * reference to list of RoadmLinks * @return map with list of spans with their spanloss value */ - private Map getLinkSpanloss(List roadmLinks) { - Map map = new HashMap(); + private Map getLinkSpanloss(List roadmLinks) { + Map map = new HashMap<>(); LOG.info("Executing GetLinkSpanLoss"); - BigDecimal spanLoss = new BigDecimal(0); - for (Link link : roadmLinks) { - String sourceNodeId = link.getSource().getSourceNode().getValue(); - String sourceTpId = link.getSource().getSourceTp().toString(); - String destNodeId = link.getDestination().getDestNode().getValue(); - String destTpId = link.getDestination().getDestTp().toString(); + BigDecimal spanLoss; + for (RoadmLinks link : roadmLinks) { + String sourceNodeId = link.getSrcNodeId(); + 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"); - 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 (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; + } + if (!setSpanLoss(destNodeId, destOtsPmHoler.getOtsInterfaceName(), spanLoss, "RX")) { + LOG.info("Setting spanLoss failed for {}", destNodeId); + return null; + } + map.put(link.getLinkId(), spanLoss); } return map; } @@ -458,18 +566,19 @@ 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)) { + LOG.error("supporting node is null"); 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())) @@ -477,8 +586,28 @@ public class OlmPowerServiceImpl implements OlmPowerService { if (collect.isEmpty() || (collect.size() > 1)) { throw new IllegalArgumentException(String.format("Invalid support node count [%d] was found for node %s", collect.size(), mappedNodeId)); + } + LOG.info("getRealNodeId - return {}", collect.iterator().next().getNodeRef().getValue()); return collect.iterator().next().getNodeRef().getValue(); } + private Link getNetworkLinkById(LinkId linkId) { + NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); + InstanceIdentifier linkIID = InstanceIdentifier.builder(Networks.class) + .child(Network.class, overlayTopologyKey) + .augmentation(Network1.class).child(Link.class, new LinkKey(linkId)) + .build(); + Optional linkOptional; + 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); + return linkOptional.get(); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + LOG.warn("Read of {} topology failed", NetworkUtils.OVERLAY_NETWORK_ID); + return null; + } + } + }