MDSAL-API Migration

[genius.git] / interfacemanager / interfacemanager-impl / src / test / java / org / opendaylight / genius / interfacemanager / test / OvsdbSouthboundTestUtil.java

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/OvsdbSouthboundTestUtil.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/OvsdbSouthboundTestUtil.java
index 07992775b57142f11d32d56716539c154bd27698..9f58417cbe83bdc575c3770b5f045493dd06c809 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/OvsdbSouthboundTestUtil.java
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/OvsdbSouthboundTestUtil.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.genius.interfacemanager.test;
 
-import static org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.OPERATIONAL;
+import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL;
 
 import com.google.common.collect.ImmutableBiMap;
 import java.net.Inet4Address;
@@ -18,10 +18,10 @@ import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
+import java.util.concurrent.ExecutionException;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
@@ -100,7 +100,7 @@ public class OvsdbSouthboundTestUtil {
         return new NodeId(uri);
     }
 
-    public static void createBridge(DataBroker dataBroker) throws TransactionCommitFailedException {
+    public static void createBridge(DataBroker dataBroker) throws ExecutionException, InterruptedException {
         final OvsdbBridgeName ovsdbBridgeName = new OvsdbBridgeName("s2");
         final InstanceIdentifier<Node> bridgeIid = createInstanceIdentifier("192.168.56.101", 6640, ovsdbBridgeName);
         final InstanceIdentifier<OvsdbBridgeAugmentation> ovsdbBridgeIid = bridgeIid.builder()
@@ -115,10 +115,11 @@ public class OvsdbSouthboundTestUtil {
         LOG.debug("Built with the intent to store bridge data {}", bridgeCreateAugmentationBuilder.toString());
         WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
         tx.put(LogicalDatastoreType.OPERATIONAL, ovsdbBridgeIid, bridgeCreateAugmentationBuilder.build(), true);
-        tx.submit().checkedGet();
+        tx.commit().get();
     }
 
-    public static void updateBridge(DataBroker dataBroker, String datapathId) throws TransactionCommitFailedException {
+    public static void updateBridge(DataBroker dataBroker, String datapathId)
+            throws ExecutionException, InterruptedException {
         final OvsdbBridgeName ovsdbBridgeName = new OvsdbBridgeName("s2");
         final InstanceIdentifier<Node> bridgeIid = createInstanceIdentifier("192.168.56.101", 6640, ovsdbBridgeName);
         final InstanceIdentifier<OvsdbBridgeAugmentation> ovsdbBridgeIid = bridgeIid.builder()
@@ -133,10 +134,10 @@ public class OvsdbSouthboundTestUtil {
         LOG.debug("Built with the intent to store bridge data {}", bridgeCreateAugmentationBuilder.toString());
         WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
         tx.merge(LogicalDatastoreType.OPERATIONAL, ovsdbBridgeIid, bridgeCreateAugmentationBuilder.build(), true);
-        tx.submit().checkedGet();
+        tx.commit().get();
     }
 
-    public static void deleteBridge(DataBroker dataBroker) throws TransactionCommitFailedException {
+    public static void deleteBridge(DataBroker dataBroker) throws ExecutionException, InterruptedException {
         final OvsdbBridgeName ovsdbBridgeName = new OvsdbBridgeName("s2");
         final InstanceIdentifier<Node> bridgeIid = createInstanceIdentifier("192.168.56.101", 6640, ovsdbBridgeName);
         final InstanceIdentifier<OvsdbBridgeAugmentation> ovsdbBridgeIid = bridgeIid.builder()
@@ -144,7 +145,7 @@ public class OvsdbSouthboundTestUtil {
         LOG.debug("Built with the intent to delete bridge data {}", bridgeIid.toString());
         WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
         tx.delete(LogicalDatastoreType.OPERATIONAL, ovsdbBridgeIid);
-        tx.submit().checkedGet();
+        tx.commit().get();
     }
 
     public static InstanceIdentifier<Node> createInstanceIdentifier(NodeId nodeId) {
@@ -199,7 +200,7 @@ public class OvsdbSouthboundTestUtil {
 
     public static void createTerminationPoint(DataBroker dataBroker, String interfaceName,
                                               Class<? extends InterfaceTypeBase> type, String externalId) throws
-        TransactionCommitFailedException {
+            ExecutionException, InterruptedException {
         final OvsdbBridgeName ovsdbBridgeName = new OvsdbBridgeName("s2");
         final InstanceIdentifier<Node> bridgeIid =
             createInstanceIdentifier("192.168.56.101", 6640,  ovsdbBridgeName);
@@ -223,12 +224,12 @@ public class OvsdbSouthboundTestUtil {
         tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build());
         WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
         tx.put(OPERATIONAL, tpId, tpBuilder.build(), true);
-        tx.submit().checkedGet();
+        tx.commit().get();
     }
 
     public static void updateTerminationPoint(DataBroker dataBroker, String interfaceName,
                                               Class<? extends InterfaceTypeBase> type) throws
-        TransactionCommitFailedException {
+            ExecutionException, InterruptedException {
         final OvsdbBridgeName ovsdbBridgeName = new OvsdbBridgeName("s2");
         final InstanceIdentifier<Node> bridgeIid =
             createInstanceIdentifier("192.168.56.101", 6640,  ovsdbBridgeName);
@@ -249,7 +250,7 @@ public class OvsdbSouthboundTestUtil {
         tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build());
         WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
         tx.merge(OPERATIONAL, tpId, tpBuilder.build(), true);
-        tx.submit().checkedGet();
+        tx.commit().get();
     }
 
     public static NodeKey createNodeKey(String ip, Integer port) {