X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Fopenroadminterface%2FOpenRoadmInterface221.java;h=42cc02c86d13024748816ec450e4de420a06609f;hb=268165cb2822b6ce4c55f00cac63eed2bb222ec7;hp=3a712f9ca594ce446478cbffa003d63b9a6acfd7;hpb=3cb0866be6bc8b477849b6ad61e152e565254058;p=transportpce.git diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java index 3a712f9ca..42cc02c86 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java @@ -16,13 +16,14 @@ 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.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.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.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; @@ -35,6 +36,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.open import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.OduConnectionKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.RoadmConnections; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.RoadmConnectionsKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.XpdrNodeTypes; import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev171215.AdminStates; import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev181019.EthAttributes; import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev181019.Interface1Builder; @@ -54,11 +56,16 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interface import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev181019.OtsAttributes; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev181019.ots.container.OtsBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev171215.ODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev171215.ODUCTP; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev171215.ODUTTP; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev171215.ODUTTPCTP; 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.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; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.opu.Opu; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.opu.OpuBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.OtuAttributes; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.otu.container.OtuBuilder; @@ -73,23 +80,18 @@ public class OpenRoadmInterface221 { "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) throws OpenRoadmInterfaceException { - Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); - if (portMap == null) { + Mapping mapping = portMapping.getMapping(nodeId, logicalConnPoint); + if (mapping == null) { throw new OpenRoadmInterfaceException( String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } @@ -99,7 +101,7 @@ public class OpenRoadmInterface221 { .setFec(EthAttributes.Fec.Off) .setSpeed(Uint32.valueOf(100000)); - InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(portMap, EthernetCsmacd.class, + InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(mapping, EthernetCsmacd.class, logicalConnPoint + "-ETHERNET"); // Create Interface1 type object required for adding as augmentation Interface1Builder ethIf1Builder = new Interface1Builder(); @@ -109,49 +111,12 @@ public class OpenRoadmInterface221 { openRoadmInterfaces.postInterface(nodeId, ethInterfaceBldr); // Post the equipment-state change on the device circuit-pack - openRoadmInterfaces.postEquipmentState(nodeId, portMap.getSupportingCircuitPackName(), true); - + openRoadmInterfaces.postEquipmentState(nodeId, mapping.getSupportingCircuitPackName(), true); + this.portMapping.updateMapping(nodeId, mapping); return ethInterfaceBldr.getName(); } - public List createFlexOCH(String nodeId, String logicalConnPoint, BigDecimal centerFreq, - BigDecimal width, 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 interfacesCreated = new ArrayList<>(); - - if (logicalConnPoint.contains("DEG")) { - String mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, centerFreq, width, - lowerSpectralSlotNumber, higherSpectralSlotNumber); - 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 createFlexOCH(String nodeId, String logicalConnPoint, Long waveNumber, - int lowerSpectralSlotNumber, int higherSpectralSlotNumber) + public List createFlexOCH(String nodeId, String logicalConnPoint, SpectrumInformation spectrumInformation) throws OpenRoadmInterfaceException { Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { @@ -160,87 +125,37 @@ public class OpenRoadmInterface221 { } List interfacesCreated = new ArrayList<>(); - + String mcInterfaceCreated = ""; if (logicalConnPoint.contains("DEG")) { - String mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, waveNumber, - lowerSpectralSlotNumber, higherSpectralSlotNumber); + mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, spectrumInformation); 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 @@ -255,74 +170,28 @@ public class OpenRoadmInterface221 { 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 @@ -335,66 +204,19 @@ public class OpenRoadmInterface221 { 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 optionalModulationFormat = ModulationFormat.forName(format); + Optional 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); @@ -404,12 +226,9 @@ public class OpenRoadmInterface221 { 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 @@ -428,6 +247,76 @@ public class OpenRoadmInterface221 { return ochInterfaceBldr.getName(); } + public String createOpenRoadmOdu4HOInterface(String nodeId, String logicalConnPoint, boolean isCTP, + AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, String payloadType) throws OpenRoadmInterfaceException { + Mapping mapping = portMapping.getMapping(nodeId, logicalConnPoint); + if (mapping == null) { + throw new OpenRoadmInterfaceException( + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); + } + + InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(mapping, OtnOdu.class, + logicalConnPoint + "-ODU4"); + if (mapping.getSupportingOtu4() != null) { + oduInterfaceBldr.setSupportingInterface(mapping.getSupportingOtu4()); + } + if (mapping.getSupportingEthernet() != null) { + oduInterfaceBldr.setSupportingInterface(mapping.getSupportingEthernet()); + } + // ODU interface specific data + Class oduFunction; + MonitoringMode monitoringMode; + Opu opu = null; + if (isCTP) { + oduFunction = ODUCTP.class; + monitoringMode = MonitoringMode.Monitored; + } else { + // For TPDR it can be both CTP and TTP + if (mapping.getXponderType() == XpdrNodeTypes.Tpdr) { + oduFunction = ODUTTPCTP.class; + // For switch-ponder we still use TTP + } else { + oduFunction = ODUTTP.class; + } + monitoringMode = MonitoringMode.Terminated; + opu = new OpuBuilder() + .setPayloadType(PayloadTypeDef.getDefaultInstance(payloadType)) + .setExpPayloadType(PayloadTypeDef.getDefaultInstance(payloadType)) + .build(); + } + OduBuilder oduIfBuilder = new OduBuilder() + .setRate(ODU4.class) + .setOduFunction(oduFunction) + .setMonitoringMode(monitoringMode) + .setOpu(opu); + if (apiInfoA != null) { + oduIfBuilder.setTxSapi(apiInfoA.getSapi()) + .setTxDapi(apiInfoA.getDapi()) + .setExpectedSapi(apiInfoA.getExpectedSapi()) + .setExpectedDapi(apiInfoA.getExpectedDapi()); + } + if (apiInfoZ != null) { + oduIfBuilder.setTxSapi(apiInfoZ.getSapi()) + .setTxDapi(apiInfoZ.getDapi()) + .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); + if (!isCTP) { + LOG.info("{}-{} updating mapping with interface {}", nodeId, logicalConnPoint, oduInterfaceBldr.getName()); + this.portMapping.updateMapping(nodeId, mapping); + } + return oduInterfaceBldr.getName(); + } + public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint, String supportingOtuInterface) throws OpenRoadmInterfaceException { Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); @@ -504,23 +393,34 @@ public class OpenRoadmInterface221 { return oduInterfaceBldr.getName(); } - public String createOpenRoadmOtu4Interface(String nodeId, String logicalConnPoint, String supportOchInterface) - throws OpenRoadmInterfaceException { - Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); - if (portMap == null) { + public String createOpenRoadmOtu4Interface(String nodeId, String logicalConnPoint, String supportOchInterface, + AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ) throws OpenRoadmInterfaceException { + + Mapping mapping = this.portMapping.getMapping(nodeId, logicalConnPoint); + if (mapping == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node %s and logical connection port %s", - nodeId, logicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } - // Create generic interface - InterfaceBuilder otuInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOtu.class, + InterfaceBuilder otuInterfaceBldr = createGenericInterfaceBuilder(mapping, OtnOtu.class, logicalConnPoint + "-OTU"); 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); + if (apiInfoA != null) { + otuIfBuilder.setTxSapi(apiInfoA.getSapi()) + .setTxDapi(apiInfoA.getDapi()) + .setExpectedSapi(apiInfoA.getExpectedSapi()) + .setExpectedDapi(apiInfoA.getExpectedDapi()); + } + if (apiInfoZ != null) { + otuIfBuilder.setTxSapi(apiInfoZ.getSapi()) + .setTxDapi(apiInfoZ.getDapi()) + .setExpectedSapi(apiInfoZ.getExpectedSapi()) + .setExpectedDapi(apiInfoZ.getExpectedDapi()); + } // Create Interface1 type object required for adding as augmentation // TODO look at imports of different versions of class @@ -530,54 +430,10 @@ public class OpenRoadmInterface221 { // Post interface on the device openRoadmInterfaces.postInterface(nodeId, otuInterfaceBldr); + this.portMapping.updateMapping(nodeId, mapping); return otuInterfaceBldr.getName(); } - public String createOpenRoadmOtu4Interface(String anodeId, String alogicalConnPoint, String asupportOchInterface, - String znodeId, String zlogicalConnPoint) - throws OpenRoadmInterfaceException { - Mapping portMapA = portMapping.getMapping(anodeId, alogicalConnPoint); - Mapping portMapZ = portMapping.getMapping(znodeId, zlogicalConnPoint); - if (portMapA == null) { - throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node %s and logical connection port %s ", - anodeId, alogicalConnPoint)); - } - // On the Zside - if (portMapZ == null) { - throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node %s and logical connection port %s ", - znodeId, zlogicalConnPoint)); - - } - // Create generic interface builder - InterfaceBuilder otuInterfaceBldr = createGenericInterfaceBuilder(portMapA, OtnOtu.class, - alogicalConnPoint + "-OTU"); - - // Set the supporting interface data - otuInterfaceBldr.setSupportingInterface(asupportOchInterface); - - // OTU interface specific data - OtuBuilder otuIfBuilder = new OtuBuilder() - .setFec(OtuAttributes.Fec.Scfec) - .setRate(OTU4.class) - .setTxSapi(portMapA.getLcpHashVal()) - .setTxDapi(portMapZ.getLcpHashVal()) - // setting expected SAPI and DAPI values - .setExpectedDapi(portMapA.getLcpHashVal()) - .setExpectedSapi(portMapZ.getLcpHashVal()); - - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1Builder otuIf1Builder = - new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1Builder(); - - otuInterfaceBldr.addAugmentation(otuIf1Builder.setOtu(otuIfBuilder.build()).build()); - - // Post interface on the device - openRoadmInterfaces.postInterface(anodeId, otuInterfaceBldr); - return otuInterfaceBldr.getName(); - - } - public String createOpenRoadmOchInterfaceName(String logicalConnectionPoint, String spectralSlotName) { return String.join(GridConstant.NAME_PARAMETERS_SEPARATOR,logicalConnectionPoint, spectralSlotName); } @@ -715,11 +571,6 @@ public class OpenRoadmInterface221 { // Post interface on the device openRoadmInterfaces.postInterface(nodeId, oduInterfaceBldr); - try { - Thread.sleep(3000); - } catch (InterruptedException e) { - LOG.error("Error waiting post interface on device", e); - } this.portMapping.updateMapping(nodeId, portMap); return oduInterfaceBldr.getName(); } @@ -766,11 +617,6 @@ public class OpenRoadmInterface221 { // Post interface on the device openRoadmInterfaces.postInterface(anodeId, oduInterfaceBldr); - try { - Thread.sleep(3000); - } catch (InterruptedException e) { - LOG.error("Error waiting post interface on device", e); - } this.portMapping.updateMapping(anodeId, portMapA); return oduInterfaceBldr.getName(); }