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=6d798f2fbd6b12d05a4ce3e7e09d2950e06bd996;hb=4692e0088d2cb68650279cb1b0cfebf2e5fa64e5;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..6d798f2fb 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 @@ -21,7 +21,7 @@ import org.opendaylight.transportpce.common.fixedflex.FixedFlexInterface; 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.rev200128.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.PowerDBm; @@ -29,6 +29,8 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.R1 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; @@ -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; @@ -66,7 +69,7 @@ public class OpenRoadmInterface221 { private final PortMapping portMapping; private final OpenRoadmInterfaces openRoadmInterfaces; private FixedFlexInterface fixedFlex; - private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmInterfaceFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmInterface221.class); public OpenRoadmInterface221(PortMapping portMapping, OpenRoadmInterfaces openRoadmInterfaces, FixedFlexInterface fixedFlex) { @@ -84,9 +87,9 @@ public class OpenRoadmInterface221 { } // 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(100000L); InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(portMap, EthernetCsmacd.class, logicalConnPoint + "-ETHERNET"); @@ -149,18 +152,19 @@ 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(); - 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(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(); - 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()); @@ -194,17 +198,15 @@ 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()); + 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()); @@ -228,11 +230,10 @@ public class OpenRoadmInterface221 { } // OCH interface specific data - OchBuilder ocIfBuilder = new OchBuilder(); - - ocIfBuilder.setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency()))); - ocIfBuilder.setRate(R100G.class); - ocIfBuilder.setTransmitPower(new PowerDBm(new BigDecimal("-5"))); + OchBuilder ocIfBuilder = new OchBuilder() + .setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency()))) + .setRate(R100G.class) + .setTransmitPower(new PowerDBm(new BigDecimal("-5"))); // Create generic interface InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class, @@ -270,15 +271,14 @@ 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 @@ -330,15 +330,15 @@ public class OpenRoadmInterface221 { 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)); + InterfaceBuilder interfaceBuilder = new InterfaceBuilder() + .setDescription(" TBD ") + .setCircuitId(" TBD ") + .setSupportingCircuitPackName(portMap.getSupportingCircuitPackName()) + .setSupportingPort(portMap.getSupportingPort()) + .setAdministrativeState(AdminStates.InService) + .setType(type) + .setName(key) + .withKey(new InterfaceKey(key)); return interfaceBuilder; } @@ -413,4 +413,70 @@ 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); + if (!nodeId.toLowerCase().contains("eci")) { + oduIfBuilder.setTxDapi(""); + oduIfBuilder.setTxSapi(""); + } + // 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( + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1.class, + 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(); + } + }