X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Fopenroadminterface%2FOpenRoadmInterface121.java;h=138bd951b3f3b9ffe517a1f65895e99625690b75;hb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;hp=fb11fe9a256c67929edce70fa895d6232434bab5;hpb=5d5da5eeecc7b6a775c8f5a0d1b5a7062a176d63;p=transportpce.git diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java index fb11fe9a2..138bd951b 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java @@ -12,17 +12,17 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Optional; - import org.opendaylight.mdsal.common.api.LogicalDatastoreType; 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.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.rev200128.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.rev161014.PowerDBm; - import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.OrgOpenroadmDevice; @@ -30,10 +30,8 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.open import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.RoadmConnectionsKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev161014.AdminStates; import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev161014.EthAttributes; -import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev161014.Interface1; import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev161014.Interface1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev161014.ethernet.container.EthernetBuilder; - import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.EthernetCsmacd; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.InterfaceType; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.OpenROADMOpticalMultiplex; @@ -54,14 +52,17 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161 import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.OtuAttributes; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.otu.container.OtuBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class OpenRoadmInterface121 { + private static final String MAPPING_MSG_ERROR = + "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(OpenRoadmInterfaceFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmInterface121.class); public OpenRoadmInterface121(PortMapping portMapping, OpenRoadmInterfaces openRoadmInterfaces) { this.portMapping = portMapping; @@ -72,24 +73,23 @@ public class OpenRoadmInterface121 { throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { - throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node % and" - + " logical connection port %s", nodeId, logicalConnPoint)); + throw new OpenRoadmInterfaceException(String.format(MAPPING_MSG_ERROR, nodeId, logicalConnPoint)); } // Ethernet interface specific data - EthernetBuilder ethIfBuilder = new EthernetBuilder(); - ethIfBuilder.setAutoNegotiation(EthAttributes.AutoNegotiation.Enabled); - ethIfBuilder.setDuplex(EthAttributes.Duplex.Full); - ethIfBuilder.setFec(EthAttributes.Fec.Off); - ethIfBuilder.setSpeed(100000L); - ethIfBuilder.setMtu(9000L); + EthernetBuilder ethIfBuilder = new EthernetBuilder() + .setAutoNegotiation(EthAttributes.AutoNegotiation.Enabled) + .setDuplex(EthAttributes.Duplex.Full) + .setFec(EthAttributes.Fec.Off) + .setSpeed(Uint32.valueOf(100000)) + .setMtu(Uint32.valueOf(9000)); InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(portMap, EthernetCsmacd.class, logicalConnPoint + "-ETHERNET"); // Create Interface1 type object required for adding as augmentation Interface1Builder ethIf1Builder = new Interface1Builder(); - ethInterfaceBldr.addAugmentation(Interface1.class, ethIf1Builder.setEthernet(ethIfBuilder.build()).build()); + ethInterfaceBldr.addAugmentation(ethIf1Builder.setEthernet(ethIfBuilder.build()).build()); // Post interface on the device this.openRoadmInterfaces.postInterface(nodeId, ethInterfaceBldr); @@ -102,16 +102,15 @@ public class OpenRoadmInterface121 { private InterfaceBuilder createGenericInterfaceBuilder(Mapping portMap, Class type, String key) { - InterfaceBuilder interfaceBuilder = new InterfaceBuilder(); - interfaceBuilder.setDescription(" TBD "); - interfaceBuilder.setCircuitId(" TBD "); - interfaceBuilder.setSupportingCircuitPackName(portMap.getSupportingCircuitPackName()); - interfaceBuilder.setSupportingPort(portMap.getSupportingPort()); - interfaceBuilder.setAdministrativeState(AdminStates.InService); - interfaceBuilder.setType(type); - interfaceBuilder.setName(key); - interfaceBuilder.withKey(new InterfaceKey(key)); - return interfaceBuilder; + return new InterfaceBuilder() + .setDescription(" TBD ") + .setCircuitId(" TBD ") + .setSupportingCircuitPackName(portMap.getSupportingCircuitPackName()) + .setSupportingPort(portMap.getSupportingPort()) + .setAdministrativeState(AdminStates.InService) + .setType(type) + .setName(key) + .withKey(new InterfaceKey(key)); } /** * This methods creates an OTU interface on the given termination point. @@ -128,8 +127,7 @@ public class OpenRoadmInterface121 { throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { - throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node % and" - + " logical connection port %s", nodeId, logicalConnPoint)); + throw new OpenRoadmInterfaceException(String.format(MAPPING_MSG_ERROR, nodeId, logicalConnPoint)); } // Create generic interface InterfaceBuilder otuInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOtu.class, logicalConnPoint @@ -137,17 +135,15 @@ public class OpenRoadmInterface121 { otuInterfaceBldr.setSupportingInterface(supportOchInterface); // OTU interface specific data - OtuBuilder otuIfBuilder = new OtuBuilder(); - otuIfBuilder.setFec(OtuAttributes.Fec.Scfec); - otuIfBuilder.setRate(OTU4.class); + OtuBuilder otuIfBuilder = new OtuBuilder() + .setFec(OtuAttributes.Fec.Scfec) + .setRate(OTU4.class); // 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.otn.otu.interfaces.rev161014.Interface1Builder otuIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.Interface1Builder(); - otuInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.Interface1.class, - otuIf1Builder.setOtu(otuIfBuilder.build()).build()); + otuInterfaceBldr.addAugmentation(otuIf1Builder.setOtu(otuIfBuilder.build()).build()); // Post interface on the device this.openRoadmInterfaces.postInterface(nodeId, otuInterfaceBldr); @@ -169,64 +165,59 @@ public class OpenRoadmInterface121 { throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { - throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node % and" - + " logical connection port %s", nodeId, logicalConnPoint)); + throw new OpenRoadmInterfaceException(String.format(MAPPING_MSG_ERROR, nodeId, logicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOdu.class, logicalConnPoint + "-ODU"); oduInterfaceBldr.setSupportingInterface(supportingOtuInterface); // ODU interface specific data - OduBuilder oduIfBuilder = new OduBuilder(); - oduIfBuilder.setRate(ODU4.class); - oduIfBuilder.setMonitoringMode(OduAttributes.MonitoringMode.Terminated); - // Set Opu attributes - OpuBuilder opuBldr = new OpuBuilder(); - opuBldr.setPayloadType("07"); - opuBldr.setExpPayloadType("07"); - oduIfBuilder.setOpu(opuBldr.build()); + OpuBuilder opuBldr = new OpuBuilder() + .setPayloadType("07") + .setExpPayloadType("07"); + OduBuilder oduIfBuilder = new OduBuilder() + .setRate(ODU4.class) + .setMonitoringMode(OduAttributes.MonitoringMode.Terminated) + .setOpu(opuBldr.build()); // 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.otn.odu.interfaces.rev161014.Interface1Builder oduIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.Interface1Builder(); - oduInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.Interface1.class, - oduIf1Builder.setOdu(oduIfBuilder.build()).build()); + oduInterfaceBldr.addAugmentation(oduIf1Builder.setOdu(oduIfBuilder.build()).build()); // Post interface on the device this.openRoadmInterfaces.postInterface(nodeId, oduInterfaceBldr); return oduInterfaceBldr.getName(); } /** - * This methods creates an OCH interface on the given termination point on + * This methods creates a list of 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. - * - * @return Name of the interface if successful, otherwise return null. + * @param spectrumInformation SpectrumInformation + * @return List containing name of the interface if successful, otherwise return empty list. * * @throws OpenRoadmInterfaceException OpenRoadm interface exception */ - public List createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber) + public List createOpenRoadmOchInterfaces(String nodeId, String logicalConnPoint, + SpectrumInformation spectrumInformation) throws OpenRoadmInterfaceException { - 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)); + throw new OpenRoadmInterfaceException(String.format( + "Unable to get mapping from PortMapping for node %s and logical connection port %s", + nodeId, logicalConnPoint)); } // Create generic interface InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class, - createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber)); + spectrumInformation.getIdentifierFromParams(logicalConnPoint)); // OCH interface specific data - OchBuilder ocIfBuilder = new OchBuilder(); - ocIfBuilder.setWavelengthNumber(waveNumber); + OchBuilder ocIfBuilder = new OchBuilder().setWavelengthNumber(spectrumInformation.getWaveLength()); // Add supporting OMS interface if (portMap.getSupportingOms() != null) { @@ -237,9 +228,7 @@ public class OpenRoadmInterface121 { org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.Interface1Builder ochIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces .rev161014.Interface1Builder(); - ochInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.Interface1.class, - ochIf1Builder.setOch(ocIfBuilder.build()).build()); + ochInterfaceBldr.addAugmentation(ochIf1Builder.setOch(ocIfBuilder.build()).build()); List interfacesCreated = new ArrayList<>(); // Post interface on the device @@ -248,20 +237,26 @@ public class OpenRoadmInterface121 { return interfacesCreated; } - public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber, - OchAttributes.ModulationFormat format) throws OpenRoadmInterfaceException { + public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, + SpectrumInformation spectrumInformation) throws OpenRoadmInterfaceException { Mapping portMap = this.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)); + throw new OpenRoadmInterfaceException(String.format( + "Unable to get mapping from PortMapping for node %s and logical connection port %s", + nodeId, logicalConnPoint)); + } + OchAttributes.ModulationFormat modulationFormat = OchAttributes.ModulationFormat.DpQpsk; + Optional optionalModulationFormat = OchAttributes.ModulationFormat + .forName(spectrumInformation.getModulationFormat()); + if (optionalModulationFormat.isPresent()) { + modulationFormat = optionalModulationFormat.get(); } - // OCH interface specific data - OchBuilder ocIfBuilder = new OchBuilder(); - ocIfBuilder.setWavelengthNumber(waveNumber); - ocIfBuilder.setModulationFormat(format); - ocIfBuilder.setRate(R100G.class); - ocIfBuilder.setTransmitPower(new PowerDBm(new BigDecimal("-5"))); + OchBuilder ocIfBuilder = new OchBuilder() + .setWavelengthNumber(spectrumInformation.getWaveLength()) + .setModulationFormat(modulationFormat) + .setRate(R100G.class) + .setTransmitPower(new PowerDBm(new BigDecimal("-5"))); // Create Interface1 type object required for adding as augmentation // TODO look at imports of different versions of class @@ -270,10 +265,8 @@ public class OpenRoadmInterface121 { .interfaces.rev161014.Interface1Builder(); // Create generic interface InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class, - createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber)); - ochInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.Interface1.class, - ochIf1Builder.setOch(ocIfBuilder.build()).build()); + spectrumInformation.getIdentifierFromParams(logicalConnPoint)); + ochInterfaceBldr.addAugmentation(ochIf1Builder.setOch(ocIfBuilder.build()).build()); // Post interface on the device this.openRoadmInterfaces.postInterface(nodeId, ochInterfaceBldr); @@ -285,8 +278,8 @@ public class OpenRoadmInterface121 { return ochInterfaceBldr.getName(); } - public String createOpenRoadmOchInterfaceName(String logicalConnectionPoint, Long waveNumber) { - return logicalConnectionPoint + "-" + waveNumber; + public String createOpenRoadmOchInterfaceName(String logicalConnectionPoint, String spectralSlotName) { + return String.join(GridConstant.NAME_PARAMETERS_SEPARATOR,logicalConnectionPoint, spectralSlotName); } public String createOpenRoadmOmsInterface(String nodeId, Mapping mapping) throws OpenRoadmInterfaceException { @@ -323,10 +316,7 @@ public class OpenRoadmInterface121 { org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014 .Interface1Builder otsIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm .optical.transport.interfaces.rev161014.Interface1Builder(); - otsInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014 - .Interface1.class, - otsIf1Builder.setOts(otsIfBuilder.build()).build()); + otsInterfaceBldr.addAugmentation(otsIf1Builder.setOts(otsIfBuilder.build()).build()); this.openRoadmInterfaces.postInterface(nodeId, otsInterfaceBldr); this.portMapping.updateMapping(nodeId, mapping); return otsInterfaceBldr.build().getName();