NETVIRT-1630 migrate to md-sal APIs

[netvirt.git] / fibmanager / impl / src / test / java / org / opendaylight / netvirt / fibmanager / test / FibManagerTest.java

diff --git a/fibmanager/impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java b/fibmanager/impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java
index c1689f69e0307ece67fdc6db086e248364aa71d4..474b7c5fe97966ecb1f9e315292d6c03bb77a7f5 100644 (file)
--- a/fibmanager/impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java
+++ b/fibmanager/impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java
@@ -7,18 +7,16 @@
  */
 package org.opendaylight.netvirt.fibmanager.test;
 
-import static org.mockito.Mockito.when;
-
 import java.math.BigInteger;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.netvirt.fibmanager.VrfEntryListener;
 import org.opendaylight.netvirt.fibmanager.api.FibHelper;
 import org.opendaylight.netvirt.fibmanager.api.RouteOrigin;
@@ -30,6 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev15033
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.vrfentries.VrfEntryKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 @RunWith(MockitoJUnitRunner.class)
 public class FibManagerTest {
@@ -37,7 +36,7 @@ public class FibManagerTest {
     @Mock
     DataBroker dataBroker;
     @Mock
-    ReadOnlyTransaction mockReadTx;
+    ReadTransaction mockReadTx;
     @Mock
     WriteTransaction mockWriteTx;
     @Mock
@@ -55,7 +54,7 @@ public class FibManagerTest {
     private static final String TEST_RD = "100:1";
     private static final String PREFIX = "1.1.2.3";
     private static final String NEXTHOP = "1.1.1.1";
-    private static final int LABEL = 10;
+    private static final Uint32 LABEL = Uint32.valueOf(10);
     RouteOrigin origin = RouteOrigin.STATIC;
     BigInteger dpn;
     private static final long VPN_ID = 101L;
@@ -66,7 +65,7 @@ public class FibManagerTest {
         dpn = BigInteger.valueOf(100000L);
         identifier = buildVrfEntryId(TEST_RD, PREFIX);
         vrfEntry = FibHelper.getVrfEntryBuilder(PREFIX, LABEL, NEXTHOP, origin, null).build();
-        when(vrfTableKey.getRouteDistinguisher()).thenReturn(TEST_RD);
+        //when(vrfTableKey.getRouteDistinguisher()).thenReturn(TEST_RD);
     }
 
     @Before