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.mdsal.binding.api.DataBroker;
import org.opendaylight.transportpce.common.crossconnect.CrossConnect;
import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
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.rev190702.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.NodeInfo.OpenroadmVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.Nodes;
+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.MappingKey;
+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.types.rev161014.OpticalControlMode;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.Interface;
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;
* @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");
for (int i = 0; i < input.getNodes().size(); i++) {
// If node type is transponder
if (inputNodeOptional.isPresent()
&& (inputNodeOptional.get().getNodeInfo().getNodeType() != null)
- && inputNodeOptional.get().getNodeInfo().getNodeType().equals(NodeTypes.Xpdr)) {
+ && inputNodeOptional.get().getNodeInfo().getNodeType().equals(NodeTypes.Xpdr)
+ && destTpId != null) {
Nodes inputNode = inputNodeOptional.get();
OpenroadmVersion openroadmVersion = inputNode.getNodeInfo().getOpenroadmVersion();
LOG.info("Getting data from input node {}", inputNode.getNodeInfo().getNodeType());
LOG.info("Getting mapping data for node is {}", inputNode.getMapping().stream().filter(o -> o.key()
- .equals(new MappingKey(destTpId))).findFirst().toString());
+ .equals(new MappingKey(destTpId))).findFirst().toString());
// If its A-End transponder
if (destTpId.toLowerCase().contains("network")) {
java.util.Optional<Mapping> mappingObject = inputNode.getMapping().stream().filter(o -> o.key()
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 = destTpId + "-" + input.getWaveNumber();
+ if (callSetTransponderPower(nodeId, interfaceName, new BigDecimal(-5),
+ openroadmVersion)) {
+ 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);
}
}
- 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));
+ // If slot-width is other than 50GHz then calculate PSD power value
+ if (input.getSlotWidth() != null && input.getSlotWidth().getValue().doubleValue() != 50) {
+ Double psdPower = 10 * Math.log(input.getSlotWidth().getValue().doubleValue() / 50);
+ powerValue = powerValue.add(new BigDecimal(psdPower));
+ }
+ 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,
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);
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();
+ Long wlNumber = input.getWaveNumber().toJava();
String connectionNumber = srcTpId + "-" + destTpId + "-" + wlNumber;
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;
}
}
Code Review / transportpce.git / blobdiff