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=559cc48d10a354f2e619cc69f220d0a4e2874cc3;hb=32e1655e53dc263cf439b7bad2ecdfd4e241b5a6;hp=eb23b0ffc6f1b439a185c6b8f058011daaaae565;hpb=d5b35044e42b9db01e2cc8472fb7b45fe224319d;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 eb23b0ffc..559cc48d1 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,12 +16,12 @@ 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.rev200827.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.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; @@ -36,7 +36,6 @@ 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.RoadmConnectionsKey; 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.Interface1; import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev181019.Interface1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev181019.ethernet.container.EthernetBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.EthernetCsmacd; @@ -54,10 +53,14 @@ 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.OpuBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.OtuAttributes; @@ -67,20 +70,18 @@ import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + 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 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) @@ -88,8 +89,7 @@ public class OpenRoadmInterface221 { Mapping portMap = 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)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } // Ethernet interface specific data @@ -101,7 +101,7 @@ public class OpenRoadmInterface221 { 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 openRoadmInterfaces.postInterface(nodeId, ethInterfaceBldr); @@ -112,125 +112,46 @@ public class OpenRoadmInterface221 { return ethInterfaceBldr.getName(); } - public List createFlexOCH(String nodeId, String logicalConnPoint, Long bitmapIndex, - BigDecimal centerFreq, BigDecimal slotWidth) + public List createFlexOCH(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 % and logical connection port %s", - nodeId, logicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } List interfacesCreated = new ArrayList<>(); - + String mcInterfaceCreated = ""; if (logicalConnPoint.contains("DEG")) { - String mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, centerFreq, slotWidth, bitmapIndex); + mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, spectrumInformation); interfacesCreated.add(mcInterfaceCreated); } - String mcInterfaceCreated = createNMCInterface(nodeId, logicalConnPoint, centerFreq, slotWidth, bitmapIndex); - 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. - * - * @return Name of the interface if successful, otherwise return null. - * - * @throws OpenRoadmInterfaceException OpenRoadm interface exception - */ - - public List createFlexOCH(String nodeId, String logicalConnPoint, Long waveNumber) - throws OpenRoadmInterfaceException { - Mapping portMap = 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)); - } - - List interfacesCreated = new ArrayList<>(); - - if (logicalConnPoint.contains("DEG")) { - String mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, waveNumber); - interfacesCreated.add(mcInterfaceCreated); - } - String nmcInterfaceCreated = createNMCInterface(nodeId, logicalConnPoint, waveNumber); + String nmcInterfaceCreated = createNMCInterface(nodeId, logicalConnPoint, spectrumInformation, + mcInterfaceCreated); interfacesCreated.add(nmcInterfaceCreated); return interfacesCreated; } - - public String createMCInterface(String nodeId, String logicalConnPoint, Long waveNumber) - 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("Unable to get mapping from PortMapping for node % and logical connection port %s", - nodeId, logicalConnPoint)); - } - - // TODO : Check this method - - InterfaceBuilder mcInterfaceBldr = createGenericInterfaceBuilder(portMap, - MediaChannelTrailTerminationPoint.class, logicalConnPoint + "-mc" + "-" + waveNumber) - .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( - org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1.class, - interface1Builder.build()); - - // Post interface on the device - openRoadmInterfaces.postInterface(nodeId, mcInterfaceBldr); - return mcInterfaceBldr.getName(); - } - public String createMCInterface(String nodeId, String logicalConnPoint, - BigDecimal centerFrequency, BigDecimal slotWidth, Long bitmapIndex) + SpectrumInformation spectrumInformation) throws OpenRoadmInterfaceException { - - // TODO : Check this method - - flexGrid = flexGrid.getFlexWaveMapping(centerFrequency.floatValue(), slotWidth.floatValue()); - Mapping portMap = 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)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } - // 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, logicalConnPoint + "-mc" + "-" + bitmapIndex) + 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 @@ -238,150 +159,78 @@ public class OpenRoadmInterface221 { new org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1Builder() .setMcTtp(mcTtpBuilder.build()); - mcInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1.class, - interface1Builder.build()); + mcInterfaceBldr.addAugmentation(interface1Builder.build()); // Post interface on the device openRoadmInterfaces.postInterface(nodeId, mcInterfaceBldr); return mcInterfaceBldr.getName(); } - public String createNMCInterface(String nodeId, String logicalConnPoint, Long waveNumber) + public String createNMCInterface(String nodeId, String logicalConnPoint, + SpectrumInformation spectrumInformation, String mcName) throws OpenRoadmInterfaceException { - + LOG.info("This is the central frequency {}", spectrumInformation.getCenterFrequency()); + LOG.info("This is the nmc width {}", spectrumInformation.getWidth()); // TODO : Check this method - fixedFlex = fixedFlex.getFixedFlexWaveMapping(waveNumber.shortValue()); - Mapping portMap = 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)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } - LOG.info("Freq Start {} and Freq End {} and center-Freq {}", - fixedFlex.getStart(), fixedFlex.getStop(), fixedFlex.getCenterFrequency()); //TODO : Check this method + String nmcName = spectrumInformation.getIdentifierFromParams(logicalConnPoint, "nmc"); InterfaceBuilder nmcInterfaceBldr = createGenericInterfaceBuilder(portMap, - NetworkMediaChannelConnectionTerminationPoint.class, logicalConnPoint + "-nmc" + "-" + waveNumber); + NetworkMediaChannelConnectionTerminationPoint.class, nmcName); if (logicalConnPoint.contains("DEG")) { - nmcInterfaceBldr.setSupportingInterface(logicalConnPoint + "-mc" + "-" + waveNumber); + nmcInterfaceBldr.setSupportingInterface(mcName); } NmcCtpBuilder nmcCtpIfBuilder = new NmcCtpBuilder() - .setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency()))) - .setWidth(FrequencyGHz.getDefaultInstance("40")); + .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 nmcCtpI1fBuilder = new org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019 - .Interface1Builder().setNmcCtp(nmcCtpIfBuilder.build()); - nmcInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019.Interface1.class, - nmcCtpI1fBuilder.build()); - + .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 slotWidth, Long bitmapIndex) + public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, + SpectrumInformation spectrumInformation) throws OpenRoadmInterfaceException { - LOG.info("This is the central frequency {}", centerFrequency.floatValue()); - LOG.info("This is the slot-width {}", slotWidth.floatValue()); // TODO : Check this method - flexGrid = flexGrid.getFlexWaveMapping(centerFrequency.floatValue(), slotWidth.floatValue()); - Mapping portMap = 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)); - } - - LOG.info("Freq Start {} and Freq End {} and center-Freq {}", flexGrid.getStart(), - flexGrid.getStop(),centerFrequency); - //TODO : Check this method - InterfaceBuilder nmcInterfaceBldr = createGenericInterfaceBuilder(portMap, - NetworkMediaChannelConnectionTerminationPoint.class, logicalConnPoint + "-nmc" + "-" + bitmapIndex); - if (logicalConnPoint.contains("DEG")) { - nmcInterfaceBldr.setSupportingInterface(logicalConnPoint + "-mc" + "-" + bitmapIndex); - } - NmcCtpBuilder nmcCtpIfBuilder; - - // From the logicalConnPoint, get the substring and for that associated substring find the mc-cap - String mcLcp = ""; - if (logicalConnPoint.contains("-PP")) { - mcLcp = logicalConnPoint.substring(0, logicalConnPoint.indexOf("-")) + "-PP"; - } - else if (logicalConnPoint.contains("-TTP")) { - mcLcp = logicalConnPoint.substring(0, logicalConnPoint.indexOf("-")) + "-TTP"; - } - try { - double slotWidthGran = portMapping.getMcCapbilities(nodeId, mcLcp) - .getSlotWidthGranularity().getValue().doubleValue(); - - // Dead-band is constant (Ref: WP) - double deadBand = 8; // In GHz - double guardBand = Math.ceil(deadBand / slotWidthGran) * slotWidthGran; - - nmcCtpIfBuilder = new NmcCtpBuilder() - .setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(centerFrequency))) - .setWidth(FrequencyGHz.getDefaultInstance(String.valueOf(slotWidth.doubleValue() - guardBand))); - - // 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( - org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019 - .Interface1.class, nmcCtpI1fBuilder.build()); - - // Post interface on the device - openRoadmInterfaces.postInterface(nodeId, nmcInterfaceBldr); - + ModulationFormat modulationFormat = ModulationFormat.DpQpsk; + Optional optionalModulationFormat = ModulationFormat + .forName(spectrumInformation.getModulationFormat()); + if (optionalModulationFormat.isPresent()) { + modulationFormat = optionalModulationFormat.get(); } - catch (NullPointerException e) { - LOG.error("Port mapping could not find {}", mcLcp); - LOG.error("Check the port mapping to verify {}", mcLcp); - } - return nmcInterfaceBldr.getName(); - } - - public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber) - throws OpenRoadmInterfaceException { - // TODO : Check this method - - fixedFlex = fixedFlex.getFixedFlexWaveMapping(waveNumber.shortValue()); - + // OCH interface specific data + OchBuilder ocIfBuilder = new OchBuilder() + .setFrequency(new FrequencyTHz(spectrumInformation.getCenterFrequency())) + .setRate(R100G.class) + .setTransmitPower(new PowerDBm(new BigDecimal("-5"))) + .setModulationFormat(modulationFormat); 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)); } - - // 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"))); - // Create generic interface InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class, - createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber)); + 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 ochIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev181019 .Interface1Builder(); - ochInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev181019.Interface1.class, - ochIf1Builder.setOch(ocIfBuilder.build()).build()); + ochInterfaceBldr.addAugmentation(ochIf1Builder.setOch(ocIfBuilder.build()).build()); // Post interface on the device openRoadmInterfaces.postInterface(nodeId, ochInterfaceBldr); @@ -394,58 +243,46 @@ public class OpenRoadmInterface221 { return ochInterfaceBldr.getName(); } - public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, - Long waveNumber, BigDecimal centerFrequency, BigDecimal slotWidth) - throws OpenRoadmInterfaceException { - // TODO : Check this method - - // OCH interface specific data - OchBuilder ocIfBuilder = new OchBuilder() - .setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(centerFrequency))) - .setRate(R100G.class) - .setTransmitPower(new PowerDBm(new BigDecimal("-5"))) - .setModulationFormat(ModulationFormat.DpQpsk); - - // In Flex-grid, slot-width could be other than 50 GHz - if ((centerFrequency != null) && (slotWidth != null)) { - ocIfBuilder.setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(centerFrequency))); - ocIfBuilder.setWidth(FrequencyGHz.getDefaultInstance(String.valueOf(slotWidth))); - } - else { - // Use fixed grid to find the - fixedFlex = fixedFlex.getFixedFlexWaveMapping(waveNumber.shortValue()); - ocIfBuilder.setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency()))); - } - Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); - if (portMap == null) { + public String createOpenRoadmOdu4HOInterface(String nodeId, String logicalConnPoint, boolean isNetworkPort, + String supportingInterface) throws OpenRoadmInterfaceException { + Mapping mapping = 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)); + } + InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(mapping, OtnOdu.class, + logicalConnPoint + "-ODU4"); + if (supportingInterface != null) { + oduInterfaceBldr.setSupportingInterface(supportingInterface); } - - - // Create generic interface - InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class, - createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber)); + // ODU interface specific data + Class oduFunction; + MonitoringMode monitoringMode; + if (isNetworkPort) { + oduFunction = ODUCTP.class; + monitoringMode = MonitoringMode.Monitored; + } else { + oduFunction = ODUTTPCTP.class; + monitoringMode = MonitoringMode.Terminated; + } // 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( - org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev181019.Interface1.class, - ochIf1Builder.setOch(ocIfBuilder.build()).build()); + oduInterfaceBldr.addAugmentation( + new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder() + .setOdu(new OduBuilder() + .setRate(ODU4.class) + .setOduFunction(oduFunction) + .setMonitoringMode(monitoringMode) + .setOpu( + new OpuBuilder() + .setPayloadType(PayloadTypeDef.getDefaultInstance("07")) + .setExpPayloadType(PayloadTypeDef.getDefaultInstance("07")).build()).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(); + openRoadmInterfaces.postInterface(nodeId, oduInterfaceBldr); + return oduInterfaceBldr.getName(); } public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint, String supportingOtuInterface) @@ -453,7 +290,7 @@ public class OpenRoadmInterface221 { Mapping portMap = 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", + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOdu.class, @@ -474,9 +311,7 @@ public class OpenRoadmInterface221 { // TODO look at imports of different versions of class org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder oduIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder(); - oduInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1.class, - oduIf1Builder.setOdu(oduIfBuilder.build()).build()); + oduInterfaceBldr.addAugmentation(oduIf1Builder.setOdu(oduIfBuilder.build()).build()); // Post interface on the device openRoadmInterfaces.postInterface(nodeId, oduInterfaceBldr); @@ -490,13 +325,11 @@ public class OpenRoadmInterface221 { Mapping portMapZ = portMapping.getMapping(znodeId, zlogicalConnPoint); if (portMapA == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - anodeId, alogicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, anodeId, alogicalConnPoint)); } if (portMapZ == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - znodeId, zlogicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, znodeId, zlogicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMapA, OtnOdu.class, alogicalConnPoint + "-ODU"); @@ -513,16 +346,15 @@ public class OpenRoadmInterface221 { .setOpu(opuBldr.build()) .setTxSapi(portMapA.getLcpHashVal()) .setTxDapi(portMapZ.getLcpHashVal()) - .setExpectedDapi(portMapA.getLcpHashVal()) // Setting the expected Dapi and Sapi values + // Setting the expected Dapi and Sapi values + .setExpectedDapi(portMapA.getLcpHashVal()) .setExpectedSapi(portMapZ.getLcpHashVal()); // 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.rev181019.Interface1Builder oduIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder(); - oduInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1.class, - oduIf1Builder.setOdu(oduIfBuilder.build()).build()); + oduInterfaceBldr.addAugmentation(oduIf1Builder.setOdu(oduIfBuilder.build()).build()); // Post interface on the device openRoadmInterfaces.postInterface(anodeId, oduInterfaceBldr); @@ -551,9 +383,7 @@ public class OpenRoadmInterface221 { // TODO look at imports of different versions of class 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( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1.class, - otuIf1Builder.setOtu(otuIfBuilder.build()).build()); + otuInterfaceBldr.addAugmentation(otuIf1Builder.setOtu(otuIfBuilder.build()).build()); // Post interface on the device openRoadmInterfaces.postInterface(nodeId, otuInterfaceBldr); @@ -590,15 +420,14 @@ public class OpenRoadmInterface221 { .setRate(OTU4.class) .setTxSapi(portMapA.getLcpHashVal()) .setTxDapi(portMapZ.getLcpHashVal()) - .setExpectedDapi(portMapA.getLcpHashVal()) // setting expected SAPI and DAPI values + // 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( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1.class, - otuIf1Builder.setOtu(otuIfBuilder.build()).build()); + otuInterfaceBldr.addAugmentation(otuIf1Builder.setOtu(otuIfBuilder.build()).build()); // Post interface on the device openRoadmInterfaces.postInterface(anodeId, otuInterfaceBldr); @@ -606,13 +435,13 @@ public class OpenRoadmInterface221 { } - 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); } private InterfaceBuilder createGenericInterfaceBuilder(Mapping portMap, Class type, String key) { - InterfaceBuilder interfaceBuilder = new InterfaceBuilder() + return new InterfaceBuilder() .setDescription(" TBD ") .setCircuitId(" TBD ") .setSupportingCircuitPackName(portMap.getSupportingCircuitPackName()) @@ -621,7 +450,6 @@ public class OpenRoadmInterface221 { .setType(type) .setName(key) .withKey(new InterfaceKey(key)); - return interfaceBuilder; } public String createOpenRoadmOmsInterface(String nodeId, Mapping mapping) throws OpenRoadmInterfaceException { @@ -658,9 +486,7 @@ public class OpenRoadmInterface221 { org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev181019.Interface1Builder otsIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces .rev181019.Interface1Builder(); - otsInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev181019.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(); @@ -720,8 +546,7 @@ public class OpenRoadmInterface221 { Mapping portMap = 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)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOdu.class, logicalConnPoint + "-ODU4"); @@ -743,9 +568,7 @@ public class OpenRoadmInterface221 { // TODO look at imports of different versions of class org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder oduIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder(); - oduInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1.class, - oduIf1Builder.setOdu(oduIfBuilder.build()).build()); + oduInterfaceBldr.addAugmentation(oduIf1Builder.setOdu(oduIfBuilder.build()).build()); // Post interface on the device openRoadmInterfaces.postInterface(nodeId, oduInterfaceBldr); @@ -764,14 +587,12 @@ public class OpenRoadmInterface221 { Mapping portMapA = portMapping.getMapping(anodeId, alogicalConnPoint); if (portMapA == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - anodeId, alogicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, anodeId, alogicalConnPoint)); } Mapping portMapZ = portMapping.getMapping(znodeId, zlogicalConnPoint); if (portMapZ == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - znodeId, zlogicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, znodeId, zlogicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMapA, OtnOdu.class, alogicalConnPoint + "-ODU4"); @@ -798,9 +619,7 @@ public class OpenRoadmInterface221 { // TODO look at imports of different versions of class org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder oduIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder(); - oduInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1.class, - oduIf1Builder.setOdu(oduIfBuilder.build()).build()); + oduInterfaceBldr.addAugmentation(oduIf1Builder.setOdu(oduIfBuilder.build()).build()); // Post interface on the device openRoadmInterfaces.postInterface(anodeId, oduInterfaceBldr);