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=de6ab127ea10c48e50c7aa893652c6e4c78e9aaf;hb=268165cb2822b6ce4c55f00cac63eed2bb222ec7;hp=c3dab0afec6b69072829b246cba878e172dcf047;hpb=ec97a3b1ee893164f4c76092fa115af43e0f9d43;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 c3dab0afe..de6ab127e 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,11 @@ 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.rev220316.mapping.Mapping; +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,17 +31,11 @@ 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.yang.gen.v1.http.org.openroadm.interfaces.rev191129.OtnOdu; -import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.OtnOtu; -import org.opendaylight.yang.gen.v1.http.org.openroadm.maintenance.loopback.rev191129.maint.loopback.MaintLoopbackBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.maintenance.testsignal.rev200529.maint.testsignal.MaintTestsignalBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev200529.Interface1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev200529.Interface1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev200529.odu.container.OduBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev200529.otu.container.OtuBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,9 +44,14 @@ 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, PortMappingVersion710 portMapping710) { this.deviceTransactionManager = deviceTransactionManager; + this.portMapping = portMapping; + this.portMapping710 = portMapping710; } public void postInterface(String nodeId, InterfaceBuilder ifBuilder) throws OpenRoadmInterfaceException { @@ -73,9 +77,34 @@ public class OpenRoadmInterfacesImpl710 { 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); @@ -91,8 +120,8 @@ public class OpenRoadmInterfacesImpl710 { } - public void deleteInterface(String nodeId, String interfaceName) throws OpenRoadmInterfaceException { - LOG.info("deleting interface {} on device221 {}", interfaceName, nodeId); + public synchronized void deleteInterface(String nodeId, String interfaceName) throws OpenRoadmInterfaceException { + LOG.info("deleting interface {} on device71 {}", interfaceName, nodeId); Optional intf2DeleteOpt; try { intf2DeleteOpt = getInterface(nodeId, interfaceName); @@ -102,35 +131,17 @@ public class OpenRoadmInterfacesImpl710 { } if (intf2DeleteOpt.isPresent()) { Interface intf2Delete = intf2DeleteOpt.get(); - // State admin state to out of service - InterfaceBuilder ifBuilder = new InterfaceBuilder(intf2Delete); - if (ifBuilder.getType() == OtnOdu.class) { - Interface1Builder oduBuilder = new Interface1Builder(intf2Delete.augmentation(Interface1.class)); - OduBuilder odu = new OduBuilder(oduBuilder.getOdu()); - if (odu.getMaintTestsignal() != null) { - MaintTestsignalBuilder maintSignalBuilder = new MaintTestsignalBuilder(); - maintSignalBuilder.setEnabled(false); - odu.setMaintTestsignal(maintSignalBuilder.build()); - } - oduBuilder.setOdu(odu.build()); - ifBuilder.addAugmentation(oduBuilder.build()); - } else if (ifBuilder.getType() == OtnOtu.class) { - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev200529.Interface1Builder - otuBuilder = - new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev200529.Interface1Builder( - intf2Delete.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev200529.Interface1 - .class)); - OtuBuilder otu = new OtuBuilder(otuBuilder.getOtu()); - if (otu.getMaintLoopback() != null) { - MaintLoopbackBuilder maintLoopBackBuilder = new MaintLoopbackBuilder(); - maintLoopBackBuilder.setEnabled(false); - otu.setMaintLoopback(maintLoopBackBuilder.build()); - } - otuBuilder.setOtu(otu.build()); - ifBuilder.addAugmentation(otuBuilder.build()); - } - ifBuilder.setAdministrativeState(AdminStates.OutOfService); + // 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); @@ -172,6 +183,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 { @@ -235,4 +251,35 @@ public class OpenRoadmInterfacesImpl710 { } } + public String getSupportedInterface(String nodeId, String interf) { + Optional supInterfOpt; + try { + supInterfOpt = getInterface(nodeId, interf); + if (supInterfOpt.isPresent()) { + return supInterfOpt.get().getSupportingInterfaceList().get(0); + } 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) { + KeyedInstanceIdentifier portIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(CircuitPacks.class, new CircuitPacksKey(ifBuilder.getSupportingCircuitPackName())) + .child(Ports.class, new PortsKey(ifBuilder.getSupportingPort())); + Ports port = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, + portIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).get(); + if (port.getInterfaces() == null) { + return false; + } + for (Interfaces interf : port.getInterfaces()) { + if (interf.getInterfaceName().equals(ifBuilder.getName())) { + return true; + } + } + return false; + } }