From: guillaume.lambert Date: Thu, 22 Aug 2019 13:25:39 +0000 (+0200) Subject: switch to DeviceTransaction.commit() X-Git-Tag: 0.4.0~13 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=1c73397e5ba387bed2783ae14df5c5bb5030d852 switch to DeviceTransaction.commit() instead of submit which is now deprecated Signed-off-by: guillaume.lambert Change-Id: I433703bb6535b5064772b2766facc1899d4dff05 --- diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121.java index c49ed9b2d..47d6c3ba2 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121.java @@ -7,7 +7,7 @@ */ package org.opendaylight.transportpce.common.crossconnect; -import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.FluentFuture; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; @@ -15,9 +15,11 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.controller.md.sal.binding.api.MountPoint; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; +import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransaction; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; @@ -82,10 +84,10 @@ public class CrossConnectImpl121 { // post the cross connect on the device deviceTx.put(LogicalDatastoreType.CONFIGURATION, rdmConnectionIID, rdmConnBldr.build()); - ListenableFuture submit = - deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture commit = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { - submit.get(); + commit.get(); LOG.info("Roadm-connection successfully created: {}-{}-{}", srcTp, destTp, waveNumber); return Optional.of(connectionNumber); } catch (InterruptedException | ExecutionException e) { @@ -122,10 +124,10 @@ public class CrossConnectImpl121 { // post the cross connect on the device deviceTx.delete(LogicalDatastoreType.CONFIGURATION, generateRdmConnectionIID(connectionNumber)); - ListenableFuture submit = - deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture commit = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { - submit.get(); + commit.get(); LOG.info("Roadm connection successfully deleted "); return interfList; } catch (InterruptedException | ExecutionException e) { @@ -218,10 +220,10 @@ public class CrossConnectImpl121 { InstanceIdentifier roadmConnIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(RoadmConnections.class, new RoadmConnectionsKey(connectionNumber)); deviceTx.put(LogicalDatastoreType.CONFIGURATION, roadmConnIID, newRdmConn); - ListenableFuture submit = deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, - Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture commit = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { - submit.get(); + commit.get(); LOG.info("Roadm connection power level successfully set "); return true; } catch (InterruptedException | ExecutionException ex) { diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java index 4e5e2163b..3782e37f2 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java @@ -7,7 +7,7 @@ */ package org.opendaylight.transportpce.common.crossconnect; -import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.FluentFuture; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; @@ -16,9 +16,11 @@ import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.controller.md.sal.binding.api.MountPoint; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; +import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransaction; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; @@ -89,10 +91,10 @@ public class CrossConnectImpl221 { // post the cross connect on the device deviceTx.put(LogicalDatastoreType.CONFIGURATION, rdmConnectionIID, rdmConnBldr.build()); - ListenableFuture submit = - deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture commit = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { - submit.get(); + commit.get(); LOG.info("Roadm-connection successfully created: {}-{}-{}", srcTp, destTp, waveNumber); return Optional.of(connectionNumber); } catch (InterruptedException | ExecutionException e) { @@ -134,10 +136,10 @@ public class CrossConnectImpl221 { // post the cross connect on the device deviceTx.delete(LogicalDatastoreType.CONFIGURATION, generateRdmConnectionIID(connectionName)); - ListenableFuture submit = - deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture commit = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { - submit.get(); + commit.get(); LOG.info("Roadm connection {} successfully deleted on {}", connectionName, deviceId); return interfList; } catch (InterruptedException | ExecutionException e) { @@ -221,10 +223,10 @@ public class CrossConnectImpl221 { InstanceIdentifier roadmConnIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(RoadmConnections.class, new RoadmConnectionsKey(connectionName)); deviceTx.put(LogicalDatastoreType.CONFIGURATION, roadmConnIID, newRdmConn); - ListenableFuture submit = deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, - Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture commit = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { - submit.get(); + commit.get(); LOG.info("Roadm connection power level successfully set "); return true; } catch (InterruptedException | ExecutionException ex) { diff --git a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java index 160e0e147..cf48fba87 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java @@ -164,7 +164,7 @@ public class DeviceTransactionManagerImpl implements DeviceTransactionManager { } catch (InterruptedException | ExecutionException | TimeoutException e) { LOG.error("Exception thrown while reading data from device {}! IID: {}", deviceId, path, e); } finally { - deviceTx.submit(GET_DATA_SUBMIT_TIMEOUT, GET_DATA_SUBMIT_TIME_UNIT); + deviceTx.commit(GET_DATA_SUBMIT_TIMEOUT, GET_DATA_SUBMIT_TIME_UNIT); } } else { LOG.error("Could not obtain transaction for device {}!", deviceId); diff --git a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl121.java b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl121.java index 3eddbcb27..b17f7cba6 100755 --- a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl121.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl121.java @@ -8,11 +8,13 @@ package org.opendaylight.transportpce.common.openroadminterfaces; -import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.FluentFuture; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransaction; @@ -67,8 +69,8 @@ public class OpenRoadmInterfacesImpl121 { InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child( Interface.class, new InterfaceKey(ifBuilder.getName())); deviceTx.put(LogicalDatastoreType.CONFIGURATION, interfacesIID, ifBuilder.build()); - ListenableFuture txSubmitFuture = deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, - Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture txSubmitFuture = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { txSubmitFuture.get(); LOG.info("Successfully posted interface {} on node {}", ifBuilder.getName(), nodeId); @@ -155,11 +157,11 @@ public class OpenRoadmInterfacesImpl121 { } deviceTx.delete(LogicalDatastoreType.CONFIGURATION, interfacesIID); - ListenableFuture submit = deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, - Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture commit = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { - submit.get(); + commit.get(); LOG.info("Successfully deleted {} on node {}", interfaceName, nodeId); } catch (InterruptedException | ExecutionException e) { throw new OpenRoadmInterfaceException(String.format("Failed to delete interface %s on " + "node %s", @@ -220,8 +222,8 @@ public class OpenRoadmInterfacesImpl121 { nodeId), e); } deviceTx.put(LogicalDatastoreType.CONFIGURATION, circuitPackIID, cpBldr.build()); - ListenableFuture txSubmitFuture = deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, - Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture txSubmitFuture = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { txSubmitFuture.get(); LOG.info("Successfully posted equipment state change on node {}", nodeId); diff --git a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java index 1148f1799..dfb3ba51b 100755 --- a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java @@ -8,11 +8,13 @@ package org.opendaylight.transportpce.common.openroadminterfaces; -import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.FluentFuture; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransaction; @@ -69,8 +71,8 @@ public class OpenRoadmInterfacesImpl221 { LOG.info("POST INTERF for {} : InterfaceBuilder : name = {} \t type = {}", nodeId, ifBuilder.getName(), ifBuilder.getType().toString()); deviceTx.put(LogicalDatastoreType.CONFIGURATION, interfacesIID, ifBuilder.build()); - ListenableFuture txSubmitFuture = deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, - Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture txSubmitFuture = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { txSubmitFuture.get(); LOG.info("Successfully posted interface {} on node {}", ifBuilder.getName(), nodeId); @@ -158,11 +160,11 @@ public class OpenRoadmInterfacesImpl221 { } deviceTx.delete(LogicalDatastoreType.CONFIGURATION, interfacesIID); - ListenableFuture submit = deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, - Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture commit = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { - submit.get(); + commit.get(); LOG.info("Successfully deleted {} on node {}", interfaceName, nodeId); } catch (InterruptedException | ExecutionException e) { throw new OpenRoadmInterfaceException(String.format("Failed to delete interface %s on " + "node %s", @@ -223,8 +225,8 @@ public class OpenRoadmInterfacesImpl221 { nodeId), e); } deviceTx.put(LogicalDatastoreType.CONFIGURATION, circuitPackIID, cpBldr.build()); - ListenableFuture txSubmitFuture = deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, - Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture txSubmitFuture = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { txSubmitFuture.get(); LOG.info("Successfully posted equipment state change on node {}", nodeId); diff --git a/common/src/test/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerTest.java b/common/src/test/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerTest.java index 3f64af496..f4279854c 100644 --- a/common/src/test/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerTest.java +++ b/common/src/test/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerTest.java @@ -11,11 +11,10 @@ package org.opendaylight.transportpce.common.device; import static org.mockito.Matchers.any; import com.google.common.base.Optional; +import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; - import java.util.LinkedList; import java.util.List; import java.util.concurrent.ExecutionException; @@ -23,7 +22,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - +import org.eclipse.jdt.annotation.NonNull; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -37,6 +36,7 @@ import org.opendaylight.controller.md.sal.binding.api.MountPoint; import org.opendaylight.controller.md.sal.binding.api.MountPointService; import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.NetworkBuilder; import org.opendaylight.yangtools.util.concurrent.FluentFutures; @@ -113,9 +113,9 @@ public class DeviceTransactionManagerTest { Future> anotherDeviceTxFuture = transactionManager.getDeviceTransaction("another-id"); Assert.assertTrue(anotherDeviceTxFuture.isDone()); - anotherDeviceTxFuture.get().get().submit(defaultTimeout, defaultTimeUnit); + anotherDeviceTxFuture.get().get().commit(defaultTimeout, defaultTimeUnit); - firstDeviceTx.submit(defaultTimeout, defaultTimeUnit); + firstDeviceTx.commit(defaultTimeout, defaultTimeUnit); Thread.sleep(200); Assert.assertTrue(secondDeviceTxFuture.isDone()); Assert.assertFalse(thirdDeviceTxFuture.isDone()); @@ -124,13 +124,13 @@ public class DeviceTransactionManagerTest { secondDeviceTx.put(defaultDatastore, defaultIid, defaultData); Assert.assertFalse(thirdDeviceTxFuture.isDone()); - secondDeviceTx.submit(defaultTimeout, defaultTimeUnit); + secondDeviceTx.commit(defaultTimeout, defaultTimeUnit); Thread.sleep(200); Assert.assertTrue(thirdDeviceTxFuture.isDone()); DeviceTransaction thirdDeviceTx = thirdDeviceTxFuture.get().get(); thirdDeviceTx.put(defaultDatastore, defaultIid, defaultData); - thirdDeviceTx.submit(defaultTimeout, defaultTimeUnit); + thirdDeviceTx.commit(defaultTimeout, defaultTimeUnit); Mockito.verify(rwTransactionMock, Mockito.times(3)).put(defaultDatastore, defaultIid, defaultData); Mockito.verify(rwTransactionMock, Mockito.times(4)).commit(); @@ -152,7 +152,7 @@ public class DeviceTransactionManagerTest { try { for (Future> futureTx : deviceTransactionFutures) { DeviceTransaction deviceTx = futureTx.get().get(); - deviceTx.submit(defaultTimeout, defaultTimeUnit); + deviceTx.commit(defaultTimeout, defaultTimeUnit); deviceTransactions.add(deviceTx); } } catch (InterruptedException | ExecutionException e) { @@ -178,7 +178,7 @@ public class DeviceTransactionManagerTest { } deviceTransactions.parallelStream() - .forEach(deviceTransaction -> deviceTransaction.submit(defaultTimeout, defaultTimeUnit)); + .forEach(deviceTransaction -> deviceTransaction.commit(defaultTimeout, defaultTimeUnit)); deviceTransactions.parallelStream() .forEach(deviceTransaction -> Assert.assertTrue(deviceTransaction.wasSubmittedOrCancelled().get())); @@ -321,7 +321,7 @@ public class DeviceTransactionManagerTest { Exception throwedException = null; - ListenableFuture submitFuture = deviceTx.submit(200, defaultTimeUnit); + FluentFuture submitFuture = deviceTx.commit(200, defaultTimeUnit); try { submitFuture.get(); } catch (InterruptedException e) { @@ -358,6 +358,6 @@ public class DeviceTransactionManagerTest { Future> deviceTxFuture = deviceTxManager.getDeviceTransaction(deviceId); DeviceTransaction deviceTx = deviceTxFuture.get().get(); deviceTx.put(store, path, data); - deviceTx.submit(defaultTimeout, defaultTimeUnit); + deviceTx.commit(defaultTimeout, defaultTimeUnit); } } diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion121.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion121.java index 2e1b56518..4b094f83c 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion121.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion121.java @@ -8,15 +8,16 @@ package org.opendaylight.transportpce.olm.power; -import com.google.common.util.concurrent.ListenableFuture; - +import com.google.common.util.concurrent.FluentFuture; import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.crossconnect.CrossConnect; import org.opendaylight.transportpce.common.device.DeviceTransaction; @@ -180,11 +181,11 @@ public final class PowerMgmtVersion121 { InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(Interface.class, new InterfaceKey(interfaceName)); deviceTx.put(LogicalDatastoreType.CONFIGURATION, interfacesIID, ochInterfaceBuilder.build()); - ListenableFuture submit = deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, - Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture commit = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { - submit.get(); - LOG.info("Transponder Power update is submitted"); + commit.get(); + LOG.info("Transponder Power update is committed"); return true; } catch (InterruptedException | ExecutionException e) { LOG.error("Setting transponder power failed {}", e); @@ -243,10 +244,10 @@ public final class PowerMgmtVersion121 { InstanceIdentifier roadmConnIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(RoadmConnections.class, new RoadmConnectionsKey(connectionNumber)); deviceTx.put(LogicalDatastoreType.CONFIGURATION, roadmConnIID, newRdmConn); - ListenableFuture submit = deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, - Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture commit = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { - submit.get(); + commit.get(); LOG.info("Roadm connection power level successfully set "); return true; } catch (InterruptedException | ExecutionException ex) { diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion221.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion221.java index 48d9bfe15..29873b5fe 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion221.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion221.java @@ -8,14 +8,16 @@ package org.opendaylight.transportpce.olm.power; -import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.FluentFuture; import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.crossconnect.CrossConnect; import org.opendaylight.transportpce.common.device.DeviceTransaction; @@ -180,11 +182,11 @@ public final class PowerMgmtVersion221 { InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(Interface.class, new InterfaceKey(interfaceName)); deviceTx.put(LogicalDatastoreType.CONFIGURATION, interfacesIID, ochInterfaceBuilder.build()); - ListenableFuture submit = deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, - Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture commit = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { - submit.get(); - LOG.info("Transponder Power update is submitted"); + commit.get(); + LOG.info("Transponder Power update is committed"); return true; } catch (InterruptedException | ExecutionException e) { LOG.error("Setting transponder power failed {}", e); @@ -242,10 +244,10 @@ public final class PowerMgmtVersion221 { InstanceIdentifier roadmConnIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(RoadmConnections.class, new RoadmConnectionsKey(connectionNumber)); deviceTx.put(LogicalDatastoreType.CONFIGURATION, roadmConnIID, newRdmConn); - ListenableFuture submit = deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, - Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + FluentFuture commit = + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { - submit.get(); + commit.get(); LOG.info("Roadm connection power level successfully set "); return true; } catch (InterruptedException | ExecutionException ex) { diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/TransactionUtils.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/TransactionUtils.java index 49ff45b2c..23349e3cb 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/TransactionUtils.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/TransactionUtils.java @@ -37,7 +37,7 @@ public final class TransactionUtils { } DeviceTransaction deviceTx = deviceTxFuture.get().get(); deviceTx.put(logicalDatastoreType, instanceIdentifier, object, true); - deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT).get(); + deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT).get(); return true; }