Fix elanservice tests after daexim change in genius idmanager

Change-Id: I97f97a7c926a34f9bb6764bf004e8854512f5788
Signed-off-by: Faseela K <faseela.k@ericsson.com>

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java
index 5163f94dd6acfe3b7a21d0e889b7f9c96541c071..7b196416829c37632fcf901c9d28ce3d63a2bcef 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java
@@ -15,7 +15,6 @@ import java.util.Collections;
 import java.util.List;
 import javax.inject.Inject;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.MethodRule;
@@ -66,12 +65,10 @@ public class ElanServiceTest {
         singleTxdataBroker = new SingleTransactionDataBroker(dataBroker);
     }
 
-    @Ignore
     @Test public void elanServiceTestModule() {
         // Intentionally empty; the goal is just to first test the ElanServiceTestModule
     }
 
-    @Ignore
     @Test public void createElanInstance() throws Exception {
         // Given
         // When
@@ -84,7 +81,6 @@ public class ElanServiceTest {
         assertNotNull(elanService.getElanInstance(TEST_ELAN_NAME));
     }
 
-    @Ignore
     @Test public void addElanInterface() throws Exception {
         // Given
         elanService.createElanInstance(TEST_ELAN_NAME, 12345, "...");

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java
index 9fb44ebfd0de23502dbff6a76fac78b75aee0ee4..589990d8296fc8112f4d8db62ec52b0cc3490426 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java
@@ -11,6 +11,7 @@ import org.mockito.Mockito;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.test.DataBrokerTestModule;
 import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
+import org.opendaylight.daexim.DataImportBootReady;
 import org.opendaylight.genius.idmanager.IdManager;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.genius.interfacemanager.rpcservice.InterfaceManagerRpcService;
@@ -69,6 +70,7 @@ public class ElanServiceTestModule extends AbstractGuiceJsr250Module {
         bind(EvpnUtils.class).toInstance(Mockito.mock(EvpnUtils.class));
         bind(EntityOwnershipService.class).toInstance(Mockito.mock(EntityOwnershipService.class));
         bind(INeutronVpnManager.class).toInstance(Mockito.mock(NeutronvpnManagerImpl.class));
+        bind(DataImportBootReady.class).toInstance(new DataImportBootReady() {});
     }
 
 }