package org.opendaylight.transportpce.renderer;
import com.google.common.util.concurrent.ListenableFuture;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.Resource;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.Link;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.TerminationPoint;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.optical.renderer.nodes.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.optical.renderer.nodes.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.optical.renderer.nodes.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.optical.renderer.nodes.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.optical.renderer.nodes.NodesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.optical.renderer.nodes.NodesKey;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
import org.opendaylight.yangtools.yang.common.Uint32;
olmSetupBldr.setWaveNumber(atoZDirection.getAToZWavelengthNumber());
if (atoZDirection.getAToZMinFrequency() != null) {
olmSetupBldr.setLowerSpectralSlotNumber(Uint32
- .valueOf(GridUtils
- .getLowerSpectralIndexFromFrequency(atoZDirection.getAToZMinFrequency().getValue())));
+ .valueOf(GridUtils
+ .getLowerSpectralIndexFromFrequency(atoZDirection.getAToZMinFrequency().getValue())));
}
if (atoZDirection.getAToZMaxFrequency() != null) {
olmSetupBldr.setHigherSpectralSlotNumber(Uint32
- .valueOf(GridUtils
- .getHigherSpectralIndexFromFrequency(atoZDirection.getAToZMaxFrequency().getValue())));
+ .valueOf(GridUtils
+ .getHigherSpectralIndexFromFrequency(atoZDirection.getAToZMaxFrequency().getValue())));
}
+ // Set the MC-width for the OLM
+ olmSetupBldr.setMcWidth(new FrequencyGHz(atoZDirection.getAToZMaxFrequency().getValue()
+ .subtract(atoZDirection.getAToZMinFrequency().getValue()).multiply(new BigDecimal(1000))));
}
return olmSetupBldr.build();
}
.setServiceName(serviceName)
.setOperation(operation)
.setNodes(nodeLists.getRendererNodeList())
- .setWidth(new FrequencyGHz(GridConstant.WIDTH_40));
+ .setNmcWidth(new FrequencyGHz(GridConstant.WIDTH_40))
+ .setMcWidth(new FrequencyGHz(pathDescription.getAToZDirection().getAToZMaxFrequency().getValue()
+ .subtract(pathDescription.getAToZDirection().getAToZMinFrequency().getValue())));
if (atoZDirection.getAToZWavelengthNumber() != null) {
servicePathInputBuilder
.setWaveNumber(atoZDirection.getAToZWavelengthNumber());
&& GridConstant.FREQUENCY_WIDTH_TABLE
.contains(atoZDirection.getRate(), optionalModulationFormat.get())) {
servicePathInputBuilder
- .setWidth(FrequencyGHz
+ .setNmcWidth(FrequencyGHz
.getDefaultInstance(GridConstant.FREQUENCY_WIDTH_TABLE.get(atoZDirection.getRate(),
optionalModulationFormat.get())));
}
.setOperation(operation)
.setServiceName(serviceName)
.setNodes(nodeLists.getRendererNodeList())
- .setWidth(new FrequencyGHz(GridConstant.WIDTH_40));
+ .setNmcWidth(new FrequencyGHz(GridConstant.WIDTH_40))
+ .setMcWidth(new FrequencyGHz(pathDescription.getAToZDirection().getAToZMaxFrequency().getValue()
+ .subtract(pathDescription.getAToZDirection().getAToZMinFrequency().getValue())));
if (ztoADirection.getZToAWavelengthNumber() != null) {
servicePathInputBuilder
.setWaveNumber(ztoADirection.getZToAWavelengthNumber());
if (optionalModulationFormat.isPresent()
&& GridConstant.FREQUENCY_WIDTH_TABLE
.contains(ztoADirection.getRate(), optionalModulationFormat.get())) {
- servicePathInputBuilder.setWidth(FrequencyGHz
+ servicePathInputBuilder.setNmcWidth(FrequencyGHz
.getDefaultInstance(GridConstant.FREQUENCY_WIDTH_TABLE.get(ztoADirection.getRate(),
optionalModulationFormat.get())));
}
public static OtnServicePathInput rendererCreateOtnServiceInput(String serviceName, Action operation,
String serviceFormat, Uint32 serviceRate, PathDescription pathDescription, boolean asideToZside) {
// If atoZ is set true use A-to-Z direction otherwise use Z-to-A
- List<org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.otn.renderer.nodes.Nodes> nodes =
+ List<org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.otn.renderer.nodes.Nodes> nodes =
new ArrayList<>();
NodeLists nodeLists =
(asideToZside)
: getNodesListZtoA(pathDescription.getZToADirection().nonnullZToA().values().iterator());
LOG.info("These are node-lists {}, {}", nodeLists.getRendererNodeList(), nodeLists.getOlmNodeList());
for (Nodes node: nodeLists.getRendererNodeList()) {
- org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.otn.renderer.nodes.NodesBuilder nb
- = new org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.otn.renderer.nodes
+ org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.otn.renderer.nodes.NodesBuilder nb
+ = new org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.otn.renderer.nodes
.NodesBuilder().setNodeId(node.getNodeId()).setNetworkTp(node.getDestTp());
if (node.getSrcTp() != null && node.getSrcTp().contains("NETWORK")) {
nb.setNetwork2Tp(node.getSrcTp());