X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fcommon%2Fopenroadminterfaces%2FOpenRoadmInterfacesImpl710.java;h=836bdf35fb6e496c44e2ecf20eb004ae1b38ce41;hb=3b12da60a58abd37a0d97afbe3c44c925547270f;hp=358b0dd7ddb0386d87025a40b6b2bb4b506fa335;hpb=4fc7683a8eefbd3121f6c90c1444394b91973e8a;p=transportpce.git diff --git a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl710.java b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl710.java index 358b0dd7d..836bdf35f 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl710.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl710.java @@ -19,6 +19,12 @@ import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransaction; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; +import org.opendaylight.transportpce.common.mapping.PortMapping; +import org.opendaylight.transportpce.common.mapping.PortMappingVersion710; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev231221.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.OrgOpenroadmDeviceData; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.pack.Ports; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.pack.PortsKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.packs.CircuitPacks; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.packs.CircuitPacksBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.packs.CircuitPacksKey; @@ -26,6 +32,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.interfac import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.interfaces.grp.InterfaceBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.interfaces.grp.InterfaceKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.OrgOpenroadmDevice; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.port.Interfaces; import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates; import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.States; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -37,9 +44,13 @@ public class OpenRoadmInterfacesImpl710 { private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmInterfacesImpl710.class); private final DeviceTransactionManager deviceTransactionManager; + private final PortMapping portMapping; + private final PortMappingVersion710 portMapping710; - public OpenRoadmInterfacesImpl710(DeviceTransactionManager deviceTransactionManager) { + public OpenRoadmInterfacesImpl710(DeviceTransactionManager deviceTransactionManager, PortMapping portMapping) { this.deviceTransactionManager = deviceTransactionManager; + this.portMapping = portMapping; + this.portMapping710 = portMapping.getPortMappingVersion710(); } public void postInterface(String nodeId, InterfaceBuilder ifBuilder) throws OpenRoadmInterfaceException { @@ -48,7 +59,7 @@ public class OpenRoadmInterfacesImpl710 { try { Optional deviceTxOpt = deviceTxFuture.get(); if (deviceTxOpt.isPresent()) { - deviceTx = deviceTxOpt.get(); + deviceTx = deviceTxOpt.orElseThrow(); } else { throw new OpenRoadmInterfaceException(String.format("Device transaction was not found for node %s!", nodeId)); @@ -58,16 +69,43 @@ public class OpenRoadmInterfacesImpl710 { nodeId), e); } - InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child( - Interface.class, new InterfaceKey(ifBuilder.getName())); + InstanceIdentifier interfacesIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey(ifBuilder.getName())) + .build(); LOG.info("POST INTERF for {} : InterfaceBuilder : name = {} \t type = {}", nodeId, ifBuilder.getName(), ifBuilder.getType().toString()); deviceTx.merge(LogicalDatastoreType.CONFIGURATION, interfacesIID, ifBuilder.build()); FluentFuture txSubmitFuture = deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + // TODO: instead of using this infinite loop coupled with this timeout, + // it would be better to use a notification mechanism from the device to be advertised + // that the new created interface is present in the device circuit-pack/port + final Thread current = Thread.currentThread(); + Thread timer = new Thread() { + public void run() { + try { + Thread.sleep(3000); + current.interrupt(); + } catch (InterruptedException e) { + LOG.error("Timeout before the new created interface appears on the deivce circuit-pack port", e); + } + } + }; try { txSubmitFuture.get(); - LOG.info("Successfully posted interface {} on node {}", ifBuilder.getName(), nodeId); + LOG.info("Successfully posted/deleted interface {} on node {}", ifBuilder.getName(), nodeId); + // this check is not needed during the delete operation + // during the delete operation, ifBuilder does not contain supporting-cp and supporting-port + if (ifBuilder.getSupportingCircuitPackName() != null && ifBuilder.getSupportingPort() != null) { + boolean devicePortIsUptodated = false; + while (!devicePortIsUptodated) { + devicePortIsUptodated = checkIfDevicePortIsUpdatedWithInterface(nodeId, ifBuilder); + } + LOG.info("{} - {} - interface {} updated on port {}", nodeId, ifBuilder.getSupportingCircuitPackName(), + ifBuilder.getName(), ifBuilder.getSupportingPort()); + } + timer.interrupt(); } catch (InterruptedException | ExecutionException e) { throw new OpenRoadmInterfaceException(String.format("Failed to post interface %s on node %s!", ifBuilder .getName(), nodeId), e); @@ -76,14 +114,16 @@ public class OpenRoadmInterfacesImpl710 { public Optional getInterface(String nodeId, String interfaceName) throws OpenRoadmInterfaceException { - InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Interface.class, new InterfaceKey(interfaceName)); + InstanceIdentifier interfacesIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey(interfaceName)) + .build(); return deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.CONFIGURATION, interfacesIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); } - public void deleteInterface(String nodeId, String interfaceName) throws OpenRoadmInterfaceException { + public synchronized void deleteInterface(String nodeId, String interfaceName) throws OpenRoadmInterfaceException { LOG.info("deleting interface {} on device71 {}", interfaceName, nodeId); Optional intf2DeleteOpt; try { @@ -93,12 +133,18 @@ public class OpenRoadmInterfacesImpl710 { interfaceName, nodeId), e); } if (intf2DeleteOpt.isPresent()) { - Interface intf2Delete = intf2DeleteOpt.get(); - // State admin state to out of service - InterfaceBuilder ifBuilder = new InterfaceBuilder(); - ifBuilder.setName(intf2Delete.getName()); - ifBuilder.setType(intf2Delete.getType()); - ifBuilder.setAdministrativeState(AdminStates.OutOfService); + Interface intf2Delete = intf2DeleteOpt.orElseThrow(); + // set the name and set the type. Having these two lines will post the interface with just + // name, type and admin-state, without all the default values such as maint-testsignal + // delete the interfaces successfully + // just build a new Interface builder without the arguments for inter2Delete + InterfaceBuilder ifBuilder = new InterfaceBuilder() + .setAdministrativeState(AdminStates.OutOfService) + // Though these could be redundant, but 'when' statements are causing problem, + // when deleting the interfaces trying to be deleted + .setName(intf2Delete.getName()) + .setType(intf2Delete.getType()); + // post interface with updated admin state try { postInterface(nodeId, ifBuilder); @@ -107,15 +153,17 @@ public class OpenRoadmInterfacesImpl710 { + " deleting it!", interfaceName, AdminStates.OutOfService), ex); } - InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child( - Interface.class, new InterfaceKey(interfaceName)); + InstanceIdentifier interfacesIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey(interfaceName)) + .build(); Future> deviceTxFuture = this.deviceTransactionManager.getDeviceTransaction( nodeId); DeviceTransaction deviceTx; try { Optional deviceTxOpt = deviceTxFuture.get(); if (deviceTxOpt.isPresent()) { - deviceTx = deviceTxOpt.get(); + deviceTx = deviceTxOpt.orElseThrow(); } else { throw new OpenRoadmInterfaceException(String.format("Device transaction was not found for node %s!", nodeId)); @@ -140,6 +188,11 @@ public class OpenRoadmInterfacesImpl710 { if (intf2Delete.getName().contains(StringConstants.CLIENT_TOKEN) || intf2Delete.getName().contains( StringConstants.NETWORK_TOKEN)) { postEquipmentState(nodeId, intf2Delete.getSupportingCircuitPackName(), false); + // Here we update the port-mapping data after the interface delete + Mapping oldMapping = this.portMapping.getMapping( + nodeId, intf2Delete.getSupportingCircuitPackName(), intf2Delete.getSupportingPort()); + this.portMapping.deleteMapping(nodeId, oldMapping.getLogicalConnectionPoint()); + this.portMapping710.updateMapping(nodeId, oldMapping); } } else { @@ -149,14 +202,16 @@ public class OpenRoadmInterfacesImpl710 { public void postEquipmentState(String nodeId, String circuitPackName, boolean activate) throws OpenRoadmInterfaceException { - InstanceIdentifier circuitPackIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child( - CircuitPacks.class, new CircuitPacksKey(circuitPackName)); + InstanceIdentifier circuitPackIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(CircuitPacks.class, new CircuitPacksKey(circuitPackName)) + .build(); Optional cpOpt = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.CONFIGURATION, circuitPackIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); CircuitPacks cp = null; if (cpOpt.isPresent()) { - cp = cpOpt.get(); + cp = cpOpt.orElseThrow(); } else { throw new OpenRoadmInterfaceException(String.format( "Could not find CircuitPack %s in equipment config datastore for node %s", circuitPackName, nodeId)); @@ -181,7 +236,7 @@ public class OpenRoadmInterfacesImpl710 { try { Optional deviceTxOpt = deviceTxFuture.get(); if (deviceTxOpt.isPresent()) { - deviceTx = deviceTxOpt.get(); + deviceTx = deviceTxOpt.orElseThrow(); } else { throw new OpenRoadmInterfaceException(String.format("Device transaction was not found for node %s!", nodeId)); @@ -203,4 +258,37 @@ public class OpenRoadmInterfacesImpl710 { } } + public String getSupportedInterface(String nodeId, String interf) { + Optional supInterfOpt; + try { + supInterfOpt = getInterface(nodeId, interf); + if (supInterfOpt.isPresent()) { + return supInterfOpt.orElseThrow().getSupportingInterfaceList().stream().findFirst().orElseThrow(); + } else { + return null; + } + } catch (OpenRoadmInterfaceException e) { + LOG.error("error getting Supported Interface of {} - {}", interf, nodeId, e); + return null; + } + } + + private boolean checkIfDevicePortIsUpdatedWithInterface(String nodeId, InterfaceBuilder ifBuilder) { + InstanceIdentifier portIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(CircuitPacks.class, new CircuitPacksKey(ifBuilder.getSupportingCircuitPackName())) + .child(Ports.class, new PortsKey(ifBuilder.getSupportingPort())) + .build(); + Ports port = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, + portIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).orElseThrow(); + if (port.getInterfaces() == null) { + return false; + } + for (Interfaces interf : port.getInterfaces()) { + if (interf.getInterfaceName().equals(ifBuilder.getName())) { + return true; + } + } + return false; + } }