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=fefbe04961825530eed7bc60e967da7c9eff8de6;hb=e3438cad213946cd76a73219876487c30024dfae;hp=772f1a53b62bcd62645984c68b6acac45e81494b;hpb=34cbca4ad81fbd29e833197f0e4b09128daa8b95;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 772f1a53b..fefbe0496 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 @@ -12,28 +12,30 @@ 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.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.rev200113.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.openroadm.common.types.rev181019.FrequencyGHz; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyTHz; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.ModulationFormat; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.PowerDBm; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.R100G; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp.InterfaceBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp.InterfaceKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.OrgOpenroadmDevice; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.OduConnection; +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.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; @@ -51,6 +53,7 @@ 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.ODUTTP; 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.PayloadTypeDef; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.OduAttributes; @@ -59,6 +62,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181 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; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,33 +70,37 @@ public class OpenRoadmInterface221 { private final PortMapping portMapping; private final OpenRoadmInterfaces openRoadmInterfaces; private FixedFlexInterface fixedFlex; - private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmInterfaceFactory.class); + 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) 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)); + throw new OpenRoadmInterfaceException( + String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", + nodeId, logicalConnPoint)); } // Ethernet interface specific data - EthernetBuilder ethIfBuilder = new EthernetBuilder(); - ethIfBuilder.setFec(EthAttributes.Fec.Off); - ethIfBuilder.setSpeed(100000L); + EthernetBuilder ethIfBuilder = new EthernetBuilder() + .setFec(EthAttributes.Fec.Off) + .setSpeed(Uint32.valueOf(100000)); 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 openRoadmInterfaces.postInterface(nodeId, ethInterfaceBldr); @@ -103,6 +111,27 @@ 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("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, 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. @@ -118,6 +147,12 @@ 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("Unable to get mapping from PortMapping for node % and logical connection port %s", + nodeId, logicalConnPoint)); + } List interfacesCreated = new ArrayList<>(); @@ -125,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 { @@ -149,18 +183,58 @@ public class OpenRoadmInterface221 { // TODO : Check this method InterfaceBuilder mcInterfaceBldr = createGenericInterfaceBuilder(portMap, - MediaChannelTrailTerminationPoint.class, logicalConnPoint + "-mc" + "-" + waveNumber); - mcInterfaceBldr.setSupportingInterface(portMap.getSupportingOms()); + 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(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) + 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)); + } + + // 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(); - mcTtpBuilder.setMinFreq(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getStart()))); - mcTtpBuilder.setMaxFreq(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getStop()))); + 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(); - interface1Builder.setMcTtp(mcTtpBuilder.build()); + 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()); @@ -174,7 +248,6 @@ public class OpenRoadmInterface221 { throws OpenRoadmInterfaceException { // TODO : Check this method - fixedFlex = fixedFlex.getFixedFlexWaveMapping(waveNumber.shortValue()); Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); @@ -183,10 +256,8 @@ public class OpenRoadmInterface221 { 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 {}", - String.valueOf(fixedFlex.getStart()), String.valueOf(fixedFlex.getStop()), - String.valueOf(fixedFlex.getCenterFrequency())); + 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); @@ -194,26 +265,86 @@ public class OpenRoadmInterface221 { nmcInterfaceBldr.setSupportingInterface(logicalConnPoint + "-mc" + "-" + waveNumber); } - NmcCtpBuilder nmcCtpIfBuilder = new NmcCtpBuilder(); - - nmcCtpIfBuilder.setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency()))); - nmcCtpIfBuilder.setWidth(FrequencyGHz.getDefaultInstance("40")); + 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(); - nmcCtpI1fBuilder.setNmcCtp(nmcCtpIfBuilder.build()); - nmcInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019.Interface1.class, - nmcCtpI1fBuilder.build()); + 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 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("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); + + } + 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 @@ -228,11 +359,64 @@ public class OpenRoadmInterface221 { } // OCH interface specific data - OchBuilder ocIfBuilder = new OchBuilder(); + 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)); + // 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, + 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)); + } + - ocIfBuilder.setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency()))); - ocIfBuilder.setRate(R100G.class); - ocIfBuilder.setTransmitPower(new PowerDBm(new BigDecimal("-5"))); // Create generic interface InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class, @@ -270,35 +454,76 @@ public class OpenRoadmInterface221 { 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(PayloadTypeDef.getDefaultInstance("07")); - opuBldr.setExpPayloadType(PayloadTypeDef.getDefaultInstance("07")); - oduIfBuilder.setOpu(opuBldr.build()); + OpuBuilder opuBldr = new OpuBuilder() + .setPayloadType(PayloadTypeDef.getDefaultInstance("07")) + .setExpPayloadType(PayloadTypeDef.getDefaultInstance("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.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); return oduInterfaceBldr.getName(); } + public String createOpenRoadmOdu4Interface(String anodeId, String alogicalConnPoint, String supportingOtuInterface, + 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 % and logical connection port %s", + 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)); + } + InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMapA, OtnOdu.class, + alogicalConnPoint + "-ODU"); + oduInterfaceBldr.setSupportingInterface(supportingOtuInterface); + + // ODU interface specific data + // Set Opu attributes + OpuBuilder opuBldr = new OpuBuilder() + .setPayloadType(PayloadTypeDef.getDefaultInstance("07")) + .setExpPayloadType(PayloadTypeDef.getDefaultInstance("07")); + OduBuilder oduIfBuilder = new OduBuilder() + .setRate(ODU4.class) + .setMonitoringMode(OduAttributes.MonitoringMode.Terminated) + .setOpu(opuBldr.build()) + .setTxSapi(portMapA.getLcpHashVal()) + .setTxDapi(portMapZ.getLcpHashVal()) + .setExpectedDapi(portMapA.getLcpHashVal()) // Setting the expected Dapi and Sapi values + .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(oduIf1Builder.setOdu(oduIfBuilder.build()).build()); + + // Post interface on the device + openRoadmInterfaces.postInterface(anodeId, oduInterfaceBldr); + return oduInterfaceBldr.getName(); + } + public String createOpenRoadmOtu4Interface(String nodeId, String logicalConnPoint, String supportOchInterface) 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", + String.format("Unable to get mapping from PortMapping for node %s and logical connection port %s", nodeId, logicalConnPoint)); } // Create generic interface @@ -315,31 +540,72 @@ 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); 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()) + .setExpectedDapi(portMapA.getLcpHashVal()) // setting expected SAPI and DAPI values + .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, Long waveNumber) { return logicalConnectionPoint + "-" + waveNumber; } 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)); } public String createOpenRoadmOmsInterface(String nodeId, Mapping mapping) throws OpenRoadmInterfaceException { @@ -376,9 +642,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(); @@ -413,4 +677,117 @@ public class OpenRoadmInterface221 { return false; } + public boolean isUsedByOtnXc(String nodeId, String interfaceName, String xc, + DeviceTransactionManager deviceTransactionManager) { + InstanceIdentifier xciid = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(OduConnection.class, new OduConnectionKey(xc)); + LOG.info("reading xc {} in node {}", xc, nodeId); + Optional oduConnectionOpt = deviceTransactionManager.getDataFromDevice(nodeId, + LogicalDatastoreType.CONFIGURATION, xciid, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (oduConnectionOpt.isPresent()) { + OduConnection oduXc = oduConnectionOpt.get(); + LOG.info("xc {} found", xc); + if (oduXc.getSource().getSrcIf().equals(interfaceName) + || oduXc.getDestination().getDstIf().equals(interfaceName)) { + return true; + } + } else { + LOG.info("xc {} not found !", xc); + } + return false; + } + + public String createOpenRoadmOtnOdu4Interface(String nodeId, String logicalConnPoint, String supportingOtuInterface) + 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)); + } + InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOdu.class, + logicalConnPoint + "-ODU4"); + oduInterfaceBldr.setSupportingInterface(supportingOtuInterface); + + // ODU interface specific data + OduBuilder oduIfBuilder = new OduBuilder() + .setRate(ODU4.class) + .setMonitoringMode(OduAttributes.MonitoringMode.Terminated); + + // Set Opu attributes + OpuBuilder opuBldr = new OpuBuilder() + .setPayloadType(PayloadTypeDef.getDefaultInstance("21")) + .setExpPayloadType(PayloadTypeDef.getDefaultInstance("21")); + oduIfBuilder.setOduFunction(ODUTTP.class) + .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.rev181019.Interface1Builder oduIf1Builder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder(); + oduInterfaceBldr.addAugmentation(oduIf1Builder.setOdu(oduIfBuilder.build()).build()); + + // 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(); + } + + public String createOpenRoadmOtnOdu4Interface(String anodeId, String alogicalConnPoint, + String asupportingOtuInterface, String znodeId, String zlogicalConnPoint) + throws OpenRoadmInterfaceException { + 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)); + } + 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)); + } + InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMapA, OtnOdu.class, + alogicalConnPoint + "-ODU4"); + oduInterfaceBldr.setSupportingInterface(asupportingOtuInterface); + + // ODU interface specific data + OduBuilder oduIfBuilder = new OduBuilder() + .setRate(ODU4.class) + .setMonitoringMode(OduAttributes.MonitoringMode.Terminated) + .setTxSapi(portMapA.getLcpHashVal()) + .setTxDapi(portMapZ.getLcpHashVal()) + .setExpectedSapi(portMapZ.getLcpHashVal()) + .setExpectedDapi(portMapA.getLcpHashVal()); + + + // Set Opu attributes + OpuBuilder opuBldr = new OpuBuilder() + .setPayloadType(PayloadTypeDef.getDefaultInstance("21")) + .setExpPayloadType(PayloadTypeDef.getDefaultInstance("21")); + oduIfBuilder.setOduFunction(ODUTTP.class) + .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.rev181019.Interface1Builder oduIf1Builder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder(); + oduInterfaceBldr.addAugmentation(oduIf1Builder.setOdu(oduIfBuilder.build()).build()); + + // 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(); + } }