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.rev201012.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfo.OpenroadmVersion;
+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;
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) {
//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();
&& destTpId != null) {
Nodes inputNode = inputNodeOptional.get();
- OpenroadmVersion openroadmVersion = inputNode.getNodeInfo().getOpenroadmVersion();
+ 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()
java.util.Optional<Mapping> 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<String, Double> txPowerRangeMap = new HashMap<>();
- if (openroadmVersion.getIntValue() == 1) {
- txPowerRangeMap = PowerMgmtVersion121.getXponderPowerRange(circuitPackName, portName,
+ switch (openroadmVersion.getIntValue()) {
+ case 1:
+ txPowerRangeMap = PowerMgmtVersion121.getXponderPowerRange(circuitPackName, portName,
nodeId, deviceTransactionManager);
- } else if (openroadmVersion.getIntValue() == 2) {
- txPowerRangeMap = PowerMgmtVersion221.getXponderPowerRange(circuitPackName, portName,
+ break;
+ case 2:
+ txPowerRangeMap = PowerMgmtVersion221.getXponderPowerRange(circuitPackName, portName,
+ nodeId, deviceTransactionManager);
+ 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<Nodes> inputNextOptional = OlmUtils.getNode(nextNodeId, this.db);
+ if (inputNextOptional.isPresent()) {
+ rdmOpenroadmVersion = inputNextOptional.get()
+ .getNodeInfo().getOpenroadmVersion();
+ }
Map<String, Double> rxSRGPowerRangeMap = new HashMap<>();
Optional<Mapping> mappingObjectSRG = OlmUtils.getNode(nextNodeId, db)
.flatMap(node -> node.nonnullMapping().values()
.stream().filter(o -> o.key()
.equals(new MappingKey(srgId))).findFirst());
- if (mappingObjectSRG.isPresent()) {
- if (openroadmVersion.getIntValue() == 1) {
- rxSRGPowerRangeMap = PowerMgmtVersion121.getSRGRxPowerRange(nextNodeId, srgId,
- deviceTransactionManager, mappingObjectSRG.get()
- .getSupportingCircuitPackName(),
- mappingObjectSRG.get().getSupportingPort());
- } else if (openroadmVersion.getIntValue() == 2) {
- 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;
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);
}
} else {
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)) {
+ 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);
}
} 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);
&& inputNodeOptional.get().getNodeInfo().getNodeType().equals(NodeTypes.Rdm)) {
// If Degree is transmitting end then set power
Nodes inputNode = inputNodeOptional.get();
- OpenroadmVersion openroadmVersion = inputNode.getNodeInfo().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<Mapping> mappingObjectOptional = inputNode.nonnullMapping()
}
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));
+ //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 {
* @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().toJava();
- 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.getName(), null, connectionNumber);
} else if (destTpId.toLowerCase().contains("deg")) {
* @return true/false based on status of operation
*/
private boolean callSetTransponderPower(String nodeId, String interfaceName, BigDecimal txPower,
- OpenroadmVersion openroadmVersion) {
+ OpenroadmNodeVersion openroadmVersion) {
boolean powerSetupResult = false;
try {
- if (openroadmVersion.getIntValue() == 1) {
- Optional<Interface> interfaceOptional;
- interfaceOptional = openRoadmInterfaces.getInterface(nodeId, interfaceName);
- if (interfaceOptional.isPresent()) {
+ switch (openroadmVersion.getIntValue()) {
+ case 1:
+ Optional<Interface> 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.getIntValue() == 2) {
- Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp
- .Interface> interfaceOptional;
- interfaceOptional = openRoadmInterfaces.getInterface(nodeId, interfaceName);
- if (interfaceOptional.isPresent()) {
+ txPower, deviceTransactionManager, interfaceOptional121.get());
+ break;
+ case 2:
+ Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp
+ .Interface> 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<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.interfaces.grp
+ .Interface> 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);
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;
}
/*
Code Review / transportpce.git / blobdiff