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=b5d84dfe4a42ed0a32219b5bb47f9ae01702e5de;hb=77743225e0c72a218d6606a2767c979bee61c5ef;hp=541c22e4e97108d29b7dfff0044a187b06772444;hpb=e83596bba80ba7eca2d0fa7d814d6d0b055f4255;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 541c22e4e..b5d84dfe4 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 @@ -17,10 +17,12 @@ 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.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.rev200429.network.nodes.Mapping; +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.rev200827.network.nodes.McCapabilities; 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,7 +37,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; @@ -67,17 +68,21 @@ 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) { + FixedFlexInterface fixedFlex, FlexGridInterface flexGrid) { this.portMapping = portMapping; this.openRoadmInterfaces = openRoadmInterfaces; this.fixedFlex = fixedFlex; + this.flexGrid = flexGrid; } public String createOpenRoadmEthInterface(String nodeId, String logicalConnPoint) @@ -85,8 +90,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 @@ -98,7 +102,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); @@ -109,6 +113,26 @@ public class OpenRoadmInterface221 { return ethInterfaceBldr.getName(); } + public List createFlexOCH(String nodeId, String logicalConnPoint, Long bitmapIndex, + BigDecimal centerFreq, BigDecimal slotWidth) + 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, slotWidth, bitmapIndex); + 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. @@ -124,6 +148,11 @@ public class OpenRoadmInterface221 { 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(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); + } List interfacesCreated = new ArrayList<>(); @@ -131,13 +160,12 @@ public class OpenRoadmInterface221 { String mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, waveNumber); interfacesCreated.add(mcInterfaceCreated); } - String nmcInterfaceCreated = createNMCInterface(nodeId, logicalConnPoint, waveNumber); interfacesCreated.add(nmcInterfaceCreated); - return interfacesCreated; } + public String createMCInterface(String nodeId, String logicalConnPoint, Long waveNumber) throws OpenRoadmInterfaceException { @@ -148,8 +176,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)); } // TODO : Check this method @@ -168,32 +195,64 @@ 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 createMCInterface(String nodeId, String logicalConnPoint, + BigDecimal centerFrequency, BigDecimal slotWidth, Long bitmapIndex) throws OpenRoadmInterfaceException { // TODO : Check this method - fixedFlex = fixedFlex.getFixedFlexWaveMapping(waveNumber.shortValue()); + 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)); } - LOG.info(" Freq Start {} and Freq End {} and center-Freq {}", - String.valueOf(fixedFlex.getStart()), String.valueOf(fixedFlex.getStop()), - String.valueOf(fixedFlex.getCenterFrequency())); + // TODO : Check this method + LOG.info("MC interface Freq Start {} and Freq End {} and center-Freq {}", + flexGrid.getStart(), flexGrid.getStop(), centerFrequency); + InterfaceBuilder mcInterfaceBldr = createGenericInterfaceBuilder(portMap, + MediaChannelTrailTerminationPoint.class, logicalConnPoint + "-mc" + "-" + bitmapIndex) + .setSupportingInterface(portMap.getSupportingOms()); + + McTtpBuilder mcTtpBuilder = new McTtpBuilder() + .setMinFreq(FrequencyTHz.getDefaultInstance(String.valueOf(flexGrid.getStart()))) + .setMaxFreq(FrequencyTHz.getDefaultInstance(String.valueOf(flexGrid.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 createNMCInterface(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(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 InterfaceBuilder nmcInterfaceBldr = createGenericInterfaceBuilder(portMap, NetworkMediaChannelConnectionTerminationPoint.class, logicalConnPoint + "-nmc" + "-" + waveNumber); @@ -202,18 +261,73 @@ public class OpenRoadmInterface221 { } NmcCtpBuilder nmcCtpIfBuilder = new NmcCtpBuilder() - .setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency()))) - .setWidth(FrequencyGHz.getDefaultInstance("40")); + .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( - org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019.Interface1.class, - nmcCtpI1fBuilder.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) + 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(MAPPING_ERROR_EXCEPTION_MESSAGE, 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"; + } + McCapabilities mcCapabilities = portMapping.getMcCapbilities(nodeId, mcLcp); + if (mcCapabilities == null || mcCapabilities.getSlotWidthGranularity() == null + || mcCapabilities.getSlotWidthGranularity().getValue() == null) { + LOG.warn("Port mapping could not find {}", mcLcp); + LOG.warn("Check the port mapping to verify {}", mcLcp); + return nmcInterfaceBldr.getName(); + } + double slotWidthGran = mcCapabilities.getSlotWidthGranularity().getValue().doubleValue(); + // Dead-band is constant (Ref: WP) In GHz + double deadBand = 8; + 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(nmcCtpI1fBuilder.build()); // Post interface on the device openRoadmInterfaces.postInterface(nodeId, nmcInterfaceBldr); return nmcInterfaceBldr.getName(); @@ -228,8 +342,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 %s and logical connection port %s", - nodeId, logicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } // OCH interface specific data @@ -248,9 +361,59 @@ public class OpenRoadmInterface221 { 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); + + // 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, + 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) { + 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)); + // 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); @@ -268,7 +431,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, @@ -289,9 +452,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); @@ -305,13 +466,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"); @@ -328,16 +487,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); @@ -366,9 +524,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); @@ -405,15 +561,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); @@ -427,7 +582,7 @@ public class OpenRoadmInterface221 { private InterfaceBuilder createGenericInterfaceBuilder(Mapping portMap, Class type, String key) { - InterfaceBuilder interfaceBuilder = new InterfaceBuilder() + return new InterfaceBuilder() .setDescription(" TBD ") .setCircuitId(" TBD ") .setSupportingCircuitPackName(portMap.getSupportingCircuitPackName()) @@ -436,7 +591,6 @@ public class OpenRoadmInterface221 { .setType(type) .setName(key) .withKey(new InterfaceKey(key)); - return interfaceBuilder; } public String createOpenRoadmOmsInterface(String nodeId, Mapping mapping) throws OpenRoadmInterfaceException { @@ -473,9 +627,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(); @@ -535,8 +687,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"); @@ -558,9 +709,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); @@ -579,14 +728,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"); @@ -613,9 +760,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);