import com.google.common.util.concurrent.ListenableFuture;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.Set;
import java.util.TreeMap;
import java.util.stream.Collectors;
import org.opendaylight.transportpce.common.NodeIdPair;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequestInput;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequestOutput;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequestOutputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.configuration.response.common.ConfigurationResponseCommon;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.configuration.response.common.ConfigurationResponseCommonBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.configuration.response.common.ConfigurationResponseCommon;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.configuration.response.common.ConfigurationResponseCommonBuilder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyGHz;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyTHz;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.ModulationFormat;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.OpucnTribSlotDef;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.OpucnTribSlotDef;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.ServiceDeleteInput;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.PathDescription;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.AToZDirection;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ZToADirection;
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.Decimal64;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
import org.opendaylight.yangtools.yang.common.Uint32;
.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))));
+ olmSetupBldr.setMcWidth(new FrequencyGHz(Decimal64.valueOf(
+ atoZDirection.getAToZMaxFrequency().getValue().decimalValue()
+ .subtract(atoZDirection.getAToZMinFrequency().getValue().decimalValue())
+ .multiply(new BigDecimal(1000)))));
}
return olmSetupBldr.build();
}
.setServiceName(serviceName)
.setOperation(operation)
.setNodes(nodeLists.getRendererNodeList())
- .setNmcWidth(new FrequencyGHz(GridConstant.WIDTH_40))
- .setMcWidth(new FrequencyGHz(pathDescription.getAToZDirection().getAToZMaxFrequency().getValue()
- .subtract(pathDescription.getAToZDirection().getAToZMinFrequency().getValue())));
+ .setNmcWidth(new FrequencyGHz(Decimal64.valueOf(GridConstant.WIDTH_40)))
+ .setMcWidth(new FrequencyGHz(Decimal64.valueOf(
+ pathDescription.getAToZDirection().getAToZMaxFrequency().getValue().decimalValue()
+ .subtract(pathDescription.getAToZDirection().getAToZMinFrequency().getValue().decimalValue()))));
if (atoZDirection.getAToZWavelengthNumber() != null) {
servicePathInputBuilder
.setWaveNumber(atoZDirection.getAToZWavelengthNumber());
.getHigherSpectralIndexFromFrequency(atoZDirection.getAToZMaxFrequency().getValue())));
}
if (atoZDirection.getAToZMinFrequency() != null && atoZDirection.getAToZMaxFrequency() != null) {
- servicePathInputBuilder.setCenterFreq(
- GridUtils.getCentralFrequencyWithPrecision(atoZDirection.getAToZMinFrequency().getValue(),
- atoZDirection.getAToZMaxFrequency().getValue(), scale));
+ servicePathInputBuilder.setCenterFreq(GridUtils.getCentralFrequencyWithPrecision(
+ atoZDirection.getAToZMinFrequency().getValue().decimalValue(),
+ atoZDirection.getAToZMaxFrequency().getValue().decimalValue(),
+ scale));
}
if (atoZDirection.getRate() != null && atoZDirection.getModulationFormat() != null) {
Optional<ModulationFormat> optionalModulationFormat = ModulationFormat
.setOperation(operation)
.setServiceName(serviceName)
.setNodes(nodeLists.getRendererNodeList())
- .setNmcWidth(new FrequencyGHz(GridConstant.WIDTH_40))
- .setMcWidth(new FrequencyGHz(pathDescription.getAToZDirection().getAToZMaxFrequency().getValue()
- .subtract(pathDescription.getAToZDirection().getAToZMinFrequency().getValue())));
+ .setNmcWidth(new FrequencyGHz(Decimal64.valueOf(GridConstant.WIDTH_40)))
+ .setMcWidth(new FrequencyGHz(Decimal64.valueOf(
+ pathDescription.getAToZDirection().getAToZMaxFrequency().getValue().decimalValue()
+ .subtract(pathDescription.getAToZDirection().getAToZMinFrequency().getValue().decimalValue()))));
if (ztoADirection.getZToAWavelengthNumber() != null) {
servicePathInputBuilder
.setWaveNumber(ztoADirection.getZToAWavelengthNumber());
.getHigherSpectralIndexFromFrequency(ztoADirection.getZToAMaxFrequency().getValue())));
}
if (ztoADirection.getZToAMinFrequency() != null && ztoADirection.getZToAMaxFrequency() != null) {
- servicePathInputBuilder.setCenterFreq(
- GridUtils.getCentralFrequencyWithPrecision(ztoADirection.getZToAMinFrequency().getValue(),
- ztoADirection.getZToAMaxFrequency().getValue(), scale));
+ servicePathInputBuilder.setCenterFreq(GridUtils.getCentralFrequencyWithPrecision(
+ ztoADirection.getZToAMinFrequency().getValue().decimalValue(),
+ ztoADirection.getZToAMaxFrequency().getValue().decimalValue(),
+ scale));
}
if (ztoADirection.getRate() != null && ztoADirection.getModulationFormat() != null) {
Optional<ModulationFormat> optionalModulationFormat = ModulationFormat
.setTribPortNumber(tribPort)
.setTribSlot(minTribSlot);
}
- if (serviceRate.intValue() == 100) {
- List<OpucnTribSlotDef> opucnTribSlotDefList = new ArrayList<>();
- opucnTribSlotDefList.add(pathDescription.getAToZDirection().getMinTribSlot());
- opucnTribSlotDefList.add(pathDescription.getAToZDirection().getMaxTribSlot());
+ if (serviceRate.intValue() == 100 && pathDescription.getAToZDirection().getMinTribSlot() != null
+ && pathDescription.getAToZDirection().getMaxTribSlot() != null) {
+ Set<OpucnTribSlotDef> opucnTribSlotDefList = new HashSet<>();
+ opucnTribSlotDefList.add(
+ new OpucnTribSlotDef(pathDescription.getAToZDirection().getMinTribSlot().getValue()));
+ opucnTribSlotDefList.add(
+ new OpucnTribSlotDef(pathDescription.getAToZDirection().getMaxTribSlot().getValue()));
otnServicePathInputBuilder.setOpucnTribSlots(opucnTribSlotDefList);
}
return otnServicePathInputBuilder.build();
return new ServicePathInputBuilder().setServiceName(serviceName).build();
}
- public static List<String> getLinksFromServicePathDescription(PathDescription pathDescription) {
- List<String> linkidList = new ArrayList<>();
+ public static Set<String> getLinksFromServicePathDescription(PathDescription pathDescription) {
+ Set<String> linkidList = new HashSet<>();
pathDescription.getAToZDirection().getAToZ().values().stream()
.filter(lk -> "Link".equals(lk.getResource().getResource().implementedInterface().getSimpleName()))
.forEach(rsc -> {