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=14bcabb0bf6e54482b8ab54d864508824bb59ea4;hb=4bb3743a3214fb481e4cc147914a314c9ff6d1c3;hp=1337fbea4e146e79a03f9a922d6503166b84bde1;hpb=45d029a83d991fc604ec9cdb829180d16de0e89c;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 1337fbea4..14bcabb0b 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 @@ -8,21 +8,21 @@ 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.controller.md.sal.common.api.data.LogicalDatastoreType; +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.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.rev170228.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.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.OrgOpenroadmDeviceData; 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; @@ -30,10 +30,8 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.open 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; import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev161014.Interface1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev161014.ethernet.container.EthernetBuilder; - import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.EthernetCsmacd; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.InterfaceType; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.OpenROADMOpticalMultiplex; @@ -42,7 +40,8 @@ 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.OchAttributes.ModulationFormat; +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; @@ -54,6 +53,8 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161 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.opendaylight.yangtools.yang.common.Decimal64; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,7 +62,7 @@ import org.slf4j.LoggerFactory; public class OpenRoadmInterface121 { private final PortMapping portMapping; private final OpenRoadmInterfaces openRoadmInterfaces; - private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmInterfaceFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmInterface121.class); public OpenRoadmInterface121(PortMapping portMapping, OpenRoadmInterfaces openRoadmInterfaces) { this.portMapping = portMapping; @@ -72,46 +73,42 @@ 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( + OpenRoadmInterfaceException.mapping_msg_err(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); - - 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()); - + InterfaceBuilder ethInterfaceBldr = + createGenericInterfaceBuilder(portMap, EthernetCsmacd.VALUE, logicalConnPoint + "-ETHERNET") + .addAugmentation( + // Create Interface1 type object required for adding as augmentation + new Interface1Builder() + .setEthernet( + // Ethernet interface specific data + new EthernetBuilder() + .setAutoNegotiation(EthAttributes.AutoNegotiation.Enabled) + .setDuplex(EthAttributes.Duplex.Full) + .setFec(EthAttributes.Fec.Off) + .setSpeed(Uint32.valueOf(100000)) + .setMtu(Uint32.valueOf(9000)) + .build()) + .build()); // Post interface on the device this.openRoadmInterfaces.postInterface(nodeId, ethInterfaceBldr); - // Post the equipment-state change on the device circuit-pack this.openRoadmInterfaces.postEquipmentState(nodeId, portMap.getSupportingCircuitPackName(), true); - return ethInterfaceBldr.getName(); } - private InterfaceBuilder createGenericInterfaceBuilder(Mapping portMap, Class type, + private InterfaceBuilder createGenericInterfaceBuilder(Mapping portMap, InterfaceType 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)); } /** * This methods creates an OTU interface on the given termination point. @@ -128,29 +125,25 @@ 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( + OpenRoadmInterfaceException.mapping_msg_err(nodeId, logicalConnPoint)); } // Create generic interface - InterfaceBuilder otuInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOtu.class, logicalConnPoint - + "-OTU"); - otuInterfaceBldr.setSupportingInterface(supportOchInterface); - - // OTU interface specific data - OtuBuilder otuIfBuilder = new OtuBuilder(); - otuIfBuilder.setFec(OtuAttributes.Fec.Scfec); - otuIfBuilder.setRate(OTU4.class); - - // 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.otu.interfaces.rev161014.Interface1Builder otuIf1Builder = - new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.Interface1Builder(); - otuInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.Interface1.class, - otuIf1Builder.setOtu(otuIfBuilder.build()).build()); - + InterfaceBuilder otuInterfaceBldr = + createGenericInterfaceBuilder(portMap, OtnOtu.VALUE, logicalConnPoint + "-OTU") + .setSupportingInterface(supportOchInterface) + .addAugmentation( + new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.Interface1Builder() + .setOtu( + // OTU interface specific data + new OtuBuilder() + .setFec(OtuAttributes.Fec.Scfec) + .setRate(OTU4.VALUE) + .build()) + .build()); // Post interface on the device this.openRoadmInterfaces.postInterface(nodeId, otuInterfaceBldr); + this.portMapping.updateMapping(nodeId, portMap); return otuInterfaceBldr.getName(); } @@ -159,124 +152,116 @@ public class OpenRoadmInterface121 { * * @param nodeId node ID * @param logicalConnPoint logical Connection Point - * @param supportingOtuInterface supporting OTU Interface * * @return Name of the interface if successful, otherwise return null. * @throws OpenRoadmInterfaceException OpenRoadmInterfaceException */ - public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint, String supportingOtuInterface) + public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint) 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( + OpenRoadmInterfaceException.mapping_msg_err(nodeId, logicalConnPoint)); + } + InterfaceBuilder oduInterfaceBldr = + createGenericInterfaceBuilder(portMap, OtnOdu.VALUE, logicalConnPoint + "-ODU"); + if (portMap.getSupportingOtu4() != null) { + oduInterfaceBldr.setSupportingInterface(portMap.getSupportingOtu4()); } - 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()); - - // 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.rev161014.Interface1Builder oduIf1Builder = - new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.Interface1Builder(); oduInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.Interface1.class, - oduIf1Builder.setOdu(oduIfBuilder.build()).build()); - + // Create Interface1 type object required for adding as augmentation + new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.Interface1Builder() + .setOdu( + // ODU interface specific data + new OduBuilder() + .setRate(ODU4.VALUE) + .setMonitoringMode(OduAttributes.MonitoringMode.Terminated) + .setOpu( + // Set Opu attributes + new OpuBuilder() + .setPayloadType("07") + .setExpPayloadType("07") + .build()) + .build()) + .build()); // Post interface on the device this.openRoadmInterfaces.postInterface(nodeId, oduInterfaceBldr); return oduInterfaceBldr.getName(); } /** - * This methods creates an OCH interface on the given termination point on + * This methods creates a list of 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. - * @throws OpenRoadmInterfaceException OpenRoadm interface exception + * @param spectrumInformation SpectrumInformation + * @return List containing name of the interface if successful, otherwise return empty list. * - * @return Name of the interface if successful, otherwise return null. + * @throws OpenRoadmInterfaceException OpenRoadm interface exception */ - public List createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber) - throws OpenRoadmInterfaceException { - + public List createOpenRoadmOchInterfaces(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 %s and" - + " logical connection port %s", nodeId, logicalConnPoint)); + throw new OpenRoadmInterfaceException( + OpenRoadmInterfaceException.mapping_msg_err(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); - + InterfaceBuilder ochInterfaceBldr = + createGenericInterfaceBuilder( + portMap, OpticalChannel.VALUE, + spectrumInformation.getIdentifierFromParams(logicalConnPoint)); // Add supporting OMS interface if (portMap.getSupportingOms() != null) { ochInterfaceBldr.setSupportingInterface(portMap.getSupportingOms()); } - // 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.rev161014.Interface1Builder - ochIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces - .rev161014.Interface1Builder(); ochInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.Interface1.class, - ochIf1Builder.setOch(ocIfBuilder.build()).build()); - - List interfacesCreated = new ArrayList<>(); + // Create Interface1 type object required for adding as augmentation + new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.Interface1Builder() + .setOch( + // OCH interface specific data + new OchBuilder().setWavelengthNumber(spectrumInformation.getWaveLength()).build()) + .build()); // Post interface on the device openRoadmInterfaces.postInterface(nodeId, ochInterfaceBldr); - interfacesCreated.add(ochInterfaceBldr.getName()); - return interfacesCreated; + return new ArrayList(List.of(ochInterfaceBldr.getName())); } - 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, + SpectrumInformation spectrumInformation) 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( + OpenRoadmInterfaceException.mapping_msg_err(nodeId, logicalConnPoint)); + } + ModulationFormat modulationFormat = + OchAttributes.ModulationFormat.forName(spectrumInformation.getModulationFormat()); + if (modulationFormat == null) { + modulationFormat = OchAttributes.ModulationFormat.DpQpsk; } - - // OCH interface specific data - OchBuilder ocIfBuilder = new OchBuilder(); - ocIfBuilder.setWavelengthNumber(waveNumber); - ocIfBuilder.setModulationFormat(format); - ocIfBuilder.setRate(rate); - ocIfBuilder.setTransmitPower(new PowerDBm(new BigDecimal("-5"))); - - // 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.rev161014 - .Interface1Builder ochIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel - .interfaces.rev161014.Interface1Builder(); // Create generic interface - InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class, - createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber)); - ochInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.Interface1.class, - ochIf1Builder.setOch(ocIfBuilder.build()).build()); - + InterfaceBuilder ochInterfaceBldr = + createGenericInterfaceBuilder( + portMap, OpticalChannel.VALUE, + spectrumInformation.getIdentifierFromParams(logicalConnPoint)) + .addAugmentation( + // Create Interface1 type object required for adding as augmentation + new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014 + .Interface1Builder() + .setOch( + // OCH interface specific data + new OchBuilder() + .setWavelengthNumber(spectrumInformation.getWaveLength()) + .setModulationFormat(modulationFormat) + .setRate(R100G.VALUE) + .setTransmitPower(new PowerDBm(Decimal64.valueOf("-5"))) + .build()) + .build()); // Post interface on the device this.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); @@ -284,72 +269,71 @@ public class OpenRoadmInterface121 { return ochInterfaceBldr.getName(); } - 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); } public String createOpenRoadmOmsInterface(String nodeId, Mapping mapping) throws OpenRoadmInterfaceException { - if (mapping.getSupportingOms() == null) { - // Create generic interface - InterfaceBuilder omsInterfaceBldr = createGenericInterfaceBuilder(mapping, OpenROADMOpticalMultiplex.class, - "OMS-" + mapping.getLogicalConnectionPoint()); - if (mapping.getSupportingOts() != null) { - omsInterfaceBldr.setSupportingInterface(mapping.getSupportingOts()); - } else { - LOG.error("Unable to get ots interface from mapping {} - {}", nodeId, - mapping.getLogicalConnectionPoint()); - return null; - } - this.openRoadmInterfaces.postInterface(nodeId, omsInterfaceBldr); - this.portMapping.updateMapping(nodeId, mapping); - return omsInterfaceBldr.build().getName(); - } else { + if (mapping.getSupportingOms() != null) { return mapping.getSupportingOms(); } + if (mapping.getSupportingOts() == null) { + LOG.error("Unable to get ots interface from mapping {} - {}", nodeId, mapping.getLogicalConnectionPoint()); + return null; + } + // Create generic interface + InterfaceBuilder omsInterfaceBldr = + createGenericInterfaceBuilder( + mapping, OpenROADMOpticalMultiplex.VALUE, + "OMS-" + mapping.getLogicalConnectionPoint()) + .setSupportingInterface(mapping.getSupportingOts()); + this.openRoadmInterfaces.postInterface(nodeId, omsInterfaceBldr); + this.portMapping.updateMapping(nodeId, mapping); + return omsInterfaceBldr.build().getName(); } public String createOpenRoadmOtsInterface(String nodeId, Mapping mapping) throws OpenRoadmInterfaceException { - if (mapping.getSupportingOts() == null) { - // Create generic interface - InterfaceBuilder otsInterfaceBldr = createGenericInterfaceBuilder(mapping, OpticalTransport.class, "OTS-" - + mapping.getLogicalConnectionPoint()); - // OTS interface augmentation specific data - OtsBuilder otsIfBuilder = new OtsBuilder(); - otsIfBuilder.setFiberType(OtsAttributes.FiberType.Smf); - - // Create Interface1 type object required for adding as - // augmentation - org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014 - .Interface1Builder otsIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm - .optical.transport.interfaces.rev161014.Interface1Builder(); - otsInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014 - .Interface1.class, - otsIf1Builder.setOts(otsIfBuilder.build()).build()); - this.openRoadmInterfaces.postInterface(nodeId, otsInterfaceBldr); - this.portMapping.updateMapping(nodeId, mapping); - return otsInterfaceBldr.build().getName(); - } else { + if (mapping.getSupportingOts() != null) { return mapping.getSupportingOts(); } + // Create generic interface + InterfaceBuilder otsInterfaceBldr = + createGenericInterfaceBuilder(mapping, OpticalTransport.VALUE, "OTS-" + mapping.getLogicalConnectionPoint()) + .addAugmentation( + // Create Interface1 type object required for adding as + // augmentation + new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014 + .Interface1Builder() + .setOts( + // OTS interface augmentation specific data + new OtsBuilder().setFiberType(OtsAttributes.FiberType.Smf).build()) + .build()); + this.openRoadmInterfaces.postInterface(nodeId, otsInterfaceBldr); + this.portMapping.updateMapping(nodeId, mapping); + return otsInterfaceBldr.build().getName(); } public boolean isUsedByXc(String nodeId, String interfaceName, String xc, - DeviceTransactionManager deviceTransactionManager) { - InstanceIdentifier xciid = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(RoadmConnections.class, new RoadmConnectionsKey(xc)); + DeviceTransactionManager deviceTransactionManager) { 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 { + Optional crossconnection = deviceTransactionManager.getDataFromDevice( + nodeId, + LogicalDatastoreType.CONFIGURATION, + InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(RoadmConnections.class, new RoadmConnectionsKey(xc)) + .build(), + Timeouts.DEVICE_READ_TIMEOUT, + Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (crossconnection.isEmpty()) { LOG.info("xd {} not found !", xc); + return false; + } + RoadmConnections rc = crossconnection.orElseThrow(); + LOG.info("xd {} found", xc); + if (rc.getSource().getSrcIf().equals(interfaceName) + || rc.getDestination().getDstIf().equals(interfaceName)) { + return true; } return false; }