import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.az.api.info.AEndApiInfo;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.az.api.info.ZEndApiInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev231221.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;
import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev171215.OTU4;
import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev171215.OduFunctionIdentity;
import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev171215.PayloadTypeDef;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1;
import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.OduAttributes;
import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.OduAttributes.MonitoringMode;
import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.odu.container.OduBuilder;
public class OpenRoadmInterface221 {
- private static final String MAPPING_ERROR_EXCEPTION_MESSAGE =
- "Unable to get mapping from PortMapping for node % and logical connection port %s";
private final PortMapping portMapping;
private final OpenRoadmInterfaces openRoadmInterfaces;
private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmInterface221.class);
Mapping mapping = portMapping.getMapping(nodeId, logicalConnPoint);
if (mapping == null) {
throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
+ OpenRoadmInterfaceException.mapping_msg_err(nodeId, logicalConnPoint));
}
// Post interface on the device
InterfaceBuilder ethInterfaceBldr =
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
+ OpenRoadmInterfaceException.mapping_msg_err(nodeId, logicalConnPoint));
}
List<String> interfacesCreated = new ArrayList<>();
String mcInterfaceCreated = "";
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
+ OpenRoadmInterfaceException.mapping_msg_err(nodeId, logicalConnPoint));
}
- // TODO : Check this method
LOG.info("MC interface Freq Start {} and Freq End {} and center-Freq {}",
spectrumInformation.getMinFrequency(), spectrumInformation.getMaxFrequency(),
spectrumInformation.getCenterFrequency());
public String createNMCInterface(String nodeId, String logicalConnPoint,
SpectrumInformation spectrumInformation, String mcName)
throws OpenRoadmInterfaceException {
- //TODO improve logs messages
- LOG.info("This is the central frequency {}", spectrumInformation.getCenterFrequency());
- LOG.info("This is the nmc width {}", spectrumInformation.getWidth());
- // TODO : Check this method
+ LOG.info("The central frequency is {} and the nmc width is {}",
+ spectrumInformation.getCenterFrequency(), spectrumInformation.getWidth());
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
+ OpenRoadmInterfaceException.mapping_msg_err(nodeId, logicalConnPoint));
}
- //TODO : Check this method
InterfaceBuilder nmcInterfaceBldr =
createGenericInterfaceBuilder(
portMap, NetworkMediaChannelConnectionTerminationPoint.VALUE,
public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint,
SpectrumInformation spectrumInformation)
throws OpenRoadmInterfaceException {
- // TODO : Check this method
ModulationFormat modulationFormat = ModulationFormat.forName(spectrumInformation.getModulationFormat());
if (modulationFormat == null) {
modulationFormat = ModulationFormat.DpQpsk;
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
throw new OpenRoadmInterfaceException(
- String.format("Unable to get mapping from PortMapping for node %s and logical connection port %s",
- nodeId, logicalConnPoint));
+ OpenRoadmInterfaceException.mapping_msg_err(nodeId, logicalConnPoint));
}
// Create generic interface
InterfaceBuilder ochInterfaceBldr =
spectrumInformation.getIdentifierFromParams(logicalConnPoint))
.addAugmentation(
// Create Interface1 type object required for adding as augmentation
- // TODO look at imports of different versions of class
new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev181019
.Interface1Builder()
.setOch(
Mapping mapping = portMapping.getMapping(nodeId, logicalConnPoint);
if (mapping == null) {
throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
+ OpenRoadmInterfaceException.mapping_msg_err(nodeId, logicalConnPoint));
}
InterfaceBuilder oduInterfaceBldr =
createGenericInterfaceBuilder(mapping, OtnOdu.VALUE, logicalConnPoint + "-ODU4");
if (mapping.getSupportingEthernet() != null) {
oduInterfaceBldr.setSupportingInterface(mapping.getSupportingEthernet());
}
- // ODU interface specific data
- OduFunctionIdentity oduFunction;
- MonitoringMode monitoringMode;
- Opu opu = null;
if (isCTP) {
- oduFunction = ODUCTP.VALUE;
- monitoringMode = MonitoringMode.Monitored;
- } else {
- oduFunction =
- // For TPDR it can be both CTP and TTP
- // For switch-ponder we still use TTP
- mapping.getXponderType() == XpdrNodeTypes.Tpdr
- ? ODUTTPCTP.VALUE
- : ODUTTP.VALUE;
- monitoringMode = MonitoringMode.Terminated;
- opu = new OpuBuilder()
- .setPayloadType(PayloadTypeDef.getDefaultInstance(payloadType))
- .setExpPayloadType(PayloadTypeDef.getDefaultInstance(payloadType))
- .build();
+ // Create Interface1 type object required for adding as augmentation
+ oduInterfaceBldr.addAugmentation(
+ createOdu4HOInterface1(ODUCTP.VALUE, MonitoringMode.Monitored, null, apiInfoA, apiInfoZ));
+ // Post interface on the device
+ openRoadmInterfaces.postInterface(nodeId, oduInterfaceBldr);
+ return oduInterfaceBldr.getName();
}
+ // Create Interface1 type object required for adding as augmentation
+ oduInterfaceBldr.addAugmentation(
+ createOdu4HOInterface1(
+ // For TPDR it can be both CTP and TTP - For switch-ponder we still use TTP
+ mapping.getXpdrType() == XpdrNodeTypes.Tpdr ? ODUTTPCTP.VALUE : ODUTTP.VALUE,
+ MonitoringMode.Terminated,
+ new OpuBuilder()
+ .setPayloadType(PayloadTypeDef.getDefaultInstance(payloadType))
+ .setExpPayloadType(PayloadTypeDef.getDefaultInstance(payloadType))
+ .build(),
+ apiInfoA, apiInfoZ));
+ // Post interface on the device
+ openRoadmInterfaces.postInterface(nodeId, oduInterfaceBldr);
+ LOG.info("{}-{} updating mapping with interface {}", nodeId, logicalConnPoint, oduInterfaceBldr.getName());
+ this.portMapping.updateMapping(nodeId, mapping);
+ return oduInterfaceBldr.getName();
+ }
+
+ private Interface1 createOdu4HOInterface1(
+ OduFunctionIdentity oduFunction, MonitoringMode monitoringMode, Opu opu,
+ AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ) {
OduBuilder oduIfBuilder = new OduBuilder()
.setRate(ODU4.VALUE)
.setOduFunction(oduFunction)
.setExpectedSapi(apiInfoZ.getExpectedSapi())
.setExpectedDapi(apiInfoZ.getExpectedDapi());
}
- // Create Interface1 type object required for adding as augmentation
- // TODO look at imports of different versions of class
- oduInterfaceBldr.addAugmentation(
- new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder()
- .setOdu(oduIfBuilder.build())
- .build());
- // Post interface on the device
- openRoadmInterfaces.postInterface(nodeId, oduInterfaceBldr);
- //TODO isCTP is checked twice. There is room for refactoring here
- // and also likely for an intermediate fonction to create oduIfBuilder
- if (!isCTP) {
- LOG.info("{}-{} updating mapping with interface {}", nodeId, logicalConnPoint, oduInterfaceBldr.getName());
- this.portMapping.updateMapping(nodeId, mapping);
- }
- return oduInterfaceBldr.getName();
+ return new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder()
+ .setOdu(oduIfBuilder.build())
+ .build();
}
+
+
public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint, String supportingOtuInterface)
throws OpenRoadmInterfaceException {
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
+ OpenRoadmInterfaceException.mapping_msg_err(nodeId, logicalConnPoint));
}
InterfaceBuilder oduInterfaceBldr =
createGenericInterfaceBuilder(portMap, OtnOdu.VALUE, logicalConnPoint + "-ODU")
.setSupportingInterface(supportingOtuInterface)
.addAugmentation(
// Create Interface1 type object required for adding as augmentation
- // TODO look at imports of different versions of class
new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder()
.setOdu(
// ODU interface specific data
Mapping portMapZ = portMapping.getMapping(znodeId, zlogicalConnPoint);
if (portMapA == null) {
throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, anodeId, alogicalConnPoint));
+ OpenRoadmInterfaceException.mapping_msg_err(anodeId, alogicalConnPoint));
}
if (portMapZ == null) {
throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, znodeId, zlogicalConnPoint));
+ OpenRoadmInterfaceException.mapping_msg_err(znodeId, zlogicalConnPoint));
}
InterfaceBuilder oduInterfaceBldr =
createGenericInterfaceBuilder(portMapA, OtnOdu.VALUE, alogicalConnPoint + "-ODU")
.setSupportingInterface(supportingOtuInterface)
.addAugmentation(
// Create Interface1 type object required for adding as augmentation
- // TODO look at imports of different versions of class
new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder()
.setOdu(
new OduBuilder()
Mapping mapping = this.portMapping.getMapping(nodeId, logicalConnPoint);
if (mapping == null) {
throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
+ OpenRoadmInterfaceException.mapping_msg_err(nodeId, logicalConnPoint));
}
// OTU interface specific data
OtuBuilder otuIfBuilder = new OtuBuilder()
.setSupportingInterface(supportOchInterface)
.addAugmentation(
// Create Interface1 type object required for adding as augmentation
- // TODO look at imports of different versions of class
new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1Builder()
.setOtu(otuIfBuilder.build())
.build());
LOG.info("xd {} not found !", xc);
return false;
}
- RoadmConnections rc = crossconnection.get();
+ RoadmConnections rc = crossconnection.orElseThrow();
LOG.info("xd {} found", xc);
String supportedinter =
interfaceName.contains("nmc")
LOG.info("xc {} not found !", xc);
return false;
}
- OduConnection oduXc = oduConnectionOpt.get();
+ OduConnection oduXc = oduConnectionOpt.orElseThrow();
LOG.info("xc {} found", xc);
if (oduXc.getSource().getSrcIf().equals(interfaceName)
|| oduXc.getDestination().getDstIf().equals(interfaceName)) {
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
+ OpenRoadmInterfaceException.mapping_msg_err(nodeId, logicalConnPoint));
}
InterfaceBuilder oduInterfaceBldr =
createGenericInterfaceBuilder(portMap, OtnOdu.VALUE, logicalConnPoint + "-ODU4")
.setSupportingInterface(supportingOtuInterface)
.addAugmentation(
// Create Interface1 type object required for adding as augmentation
- // TODO look at imports of different versions of class
new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder()
.setOdu(
// ODU interface specific data
Mapping portMapA = portMapping.getMapping(anodeId, alogicalConnPoint);
if (portMapA == null) {
throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, anodeId, alogicalConnPoint));
+ OpenRoadmInterfaceException.mapping_msg_err(anodeId, alogicalConnPoint));
}
Mapping portMapZ = portMapping.getMapping(znodeId, zlogicalConnPoint);
if (portMapZ == null) {
throw new OpenRoadmInterfaceException(
- String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, znodeId, zlogicalConnPoint));
+ OpenRoadmInterfaceException.mapping_msg_err(znodeId, zlogicalConnPoint));
}
InterfaceBuilder oduInterfaceBldr =
createGenericInterfaceBuilder(portMapA, OtnOdu.VALUE, alogicalConnPoint + "-ODU4")
.setSupportingInterface(asupportingOtuInterface)
.addAugmentation(
// Create Interface1 type object required for adding as augmentation
- // TODO look at imports of different versions of class
new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019
.Interface1Builder()
.setOdu(
Code Review / transportpce.git / blobdiff