Upgrade Network model from 2.1 to 4.1

[transportpce.git] / common / src / test / java / org / opendaylight / transportpce / common / device / DeviceTransactionManagerTest.java

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 1815c184f6245c1f5dc70419bae318d24a6fbb20..355d57367c5c125f40d140c40d2ae55569f21232 100644 (file)
--- a/common/src/test/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerTest.java
+++ b/common/src/test/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerTest.java
@@ -37,8 +37,8 @@ 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.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.Network;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkBuilder;
+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.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
@@ -102,9 +102,6 @@ public class DeviceTransactionManagerTest {
                     transactionManager.getDeviceTransaction(defaultDeviceId);
             Assert.assertFalse(thirdDeviceTxFuture.isDone());
 
-            Future<java.util.Optional<DeviceTransaction>> anotherDeviceTxFuture =
-                    transactionManager.getDeviceTransaction("another-id");
-
             firstDeviceTx.put(defaultDatastore, defaultIid, defaultData);
             Assert.assertFalse(secondDeviceTxFuture.isDone());
             Assert.assertFalse(thirdDeviceTxFuture.isDone());
@@ -112,6 +109,8 @@ public class DeviceTransactionManagerTest {
             Assert.assertFalse(secondDeviceTxFuture.isDone());
             Assert.assertFalse(thirdDeviceTxFuture.isDone());
 
+            Future<java.util.Optional<DeviceTransaction>> anotherDeviceTxFuture =
+                    transactionManager.getDeviceTransaction("another-id");
             Assert.assertTrue(anotherDeviceTxFuture.isDone());
             anotherDeviceTxFuture.get().get().submit(defaultTimeout, defaultTimeUnit);