NETVIRT-1630 migrate to md-sal APIs

[netvirt.git] / elanmanager / impl / src / test / java / org / opendaylight / netvirt / elanmanager / tests / ElanServiceTestBase.java

diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java
index 2416d2a96c08279784f19fdfadab5ddc2f506514..24d0ab340a2267b564805fd6703f68a6233e39bc 100644 (file)
--- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java
+++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java
@@ -8,28 +8,28 @@
 package org.opendaylight.netvirt.elanmanager.tests;
 
 import com.google.common.collect.Lists;
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.awaitility.Awaitility;
 import org.awaitility.core.ConditionFactory;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.genius.testutils.TestInterfaceManager;
 import org.opendaylight.genius.testutils.interfacemanager.TunnelInterfaceDetails;
 import org.opendaylight.genius.testutils.itm.ItmRpcTestImpl;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
 import org.opendaylight.netvirt.elan.cache.ElanInstanceCache;
 import org.opendaylight.netvirt.elan.internal.ElanInstanceManager;
 import org.opendaylight.netvirt.elan.utils.ElanUtils;
@@ -73,6 +73,8 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint64;
 
 public class ElanServiceTestBase {
 
@@ -84,11 +86,11 @@ public class ElanServiceTestBase {
     protected @Inject SingleTransactionDataBroker singleTxdataBroker;
     protected @Inject OdlInterfaceRpcService odlInterfaceRpcService;
     public static final String ELAN1 = "34701c04-1118-4c65-9425-78a80d49a211";
-    public static final Long ELAN1_SEGMENT_ID = 100L;
+    public static final Uint32 ELAN1_SEGMENT_ID = Uint32.valueOf(100L);
 
-    protected static final BigInteger DPN1_ID = new BigInteger("1");
-    protected static final BigInteger DPN2_ID = new BigInteger("2");
-    protected static final BigInteger DPN3_ID = new BigInteger("3");
+    protected static final Uint64 DPN1_ID = Uint64.valueOf("1").intern();
+    protected static final Uint64 DPN2_ID = Uint64.valueOf("2").intern();
+    protected static final Uint64 DPN3_ID = Uint64.valueOf("3").intern();
 
     protected static final String DPN1_ID_STR = "1";
     protected static final String DPN2_ID_STR = "2";
@@ -318,7 +320,7 @@ public class ElanServiceTestBase {
     }
 
 
-    protected void setupItm() throws TransactionCommitFailedException {
+    protected void setupItm() throws ExecutionException, InterruptedException {
         /*Add tap port and tunnel ports in DPN1 and DPN2*/
         interfaceMgr.addInterfaceInfo(ELAN_INTERFACES.get(ELAN1 + ":" + DPN1MAC1).getLeft());
         interfaceMgr.addInterfaceInfo(ELAN_INTERFACES.get(ELAN1 + ":" + DPN1MAC2).getLeft());
@@ -379,7 +381,7 @@ public class ElanServiceTestBase {
 
     }
 
-    protected InstanceIdentifier<Flow> getFlowIid(short tableId, FlowId flowid, BigInteger dpnId) {
+    protected InstanceIdentifier<Flow> getFlowIid(short tableId, FlowId flowid, Uint64 dpnId) {
 
         FlowKey flowKey = new FlowKey(new FlowId(flowid));
         NodeId nodeId =
@@ -393,14 +395,14 @@ public class ElanServiceTestBase {
     }
 
 
-    protected void createElanInstance(String elan1, Long elan1SegmentId) {
+    protected void createElanInstance(String elan1, Uint32 elan1SegmentId) {
         ElanInstance elanInstance = ExpectedObjects.createElanInstance(elan1, elan1SegmentId);
         MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION,
                 ElanHelper.getElanInstanceConfigurationDataPath(elan1), elanInstance);
     }
 
     public void addElanInterface(String elanInstanceName, InterfaceInfo interfaceInfo, String prefix) {
-        ElanInstance existingElanInstance = elanInstanceCache.get(elanInstanceName).orNull();
+        ElanInstance existingElanInstance = elanInstanceCache.get(elanInstanceName).orElse(null);
         String interfaceName = interfaceInfo.getInterfaceName();
 
         if (existingElanInstance != null) {