import org.opendaylight.transportpce.common.StringConstants;
import org.opendaylight.transportpce.common.Timeouts;
import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
-import org.opendaylight.transportpce.common.fixedflex.FixedFlexInterface;
-import org.opendaylight.transportpce.common.fixedflex.FlexGridInterface;
import org.opendaylight.transportpce.common.fixedflex.GridConstant;
+import org.opendaylight.transportpce.common.fixedflex.SpectrumInformation;
import org.opendaylight.transportpce.common.mapping.PortMapping;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces;
-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.rev210315.mapping.Mapping;
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;
"Unable to get mapping from PortMapping for node % and logical connection port %s";
private final PortMapping portMapping;
private final OpenRoadmInterfaces openRoadmInterfaces;
- private FixedFlexInterface fixedFlex;
- private FlexGridInterface flexGrid;
private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmInterface221.class);
- public OpenRoadmInterface221(PortMapping portMapping, OpenRoadmInterfaces openRoadmInterfaces,
- FixedFlexInterface fixedFlex, FlexGridInterface flexGrid) {
+ public OpenRoadmInterface221(PortMapping portMapping, OpenRoadmInterfaces openRoadmInterfaces) {
this.portMapping = portMapping;
this.openRoadmInterfaces = openRoadmInterfaces;
- this.fixedFlex = fixedFlex;
- this.flexGrid = flexGrid;
}
public String createOpenRoadmEthInterface(String nodeId, String logicalConnPoint)
return ethInterfaceBldr.getName();
}
- public List<String> createFlexOCH(String nodeId, String logicalConnPoint, BigDecimal centerFreq,
- BigDecimal width, int lowerSpectralSlotNumber, int higherSpectralSlotNumber)
+ public List<String> createFlexOCH(String nodeId, String logicalConnPoint, SpectrumInformation spectrumInformation)
throws OpenRoadmInterfaceException {
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
}
List<String> interfacesCreated = new ArrayList<>();
-
+ String mcInterfaceCreated = "";
if (logicalConnPoint.contains("DEG")) {
- String mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, centerFreq, width,
- lowerSpectralSlotNumber, higherSpectralSlotNumber);
+ mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, spectrumInformation);
interfacesCreated.add(mcInterfaceCreated);
}
- String mcInterfaceCreated = createNMCInterface(nodeId, logicalConnPoint, centerFreq, width,
- lowerSpectralSlotNumber, higherSpectralSlotNumber);
- interfacesCreated.add(mcInterfaceCreated);
- return interfacesCreated;
- }
-
- /**
- * This methods creates an OCH interface on the given termination point on
- * Roadm.
- *
- * @param nodeId node ID
- * @param logicalConnPoint logical connection point
- * @param waveNumber wavelength number of the OCH interface.
- * @param lowerSpectralSlotNumber int
- * @param higherSpectralSlotNumber int
- * @return Name of the interface if successful, otherwise return null.
- *
- * @throws OpenRoadmInterfaceException OpenRoadm interface exception
- */
-
- public List<String> createFlexOCH(String nodeId, String logicalConnPoint, Long waveNumber,
- int lowerSpectralSlotNumber, int higherSpectralSlotNumber)
- throws OpenRoadmInterfaceException {
- Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
- if (portMap == null) {
- throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
- }
-
- List<String> interfacesCreated = new ArrayList<>();
-
- if (logicalConnPoint.contains("DEG")) {
- String mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, waveNumber,
- lowerSpectralSlotNumber, higherSpectralSlotNumber);
- interfacesCreated.add(mcInterfaceCreated);
- }
- String nmcInterfaceCreated = createNMCInterface(nodeId, logicalConnPoint, waveNumber,
- lowerSpectralSlotNumber, higherSpectralSlotNumber);
+ String nmcInterfaceCreated = createNMCInterface(nodeId, logicalConnPoint, spectrumInformation,
+ mcInterfaceCreated);
interfacesCreated.add(nmcInterfaceCreated);
return interfacesCreated;
}
-
- public String createMCInterface(String nodeId, String logicalConnPoint, Long waveNumber,
- int lowerSpectralSlotNumber, int higherSpectralSlotNumber)
- throws OpenRoadmInterfaceException {
-
- // TODO : Check this method
-
- fixedFlex = fixedFlex.getFixedFlexWaveMapping(waveNumber.shortValue());
-
- Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
- if (portMap == null) {
- throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
- }
-
- // TODO : Check this method
- String spectralSlotName = String.join(GridConstant.SPECTRAL_SLOT_SEPARATOR,
- String.valueOf(lowerSpectralSlotNumber),
- String.valueOf(higherSpectralSlotNumber));
- InterfaceBuilder mcInterfaceBldr = createGenericInterfaceBuilder(portMap,
- MediaChannelTrailTerminationPoint.class, String.join(GridConstant.NAME_PARAMETERS_SEPARATOR,
- logicalConnPoint,"mc",
- spectralSlotName))
- .setSupportingInterface(portMap.getSupportingOms());
-
- McTtpBuilder mcTtpBuilder = new McTtpBuilder()
- .setMinFreq(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getStart())))
- .setMaxFreq(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getStop())));
-
- // Create Interface1 type object required for adding as augmentation
- org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1Builder
- interface1Builder =
- new org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1Builder()
- .setMcTtp(mcTtpBuilder.build());
-
- mcInterfaceBldr.addAugmentation(interface1Builder.build());
-
- // Post interface on the device
- openRoadmInterfaces.postInterface(nodeId, mcInterfaceBldr);
- return mcInterfaceBldr.getName();
- }
-
public String createMCInterface(String nodeId, String logicalConnPoint,
- BigDecimal centerFrequency, BigDecimal width, int lowerSpectralSlotNumber, int higherSpectralSlotNumber)
+ SpectrumInformation spectrumInformation)
throws OpenRoadmInterfaceException {
-
- // TODO : Check this method
- flexGrid = flexGrid.getFlexWaveMapping(centerFrequency.floatValue(),
- GridConstant.WIDTH_SLOT_WIDTH_MAP.get(width).floatValue());
-
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
throw new OpenRoadmInterfaceException(
String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
}
- String spectralSlotName = String.join(GridConstant.SPECTRAL_SLOT_SEPARATOR,
- String.valueOf(lowerSpectralSlotNumber),
- String.valueOf(higherSpectralSlotNumber));
// TODO : Check this method
LOG.info("MC interface Freq Start {} and Freq End {} and center-Freq {}",
- flexGrid.getStart(), flexGrid.getStop(), centerFrequency);
+ spectrumInformation.getMinFrequency(), spectrumInformation.getMaxFrequency(),
+ spectrumInformation.getCenterFrequency());
InterfaceBuilder mcInterfaceBldr = createGenericInterfaceBuilder(portMap,
- MediaChannelTrailTerminationPoint.class, String.join(GridConstant.NAME_PARAMETERS_SEPARATOR,
- logicalConnPoint, "mc", spectralSlotName))
+ MediaChannelTrailTerminationPoint.class,
+ spectrumInformation.getIdentifierFromParams(logicalConnPoint, "mc"))
.setSupportingInterface(portMap.getSupportingOms());
McTtpBuilder mcTtpBuilder = new McTtpBuilder()
- .setMinFreq(FrequencyTHz.getDefaultInstance(String.valueOf(flexGrid.getStart())))
- .setMaxFreq(FrequencyTHz.getDefaultInstance(String.valueOf(flexGrid.getStop())));
+ .setMinFreq(new FrequencyTHz(spectrumInformation.getMinFrequency()))
+ .setMaxFreq(new FrequencyTHz(spectrumInformation.getMaxFrequency()));
// Create Interface1 type object required for adding as augmentation
org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1Builder
return mcInterfaceBldr.getName();
}
- public String createNMCInterface(String nodeId, String logicalConnPoint, Long waveNumber,
- int lowerSpectralSlotNumber, int higherSpectralSlotNumber)
- throws OpenRoadmInterfaceException {
-
- // TODO : Check this method
- fixedFlex = fixedFlex.getFixedFlexWaveMapping(waveNumber.shortValue());
-
- Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
- if (portMap == null) {
- throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
- }
- String spectralSlotName = String.join(GridConstant.SPECTRAL_SLOT_SEPARATOR,
- String.valueOf(lowerSpectralSlotNumber),
- String.valueOf(higherSpectralSlotNumber));
- LOG.info("Freq Start {} and Freq End {} and center-Freq {}",
- fixedFlex.getStart(), fixedFlex.getStop(), fixedFlex.getCenterFrequency());
- //TODO : Check this method
- InterfaceBuilder nmcInterfaceBldr = createGenericInterfaceBuilder(portMap,
- NetworkMediaChannelConnectionTerminationPoint.class, String.join(GridConstant.NAME_PARAMETERS_SEPARATOR,
- logicalConnPoint, "nmc", spectralSlotName));
- if (logicalConnPoint.contains("DEG")) {
- nmcInterfaceBldr.setSupportingInterface(String.join(GridConstant.NAME_PARAMETERS_SEPARATOR,
- logicalConnPoint, "mc", spectralSlotName));
- }
-
- NmcCtpBuilder nmcCtpIfBuilder = new NmcCtpBuilder()
- .setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency())))
- .setWidth(FrequencyGHz.getDefaultInstance("40"));
-
- // Create Interface1 type object required for adding as augmentation
- org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019.Interface1Builder
- nmcCtpI1fBuilder =
- new org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019
- .Interface1Builder().setNmcCtp(nmcCtpIfBuilder.build());
- nmcInterfaceBldr.addAugmentation(nmcCtpI1fBuilder.build());
-
- // Post interface on the device
- openRoadmInterfaces.postInterface(nodeId, nmcInterfaceBldr);
- return nmcInterfaceBldr.getName();
- }
-
public String createNMCInterface(String nodeId, String logicalConnPoint,
- BigDecimal centerFrequency, BigDecimal width, int lowerSpectralSlotNumber, int higherSpectralSlotNumber)
+ SpectrumInformation spectrumInformation, String mcName)
throws OpenRoadmInterfaceException {
- LOG.info("This is the central frequency {}", centerFrequency.floatValue());
- LOG.info("This is the nmc width {}", width.floatValue());
+ LOG.info("This is the central frequency {}", spectrumInformation.getCenterFrequency());
+ LOG.info("This is the nmc width {}", spectrumInformation.getWidth());
// TODO : Check this method
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
throw new OpenRoadmInterfaceException(
String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
}
- String spectralSlotName = String.join(GridConstant.SPECTRAL_SLOT_SEPARATOR,
- String.valueOf(lowerSpectralSlotNumber),
- String.valueOf(higherSpectralSlotNumber));
//TODO : Check this method
- String nmcName = String.join(GridConstant.NAME_PARAMETERS_SEPARATOR,logicalConnPoint, "nmc",
- spectralSlotName);
+ String nmcName = spectrumInformation.getIdentifierFromParams(logicalConnPoint, "nmc");
InterfaceBuilder nmcInterfaceBldr = createGenericInterfaceBuilder(portMap,
NetworkMediaChannelConnectionTerminationPoint.class, nmcName);
if (logicalConnPoint.contains("DEG")) {
- nmcInterfaceBldr.setSupportingInterface(nmcName);
+ nmcInterfaceBldr.setSupportingInterface(mcName);
}
NmcCtpBuilder nmcCtpIfBuilder = new NmcCtpBuilder()
- .setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(centerFrequency)))
- .setWidth(new FrequencyGHz(width));
+ .setFrequency(new FrequencyTHz(spectrumInformation.getCenterFrequency()))
+ .setWidth(new FrequencyGHz(spectrumInformation.getWidth()));
// Create Interface1 type object required for adding as augmentation
org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019.Interface1Builder
return nmcInterfaceBldr.getName();
}
- public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber,
- int lowerSpectralSlotNumber, int higherSpectralSlotNumber)
- throws OpenRoadmInterfaceException {
- // TODO : Check this method
-
- fixedFlex = fixedFlex.getFixedFlexWaveMapping(waveNumber.shortValue());
-
- Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
- if (portMap == null) {
- throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
- }
-
- // OCH interface specific data
- OchBuilder ocIfBuilder = new OchBuilder()
- .setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency())))
- .setRate(R100G.class)
- // TODO: Check if this the correct way to set modulation format here
- .setModulationFormat(ModulationFormat.DpQpsk)
- .setTransmitPower(new PowerDBm(new BigDecimal("-5")));
- String spectralSlotName = String.join(GridConstant.SPECTRAL_SLOT_SEPARATOR,
- String.valueOf(lowerSpectralSlotNumber),
- String.valueOf(higherSpectralSlotNumber));
- // Create generic interface
- InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class,
- createOpenRoadmOchInterfaceName(logicalConnPoint, spectralSlotName));
- // Create Interface1 type object required for adding as augmentation
- // TODO look at imports of different versions of class
- org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev181019.Interface1Builder
- ochIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev181019
- .Interface1Builder();
- ochInterfaceBldr.addAugmentation(ochIf1Builder.setOch(ocIfBuilder.build()).build());
-
- // Post interface on the device
- openRoadmInterfaces.postInterface(nodeId, ochInterfaceBldr);
-
- // Post the equipment-state change on the device circuit-pack if xpdr node
- if (portMap.getLogicalConnectionPoint().contains(StringConstants.NETWORK_TOKEN)) {
- this.openRoadmInterfaces.postEquipmentState(nodeId, portMap.getSupportingCircuitPackName(), true);
- }
-
- return ochInterfaceBldr.getName();
- }
-
public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint,
- BigDecimal centerFrequency, int lowerSpectralSlotNumber, int higherSpectralSlotNumber, String format)
+ SpectrumInformation spectrumInformation)
throws OpenRoadmInterfaceException {
// TODO : Check this method
- if (centerFrequency == null) {
- LOG.error("Center frequency cannot be null");
- throw new OpenRoadmInterfaceException("Center frequency cannot be null");
- }
ModulationFormat modulationFormat = ModulationFormat.DpQpsk;
- Optional<ModulationFormat> optionalModulationFormat = ModulationFormat.forName(format);
+ Optional<ModulationFormat> optionalModulationFormat = ModulationFormat
+ .forName(spectrumInformation.getModulationFormat());
if (optionalModulationFormat.isPresent()) {
modulationFormat = optionalModulationFormat.get();
}
// OCH interface specific data
OchBuilder ocIfBuilder = new OchBuilder()
- .setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(centerFrequency)))
+ .setFrequency(new FrequencyTHz(spectrumInformation.getCenterFrequency()))
.setRate(R100G.class)
.setTransmitPower(new PowerDBm(new BigDecimal("-5")))
.setModulationFormat(modulationFormat);
String.format("Unable to get mapping from PortMapping for node %s and logical connection port %s",
nodeId, logicalConnPoint));
}
- String spectralSlotName = String.join(GridConstant.SPECTRAL_SLOT_SEPARATOR,
- String.valueOf(lowerSpectralSlotNumber),
- String.valueOf(higherSpectralSlotNumber));
// Create generic interface
InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class,
- createOpenRoadmOchInterfaceName(logicalConnPoint, spectralSlotName));
+ spectrumInformation.getIdentifierFromParams(logicalConnPoint));
// Create Interface1 type object required for adding as augmentation
// TODO look at imports of different versions of class
org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev181019.Interface1Builder
Code Review / transportpce.git / blobdiff