X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=olm%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Folm%2Fpower%2FPowerMgmtImpl.java;h=e98062f25b3a85b5d5d75c43e5210337d915e954;hb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;hp=f751e346013f1f64609765fd2738926b19802dfc;hpb=dcb0b2e2f020517a9f08d45bef269c88bdbaf256;p=transportpce.git diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java index f751e3460..e98062f25 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java @@ -8,35 +8,41 @@ package org.opendaylight.transportpce.olm.power; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; import java.util.Optional; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.transportpce.common.crossconnect.CrossConnect; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; +import org.opendaylight.transportpce.common.fixedflex.GridConstant; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; import org.opendaylight.transportpce.olm.util.OlmUtils; 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.ServicePowerTurndownInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.Nodes; -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.rev170228.network.nodes.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.NodeTypes; +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.opendaylight.transportpce.portmapping.rev210315.mapping.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.Nodes; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.OpticalControlMode; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.Interface; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.Interface1; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@SuppressFBWarnings("DM_CONVERT_CASE") public class PowerMgmtImpl implements PowerMgmt { private static final Logger LOG = LoggerFactory.getLogger(PowerMgmtImpl.class); private final DataBroker db; private final OpenRoadmInterfaces openRoadmInterfaces; private final CrossConnect crossConnect; private final DeviceTransactionManager deviceTransactionManager; + private static final BigDecimal DEFAULT_TPDR_PWR_100G = new BigDecimal(-5); + private static final BigDecimal DEFAULT_TPDR_PWR_400G = new BigDecimal(0); + public PowerMgmtImpl(DataBroker db, OpenRoadmInterfaces openRoadmInterfaces, CrossConnect crossConnect, DeviceTransactionManager deviceTransactionManager) { @@ -57,8 +63,14 @@ public class PowerMgmtImpl implements PowerMgmt { * @return true/false based on status of operation. */ //TODO Need to Case Optical Power mode/NodeType in case of 2.2 devices + //@SuppressFBwarnings("DM_CONVERT_CASE") public Boolean setPower(ServicePowerSetupInput input) { - LOG.info("Olm-setPower initiated"); + LOG.info("Olm-setPower initiated for input {}", input); + int lowerSpectralSlotNumber = input.getLowerSpectralSlotNumber().intValue(); + int higherSpectralSlotNumber = input.getHigherSpectralSlotNumber().intValue(); + String spectralSlotName = String.join(GridConstant.SPECTRAL_SLOT_SEPARATOR, + String.valueOf(lowerSpectralSlotNumber), + String.valueOf(higherSpectralSlotNumber)); for (int i = 0; i < input.getNodes().size(); i++) { String nodeId = input.getNodes().get(i).getNodeId(); String srcTpId = input.getNodes().get(i).getSrcTp(); @@ -66,50 +78,81 @@ public class PowerMgmtImpl implements PowerMgmt { Optional inputNodeOptional = OlmUtils.getNode(nodeId, this.db); // If node type is transponder if (inputNodeOptional.isPresent() - && (inputNodeOptional.get().getNodeType() != null) - && inputNodeOptional.get().getNodeType().equals(NodeTypes.Xpdr)) { + && (inputNodeOptional.get().getNodeInfo().getNodeType() != null) + && inputNodeOptional.get().getNodeInfo().getNodeType().equals(NodeTypes.Xpdr) + && destTpId != null) { Nodes inputNode = inputNodeOptional.get(); - Nodes.OpenroadmVersion openroadmVersion = inputNode.getOpenroadmVersion(); - LOG.info("Getting data from input node {}", inputNode.getNodeType()); - LOG.info("Getting mapping data for node is {}", inputNode.getMapping().stream().filter(o -> o.key() - .equals(new MappingKey(destTpId))).findFirst().toString()); + OpenroadmNodeVersion openroadmVersion = inputNode.getNodeInfo().getOpenroadmVersion(); + LOG.info("Getting data from input node {}", inputNode.getNodeInfo().getNodeType()); + LOG.info("Getting mapping data for node is {}", + inputNode.nonnullMapping().values().stream().filter(o -> o.key() + .equals(new MappingKey(destTpId))).findFirst().toString()); // If its A-End transponder if (destTpId.toLowerCase().contains("network")) { - java.util.Optional mappingObject = inputNode.getMapping().stream().filter(o -> o.key() + java.util.Optional mappingObject = inputNode.nonnullMapping() + .values().stream().filter(o -> o.key() .equals(new MappingKey(destTpId))).findFirst(); + boolean setTpdrPowerResult; if (mappingObject.isPresent()) { String circuitPackName = mappingObject.get().getSupportingCircuitPackName(); String portName = mappingObject.get().getSupportingPort(); Map txPowerRangeMap = new HashMap<>(); - if (openroadmVersion.equals(Nodes.OpenroadmVersion._121)) { - txPowerRangeMap = PowerMgmtVersion121.getXponderPowerRange(circuitPackName, portName, + switch (openroadmVersion.getIntValue()) { + case 1: + txPowerRangeMap = PowerMgmtVersion121.getXponderPowerRange(circuitPackName, portName, + nodeId, deviceTransactionManager); + break; + case 2: + txPowerRangeMap = PowerMgmtVersion221.getXponderPowerRange(circuitPackName, portName, nodeId, deviceTransactionManager); - } else if (openroadmVersion.equals(Nodes.OpenroadmVersion._221)) { - txPowerRangeMap = PowerMgmtVersion221.getXponderPowerRange(circuitPackName, portName, + break; + case 3: + txPowerRangeMap = PowerMgmtVersion710.getXponderPowerRange(circuitPackName, portName, nodeId, deviceTransactionManager); + break; + default: + LOG.error("Unrecognized OpenRoadm version"); } if (!txPowerRangeMap.isEmpty()) { LOG.info("Transponder range exists for nodeId: {}", nodeId); + OpenroadmNodeVersion rdmOpenroadmVersion = openroadmVersion; String srgId = input.getNodes().get(i + 1).getSrcTp(); String nextNodeId = input.getNodes().get(i + 1).getNodeId(); + Optional inputNextOptional = OlmUtils.getNode(nextNodeId, this.db); + if (inputNextOptional.isPresent()) { + rdmOpenroadmVersion = inputNextOptional.get() + .getNodeInfo().getOpenroadmVersion(); + } Map rxSRGPowerRangeMap = new HashMap<>(); Optional mappingObjectSRG = OlmUtils.getNode(nextNodeId, db) - .flatMap(node -> node.getMapping() + .flatMap(node -> node.nonnullMapping().values() .stream().filter(o -> o.key() .equals(new MappingKey(srgId))).findFirst()); - if (mappingObjectSRG.isPresent()) { - if (openroadmVersion.equals(Nodes.OpenroadmVersion._121)) { - rxSRGPowerRangeMap = PowerMgmtVersion121.getSRGRxPowerRange(nextNodeId, srgId, - deviceTransactionManager, mappingObjectSRG.get() - .getSupportingCircuitPackName(), - mappingObjectSRG.get().getSupportingPort()); - } else if (inputNode.getOpenroadmVersion().equals(Nodes.OpenroadmVersion._221)) { - rxSRGPowerRangeMap = PowerMgmtVersion221.getSRGRxPowerRange(nextNodeId, srgId, - deviceTransactionManager, mappingObjectSRG.get() - .getSupportingCircuitPackName(), - mappingObjectSRG.get().getSupportingPort()); + if (mappingObjectSRG.isPresent()) { + switch (rdmOpenroadmVersion.getIntValue()) { + case 1: + rxSRGPowerRangeMap = PowerMgmtVersion121.getSRGRxPowerRange(nextNodeId, srgId, + deviceTransactionManager, mappingObjectSRG.get() + .getSupportingCircuitPackName(), + mappingObjectSRG.get().getSupportingPort()); + break; + case 2: + rxSRGPowerRangeMap = PowerMgmtVersion221.getSRGRxPowerRange(nextNodeId, srgId, + deviceTransactionManager, mappingObjectSRG.get() + .getSupportingCircuitPackName(), + mappingObjectSRG.get().getSupportingPort()); + break; + case 3: + rxSRGPowerRangeMap = PowerMgmtVersion710.getSRGRxPowerRange(nextNodeId, srgId, + deviceTransactionManager, mappingObjectSRG.get() + .getSupportingCircuitPackName(), + mappingObjectSRG.get().getSupportingPort()); + break; + default: + LOG.error("Unrecognized OpenRoadm version"); + return false; } } double powerValue = 0; @@ -123,7 +166,8 @@ public class PowerMgmtImpl implements PowerMgmt { powerValue = rxSRGPowerRangeMap.get("MaxRx"); } LOG.info("Calculated Transponder Power value is {}" , powerValue); - String interfaceName = destTpId + "-" + input.getWaveNumber(); + String interfaceName = String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, + destTpId, spectralSlotName); if (callSetTransponderPower(nodeId, interfaceName, new BigDecimal(powerValue), openroadmVersion)) { LOG.info("Transponder OCH connection: {} power updated ", interfaceName); @@ -137,12 +181,40 @@ public class PowerMgmtImpl implements PowerMgmt { LOG.info("Transponder OCH connection: {} power update failed ", interfaceName); } } else { - LOG.info("SRG Power Range not found"); + LOG.info("SRG Power Range not found, setting the Transponder range to default"); + String interfaceName = String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, + destTpId, spectralSlotName); + if (openroadmVersion.getIntValue() == 3) { + setTpdrPowerResult = callSetTransponderPower(nodeId, interfaceName, + DEFAULT_TPDR_PWR_400G, openroadmVersion); + } else { + setTpdrPowerResult = callSetTransponderPower(nodeId, interfaceName, + DEFAULT_TPDR_PWR_100G, openroadmVersion); + } + if (setTpdrPowerResult) { + LOG.info("Transponder OCH connection: {} power updated ", interfaceName); + try { + Thread.sleep(OlmUtils.OLM_TIMER_1); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + LOG.info("Transponder warmup failed for OCH connection: {}", interfaceName, e); + } + } else { + LOG.info("Transponder OCH connection: {} power update failed ", interfaceName); + } } } else { LOG.info("Tranponder range not available setting to default power for nodeId: {}", nodeId); - String interfaceName = destTpId + "-" + input.getWaveNumber(); - if (callSetTransponderPower(nodeId, interfaceName, new BigDecimal(-5),openroadmVersion)) { + String interfaceName = String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, + destTpId, spectralSlotName); + if (openroadmVersion.getIntValue() == 3) { + setTpdrPowerResult = callSetTransponderPower(nodeId, interfaceName, + DEFAULT_TPDR_PWR_400G, openroadmVersion); + } else { + setTpdrPowerResult = callSetTransponderPower(nodeId, interfaceName, + DEFAULT_TPDR_PWR_100G, openroadmVersion); + } + if (setTpdrPowerResult) { LOG.info("Transponder OCH connection: {} power updated ", interfaceName); try { Thread.sleep(OlmUtils.OLM_TIMER_1); @@ -162,23 +234,25 @@ public class PowerMgmtImpl implements PowerMgmt { LOG.info("{} is a drop node. Net power settings needed", nodeId); } } else if (inputNodeOptional.isPresent() - && (inputNodeOptional.get().getNodeType() != null) - && inputNodeOptional.get().getNodeType().equals(NodeTypes.Rdm)) { + && (inputNodeOptional.get().getNodeInfo().getNodeType() != null) + && inputNodeOptional.get().getNodeInfo().getNodeType().equals(NodeTypes.Rdm)) { // If Degree is transmitting end then set power Nodes inputNode = inputNodeOptional.get(); - Nodes.OpenroadmVersion openroadmVersion = inputNode.getOpenroadmVersion(); + OpenroadmNodeVersion openroadmVersion = inputNode.getNodeInfo().getOpenroadmVersion(); LOG.info("This is a roadm {} device", openroadmVersion.getName()); - String connectionNumber = srcTpId + "-" + destTpId + "-" + input.getWaveNumber(); + String connectionNumber = String.join(GridConstant.NAME_PARAMETERS_SEPARATOR,srcTpId, destTpId, + spectralSlotName); LOG.info("Connection number is {}", connectionNumber); if (destTpId.toLowerCase().contains("deg")) { - Optional mappingObjectOptional = inputNode.getMapping().stream().filter(o -> o.key() + Optional mappingObjectOptional = inputNode.nonnullMapping() + .values().stream().filter(o -> o.key() .equals(new MappingKey(destTpId))).findFirst(); if (mappingObjectOptional.isPresent()) { BigDecimal spanLossTx = null; LOG.info("Dest point is Degree {}", mappingObjectOptional.get()); Mapping portMapping = mappingObjectOptional.get(); // debut reprise - if (openroadmVersion.equals(Nodes.OpenroadmVersion._121)) { + if (openroadmVersion.getIntValue() == 1) { Optional interfaceOpt; try { interfaceOpt = @@ -206,7 +280,7 @@ public class PowerMgmtImpl implements PowerMgmt { nodeId); return false; } - } else if (openroadmVersion.equals(Nodes.OpenroadmVersion._221)) { + } else if (openroadmVersion.getIntValue() == 2) { Optional interfaceOpt; try { @@ -239,33 +313,30 @@ public class PowerMgmtImpl implements PowerMgmt { } } - BigDecimal powerValue = null; - if (spanLossTx != null && spanLossTx.intValue() <= 28 && spanLossTx.intValue() > 0) { - powerValue = BigDecimal.valueOf(Math.min(spanLossTx.doubleValue() - 9, 2)); - LOG.info("Power Value is {}", powerValue); - } else if (spanLossTx.intValue() > 28) { - LOG.error( - "Power Value is null - spanLossTx > 28dB not compliant with openROADM specifications"); - return false; - } else if (spanLossTx.intValue() <= 0) { + if (spanLossTx == null || spanLossTx.intValue() <= 0 || spanLossTx.intValue() > 28) { LOG.error( - "Power Value is null - spanLossTx <= 0 dB not compliant with openROADM specifications"); - return false; - } else { - LOG.error("Power Value is null - spanLossTx is null"); + "Power Value is null: spanLossTx null or out of openROADM range ]0,28] {}", spanLossTx); return false; } + BigDecimal powerValue = spanLossTx.subtract(BigDecimal.valueOf(9)); + powerValue = powerValue.min(BigDecimal.valueOf(2)); + //we work at constant power spectral density (50 GHz channel width @-20dBm=37.5GHz) + // 87.5 GHz channel width @-20dBm=75GHz + if (input.getWidth() != null && GridConstant.WIDTH_80.equals(input.getWidth().getValue())) { + powerValue = powerValue.add(BigDecimal.valueOf(3)); + } + LOG.info("Power Value is {}", powerValue); try { Boolean setXconnPowerSuccessVal = crossConnect.setPowerLevel(nodeId, - OpticalControlMode.Power, powerValue, connectionNumber); + OpticalControlMode.Power.getName(), powerValue, connectionNumber); LOG.info("Success Value is {}", setXconnPowerSuccessVal); if (setXconnPowerSuccessVal) { - LOG.info("Roadm-connection: {} updated "); + LOG.info("Roadm-connection: {} updated ", connectionNumber); //The value recommended by the white paper is 20 seconds and not 60. //TODO - commented code because one vendor is not supporting //GainLoss with target-output-power Thread.sleep(OlmUtils.OLM_TIMER_1); - crossConnect.setPowerLevel(nodeId, OpticalControlMode.GainLoss, powerValue, + crossConnect.setPowerLevel(nodeId, OpticalControlMode.GainLoss.getName(), powerValue, connectionNumber); } else { LOG.info("Set Power failed for Roadm-connection: {} on Node: {}", connectionNumber, @@ -273,15 +344,17 @@ public class PowerMgmtImpl implements PowerMgmt { return false; } } catch (InterruptedException e) { - LOG.error("Olm-setPower wait failed {}", e); + LOG.error("Olm-setPower wait failed :", e); return false; } } // If Drop node leave node is power mode } else if (destTpId.toLowerCase().contains("srg")) { LOG.info("Setting power at drop node"); - crossConnect.setPowerLevel(nodeId, OpticalControlMode.Power, null, connectionNumber); + crossConnect.setPowerLevel(nodeId, OpticalControlMode.Power.getName(), null, connectionNumber); } + } else { + LOG.error("OLM-PowerMgmtImpl : Error with node type for node {}", nodeId); } } return true; @@ -308,32 +381,38 @@ public class PowerMgmtImpl implements PowerMgmt { * @return true/false based on status of operation */ public Boolean powerTurnDown(ServicePowerTurndownInput input) { - LOG.info("Olm-powerTurnDown initiated"); + LOG.info("Olm-powerTurnDown initiated for input {}", input); /*Starting with last element into the list Z -> A for turning down A -> Z */ + int lowerSpectralSlotNumber = input.getLowerSpectralSlotNumber().intValue(); + int higherSpectralSlotNumber = input.getHigherSpectralSlotNumber().intValue(); + String spectralSlotName = String.join(GridConstant.SPECTRAL_SLOT_SEPARATOR, + String.valueOf(lowerSpectralSlotNumber), + String.valueOf(higherSpectralSlotNumber)); for (int i = input.getNodes().size() - 1; i >= 0; i--) { String nodeId = input.getNodes().get(i).getNodeId(); String srcTpId = input.getNodes().get(i).getSrcTp(); String destTpId = input.getNodes().get(i).getDestTp(); - Long wlNumber = input.getWaveNumber(); - String connectionNumber = srcTpId + "-" + destTpId + "-" + wlNumber; + String connectionNumber = String.join(GridConstant.NAME_PARAMETERS_SEPARATOR,srcTpId, destTpId, + spectralSlotName); if (destTpId.toLowerCase().contains("srg")) { - crossConnect.setPowerLevel(nodeId, OpticalControlMode.Off, null, connectionNumber); + crossConnect.setPowerLevel(nodeId, OpticalControlMode.Off.getName(), null, connectionNumber); } else if (destTpId.toLowerCase().contains("deg")) { try { - if (!crossConnect.setPowerLevel(nodeId, OpticalControlMode.Power , new BigDecimal(-60), + if (!crossConnect.setPowerLevel(nodeId, OpticalControlMode.Power.getName(), new BigDecimal(-60), connectionNumber)) { LOG.warn("Power down failed for Roadm-connection: {}", connectionNumber); return false; } Thread.sleep(OlmUtils.OLM_TIMER_2); - if (! crossConnect.setPowerLevel(nodeId, OpticalControlMode.Off , null, connectionNumber)) { + if (! crossConnect.setPowerLevel(nodeId, OpticalControlMode.Off.getName(), null, + connectionNumber)) { LOG.warn("Setting power-control mode off failed for Roadm-connection: {}", connectionNumber); return false; } } catch (InterruptedException e) { // TODO Auto-generated catch block - LOG.error("Olm-powerTurnDown wait failed {}",e); + LOG.error("Olm-powerTurnDown wait failed: ",e); return false; } } @@ -341,7 +420,7 @@ public class PowerMgmtImpl implements PowerMgmt { return true; } - /** + /* * This method does an edit-config on roadm connection subtree for a given * connection number in order to set power level for use by the optical * power control. @@ -358,22 +437,22 @@ public class PowerMgmtImpl implements PowerMgmt { * WaveLength number part of request * @return true/false based on status of operation. */ - private boolean setTransponderPowerTx(Nodes inputNode, String destTpId, String srgId, + /*private boolean setTransponderPowerTx(Nodes inputNode, String destTpId, String srgId, String nextNodeId, Long waveLength) { Map txPowerRangeMap = null; Map rxSRGPowerRangeMap = null; - Nodes.OpenroadmVersion openroadmVersion; + OpenroadmVersion openroadmVersion; Optional mappingObject = inputNode.getMapping().stream().filter(o -> o.key() .equals(new MappingKey(destTpId))).findFirst(); String nodeId = inputNode.getNodeId(); if (mappingObject.isPresent()) { String circuitPackName = mappingObject.get().getSupportingCircuitPackName(); String portName = mappingObject.get().getSupportingPort(); - openroadmVersion = inputNode.getOpenroadmVersion(); - if (inputNode.getOpenroadmVersion().equals(Nodes.OpenroadmVersion._121)) { + openroadmVersion = inputNode.getNodeInfo().getOpenroadmVersion(); + if (openroadmVersion.getIntValue() == 1) { txPowerRangeMap = PowerMgmtVersion121.getXponderPowerRange(circuitPackName, portName, nodeId, deviceTransactionManager); - } else if (inputNode.getOpenroadmVersion().equals(Nodes.OpenroadmVersion._221)) { + } else if (openroadmVersion.getIntValue() == 2) { txPowerRangeMap = PowerMgmtVersion221.getXponderPowerRange(circuitPackName, portName, nodeId, deviceTransactionManager); } @@ -388,11 +467,11 @@ public class PowerMgmtImpl implements PowerMgmt { .equals(new MappingKey(srgId))).findFirst()); if (mappingObjectSRG.isPresent()) { LOG.info("Transponder range exists for nodeId: {}", nodeId); - if (inputNode.getOpenroadmVersion().equals(Nodes.OpenroadmVersion._121)) { + if (openroadmVersion.getIntValue() == 1) { rxSRGPowerRangeMap = PowerMgmtVersion121.getSRGRxPowerRange(nextNodeId, srgId, deviceTransactionManager, mappingObjectSRG.get().getSupportingCircuitPackName(), mappingObjectSRG.get().getSupportingPort()); - } else if (inputNode.getOpenroadmVersion().equals(Nodes.OpenroadmVersion._221)) { + } else if (openroadmVersion.getIntValue() == 2) { rxSRGPowerRangeMap = PowerMgmtVersion221.getSRGRxPowerRange(nextNodeId, srgId, deviceTransactionManager, mappingObjectSRG.get().getSupportingCircuitPackName(), mappingObjectSRG.get().getSupportingPort()); @@ -452,7 +531,7 @@ public class PowerMgmtImpl implements PowerMgmt { LOG.info("Mapping object not found for nodeId: {}", nodeId); return false; } - } + }*/ /** * This method retrieves transponder OCH interface and @@ -469,30 +548,45 @@ public class PowerMgmtImpl implements PowerMgmt { * @return true/false based on status of operation */ private boolean callSetTransponderPower(String nodeId, String interfaceName, BigDecimal txPower, - Nodes.OpenroadmVersion openroadmVersion) { + OpenroadmNodeVersion openroadmVersion) { boolean powerSetupResult = false; try { - if (openroadmVersion.equals(Nodes.OpenroadmVersion._121)) { - Optional interfaceOptional; - interfaceOptional = openRoadmInterfaces.getInterface(nodeId, interfaceName); - if (interfaceOptional.isPresent()) { + switch (openroadmVersion.getIntValue()) { + case 1: + Optional interfaceOptional121; + interfaceOptional121 = openRoadmInterfaces.getInterface(nodeId, interfaceName); + if (!interfaceOptional121.isPresent()) { + LOG.error("Interface {} on node {} is not present!", interfaceName, nodeId); + return false; + } powerSetupResult = PowerMgmtVersion121.setTransponderPower(nodeId, interfaceName, - txPower, deviceTransactionManager, interfaceOptional.get()); - } else { - LOG.error("Interface {} on node {} is not present!", interfaceName, nodeId); - return false; - } - } else if (openroadmVersion.equals(Nodes.OpenroadmVersion._221)) { - Optional interfaceOptional; - interfaceOptional = openRoadmInterfaces.getInterface(nodeId, interfaceName); - if (interfaceOptional.isPresent()) { + txPower, deviceTransactionManager, interfaceOptional121.get()); + break; + case 2: + Optional interfaceOptional221; + interfaceOptional221 = openRoadmInterfaces.getInterface(nodeId, interfaceName); + if (!interfaceOptional221.isPresent()) { + LOG.error("Interface {} on node {} is not present!", interfaceName, nodeId); + return false; + } powerSetupResult = PowerMgmtVersion221.setTransponderPower(nodeId, interfaceName, - txPower, deviceTransactionManager, interfaceOptional.get()); - } else { - LOG.error("Interface {} on node {} is not present!", interfaceName, nodeId); + txPower, deviceTransactionManager, interfaceOptional221.get()); + break; + case 3: + Optional interfaceOptional710; + interfaceOptional710 = openRoadmInterfaces.getInterface(nodeId, interfaceName); + if (!interfaceOptional710.isPresent()) { + LOG.error("Interface {} on node {} is not present!", interfaceName, nodeId); + return false; + } + powerSetupResult = PowerMgmtVersion710.setTransponderPower(nodeId, interfaceName, + txPower, deviceTransactionManager, interfaceOptional710.get()); + break; + default: + LOG.error("Unrecognized OpenRoadm version"); return false; - } } } catch (OpenRoadmInterfaceException ex) { LOG.error("Failed to get interface {} from node {}!", interfaceName, nodeId, ex); @@ -501,15 +595,14 @@ public class PowerMgmtImpl implements PowerMgmt { if (powerSetupResult) { LOG.debug("Transponder power set up completed successfully for nodeId {} and interface {}", nodeId,interfaceName); - return powerSetupResult; } else { LOG.debug("Transponder power setup failed for nodeId {} on interface {}", nodeId, interfaceName); - return powerSetupResult; } + return powerSetupResult; } - /** + /* * This method retrieves transponder OCH interface and * sets power. * @@ -523,8 +616,8 @@ public class PowerMgmtImpl implements PowerMgmt { * Wavelength Number * * @return true/false based on status of operation */ - private boolean callSetRoadmPowerTx(String nodeId, String interfaceName, - Nodes.OpenroadmVersion openroadmVersion, + /*private boolean callSetRoadmPowerTx(String nodeId, String interfaceName, + OpenroadmVersion openroadmVersion, Long wavelength, String connectionNumber) { if (interfaceName == null) { crossConnect.setPowerLevel(nodeId, @@ -532,7 +625,7 @@ public class PowerMgmtImpl implements PowerMgmt { return true; } try { - if (openroadmVersion.equals(Nodes.OpenroadmVersion._121)) { + if (openroadmVersion.getIntValue() == 1) { Optional interfaceOpt; interfaceOpt = openRoadmInterfaces.getInterface(nodeId, interfaceName); if (interfaceOpt.isPresent()) { @@ -559,7 +652,7 @@ public class PowerMgmtImpl implements PowerMgmt { LOG.error("Interface {} on node {} is not present!", interfaceName, nodeId); return false; } - } else if (openroadmVersion.equals(Nodes.OpenroadmVersion._221)) { + } else if (openroadmVersion.getIntValue() == 2) { Optional interfaceOpt; interfaceOpt = openRoadmInterfaces.getInterface(nodeId, interfaceName); @@ -591,6 +684,6 @@ public class PowerMgmtImpl implements PowerMgmt { return false; } return false; - } + }*/ }