X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Fopenroadminterface%2FOpenRoadmInterface121.java;h=3f6bf10ca66f4112cc9f45899d56ddc10c596961;hb=4692e0088d2cb68650279cb1b0cfebf2e5fa64e5;hp=9b6c40d3aceffd667b067b0465b3e081100f6a83;hpb=d50b37922f66766887017667347ee3fa23d26659;p=transportpce.git diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java index 9b6c40d3a..3f6bf10ca 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java @@ -11,16 +11,23 @@ package org.opendaylight.transportpce.renderer.openroadminterface; 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.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.rev170228.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.rev161014.PowerDBm; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.OrgOpenroadmDevice; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.RoadmConnections; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.RoadmConnectionsKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev161014.AdminStates; import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev161014.EthAttributes; import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev161014.Interface1; @@ -35,7 +42,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.Opti import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.OtnOdu; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.OtnOtu; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.OchAttributes; -import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.RateIdentity; +import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.R100G; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.och.container.OchBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.OtsAttributes; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.ots.container.OtsBuilder; @@ -46,6 +53,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161 import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.OTU4; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.OtuAttributes; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.otu.container.OtuBuilder; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,17 +72,18 @@ public class OpenRoadmInterface121 { throws OpenRoadmInterfaceException { Mapping portMap = this.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.setAutoNegotiation(EthAttributes.AutoNegotiation.Enabled); - ethIfBuilder.setDuplex(EthAttributes.Duplex.Full); - ethIfBuilder.setFec(EthAttributes.Fec.Off); - ethIfBuilder.setSpeed(100000L); - ethIfBuilder.setMtu(9000L); + EthernetBuilder ethIfBuilder = new EthernetBuilder() + .setAutoNegotiation(EthAttributes.AutoNegotiation.Enabled) + .setDuplex(EthAttributes.Duplex.Full) + .setFec(EthAttributes.Fec.Off) + .setSpeed(100000L) + .setMtu(9000L); InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(portMap, EthernetCsmacd.class, logicalConnPoint + "-ETHERNET"); @@ -94,15 +103,15 @@ public class OpenRoadmInterface121 { 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; } /** @@ -120,8 +129,9 @@ public class OpenRoadmInterface121 { throws OpenRoadmInterfaceException { Mapping portMap = this.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)); } // Create generic interface InterfaceBuilder otuInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOtu.class, logicalConnPoint @@ -129,9 +139,9 @@ public class OpenRoadmInterface121 { otuInterfaceBldr.setSupportingInterface(supportOchInterface); // OTU interface specific data - OtuBuilder otuIfBuilder = new OtuBuilder(); - otuIfBuilder.setFec(OtuAttributes.Fec.Scfec); - otuIfBuilder.setRate(OTU4.class); + OtuBuilder otuIfBuilder = new OtuBuilder() + .setFec(OtuAttributes.Fec.Scfec) + .setRate(OTU4.class); // Create Interface1 type object required for adding as augmentation // TODO look at imports of different versions of class @@ -161,23 +171,23 @@ public class OpenRoadmInterface121 { throws OpenRoadmInterfaceException { Mapping portMap = this.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)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOdu.class, logicalConnPoint + "-ODU"); 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("07"); - opuBldr.setExpPayloadType("07"); - oduIfBuilder.setOpu(opuBldr.build()); + OpuBuilder opuBldr = new OpuBuilder() + .setPayloadType("07") + .setExpPayloadType("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 @@ -195,8 +205,13 @@ public class OpenRoadmInterface121 { * 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 createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber) @@ -204,16 +219,16 @@ public class OpenRoadmInterface121 { 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)); + 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)); // OCH interface specific data - OchBuilder ocIfBuilder = new OchBuilder(); - ocIfBuilder.setWavelengthNumber(waveNumber); + OchBuilder ocIfBuilder = new OchBuilder().setWavelengthNumber(waveNumber); // Add supporting OMS interface if (portMap.getSupportingOms() != null) { @@ -235,20 +250,21 @@ public class OpenRoadmInterface121 { return interfacesCreated; } - public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber, Class< - ? extends RateIdentity> rate, OchAttributes.ModulationFormat format) throws OpenRoadmInterfaceException { + public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber, + OchAttributes.ModulationFormat format) throws OpenRoadmInterfaceException { Mapping portMap = this.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)); + 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(); - ocIfBuilder.setWavelengthNumber(waveNumber); - ocIfBuilder.setModulationFormat(format); - ocIfBuilder.setRate(rate); - ocIfBuilder.setTransmitPower(new PowerDBm(new BigDecimal("-5"))); + OchBuilder ocIfBuilder = new OchBuilder() + .setWavelengthNumber(waveNumber) + .setModulationFormat(format) + .setRate(R100G.class) + .setTransmitPower(new PowerDBm(new BigDecimal("-5"))); // Create Interface1 type object required for adding as augmentation // TODO look at imports of different versions of class @@ -321,4 +337,25 @@ public class OpenRoadmInterface121 { return mapping.getSupportingOts(); } } + + public boolean isUsedByXc(String nodeId, String interfaceName, String xc, + DeviceTransactionManager deviceTransactionManager) { + InstanceIdentifier xciid = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(RoadmConnections.class, new RoadmConnectionsKey(xc)); + LOG.info("reading xc {} in node {}", xc, nodeId); + Optional crossconnection = deviceTransactionManager.getDataFromDevice(nodeId, + LogicalDatastoreType.CONFIGURATION, xciid, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (crossconnection.isPresent()) { + RoadmConnections rc = crossconnection.get(); + LOG.info("xd {} found", xc); + if (rc.getSource().getSrcIf().equals(interfaceName) + || rc.getDestination().getDstIf().equals(interfaceName)) { + return true; + } + } else { + LOG.info("xd {} not found !", xc); + } + return false; + } + }