From: Robert Varga Date: Sun, 31 May 2020 09:26:17 +0000 (+0200) Subject: Integrate controller-2.0.1 X-Git-Tag: release/aluminium~27 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=65abd55ed3846bb47c4f9ea1e6f14a11ddc63189;p=genius.git Integrate controller-2.0.1 This bumps versions to the following: - odlparent-7.0.2 - yangtools-5.0.2 - mdsal-6.0.1 - controller-2.0.1 Also fix up MD-SAL API migration. JIRA: GENIUS-279 Change-Id: Iac4963fa4d833481e34e9683450cb61a339df3d7 Signed-off-by: Robert Varga --- diff --git a/alivenessmonitor/pom.xml b/alivenessmonitor/pom.xml index ff83f64f9..7de2955b8 100644 --- a/alivenessmonitor/pom.xml +++ b/alivenessmonitor/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/arputil/arputil-impl/pom.xml b/arputil/arputil-impl/pom.xml index 499e73f40..15602df98 100644 --- a/arputil/arputil-impl/pom.xml +++ b/arputil/arputil-impl/pom.xml @@ -83,12 +83,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html javax.inject - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test - test-jar - org.opendaylight.genius testutils diff --git a/arputil/pom.xml b/arputil/pom.xml index 53aad2be5..af58253be 100644 --- a/arputil/pom.xml +++ b/arputil/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index a33173412..acfd2b3c8 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/cloudscaler/impl/src/test/java/org/opendaylight/genius/cloudscaler/tests/CloudScalerServiceTestModule.java b/cloudscaler/impl/src/test/java/org/opendaylight/genius/cloudscaler/tests/CloudScalerServiceTestModule.java index 70051b24e..8d2e5476f 100644 --- a/cloudscaler/impl/src/test/java/org/opendaylight/genius/cloudscaler/tests/CloudScalerServiceTestModule.java +++ b/cloudscaler/impl/src/test/java/org/opendaylight/genius/cloudscaler/tests/CloudScalerServiceTestModule.java @@ -7,9 +7,6 @@ */ package org.opendaylight.genius.cloudscaler.tests; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; -import java.util.concurrent.Executors; import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker; import org.opendaylight.infrautils.caches.CacheProvider; import org.opendaylight.infrautils.caches.baseimpl.CacheManagersRegistry; @@ -17,26 +14,13 @@ import org.opendaylight.infrautils.caches.baseimpl.internal.CacheManagersRegistr import org.opendaylight.infrautils.caches.guava.internal.GuavaCacheProvider; import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module; import org.opendaylight.mdsal.binding.api.DataBroker; -import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractBaseDataBrokerTest; -import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTestCustomizer; +import org.opendaylight.mdsal.binding.testutils.DataBrokerTestModule; public class CloudScalerServiceTestModule extends AbstractGuiceJsr250Module { @Override - protected void configureBindings() throws Exception { - AbstractBaseDataBrokerTest test = new AbstractBaseDataBrokerTest() { - @Override - protected AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer() { - return new AbstractDataBrokerTestCustomizer() { - @Override - public ListeningExecutorService getCommitCoordinatorExecutor() { - return MoreExecutors.listeningDecorator(Executors.newCachedThreadPool()); - } - }; - } - }; - test.setup(); - DataBroker dataBroker = test.getDataBroker(); + protected void configureBindings() { + DataBroker dataBroker = DataBrokerTestModule.dataBroker(); bind(DataBroker.class).toInstance(dataBroker); bind(CacheManagersRegistry.class).to(CacheManagersRegistryImpl.class); bind(CacheProvider.class).to(GuavaCacheProvider.class); diff --git a/cloudscaler/pom.xml b/cloudscaler/pom.xml index 634132b0a..093c55a08 100644 --- a/cloudscaler/pom.xml +++ b/cloudscaler/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml index 4f04a1e5d..0ce60b447 100644 --- a/commons/binding-parent/pom.xml +++ b/commons/binding-parent/pom.xml @@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 6.0.0 + 6.0.1 @@ -34,7 +34,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/commons/checkstyle/pom.xml b/commons/checkstyle/pom.xml index 06cf97fbd..20093209f 100644 --- a/commons/checkstyle/pom.xml +++ b/commons/checkstyle/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent - 7.0.1 + 7.0.2 diff --git a/commons/pom.xml b/commons/pom.xml index 31b2be949..f999de26c 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/commons/quality-parent/pom.xml b/commons/quality-parent/pom.xml index dbd79e05a..d982cd3db 100644 --- a/commons/quality-parent/pom.xml +++ b/commons/quality-parent/pom.xml @@ -29,21 +29,21 @@ org.opendaylight.yangtools yangtools-artifacts - 5.0.1 + 5.0.2 pom import org.opendaylight.controller controller-artifacts - 2.0.0 + 2.0.1 pom import org.opendaylight.mdsal mdsal-artifacts - 6.0.0 + 6.0.1 pom import diff --git a/fcapsapplication/pom.xml b/fcapsapplication/pom.xml index aac128a6f..a83da9d21 100644 --- a/fcapsapplication/pom.xml +++ b/fcapsapplication/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/fcapsmanager/pom.xml b/fcapsmanager/pom.xml index 0f9b0ad90..825fc0b97 100644 --- a/fcapsmanager/pom.xml +++ b/fcapsmanager/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/features/genius-features/pom.xml b/features/genius-features/pom.xml index 0015d6d93..4168529a1 100644 --- a/features/genius-features/pom.xml +++ b/features/genius-features/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 7.0.1 + 7.0.2 diff --git a/features/odl-genius-api/pom.xml b/features/odl-genius-api/pom.xml index 3bb5f3e47..71c133cb2 100644 --- a/features/odl-genius-api/pom.xml +++ b/features/odl-genius-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 @@ -27,7 +27,7 @@ org.opendaylight.mdsal mdsal-artifacts - 6.0.0 + 6.0.1 import pom diff --git a/features/odl-genius-fcaps-application/pom.xml b/features/odl-genius-fcaps-application/pom.xml index a0bebf668..9ab36f16b 100644 --- a/features/odl-genius-fcaps-application/pom.xml +++ b/features/odl-genius-fcaps-application/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features/odl-genius-fcaps-framework/pom.xml b/features/odl-genius-fcaps-framework/pom.xml index 420ee220b..5ee16aa89 100644 --- a/features/odl-genius-fcaps-framework/pom.xml +++ b/features/odl-genius-fcaps-framework/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features/odl-genius-rest/pom.xml b/features/odl-genius-rest/pom.xml index def7b2ff2..8b09dfaab 100644 --- a/features/odl-genius-rest/pom.xml +++ b/features/odl-genius-rest/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features/odl-genius/pom.xml b/features/odl-genius/pom.xml index 00e0d3831..2732ecb6f 100644 --- a/features/odl-genius/pom.xml +++ b/features/odl-genius/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.1 + 7.0.2 diff --git a/features/pom.xml b/features/pom.xml index 24ad747da..9f2d87f83 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/idmanager/idmanager-impl/src/test/java/org/opendaylight/genius/idmanager/test/IdManagerTestModule.java b/idmanager/idmanager-impl/src/test/java/org/opendaylight/genius/idmanager/test/IdManagerTestModule.java index 19c2dc06a..207d50b2b 100644 --- a/idmanager/idmanager-impl/src/test/java/org/opendaylight/genius/idmanager/test/IdManagerTestModule.java +++ b/idmanager/idmanager-impl/src/test/java/org/opendaylight/genius/idmanager/test/IdManagerTestModule.java @@ -18,7 +18,7 @@ import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.genius.mdsalutil.interfaces.testutils.TestIMdsalApiManager; import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module; import org.opendaylight.mdsal.binding.api.DataBroker; -import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBrokerTest; +import org.opendaylight.mdsal.binding.testutils.DataBrokerTestModule; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.LockManagerService; @@ -26,7 +26,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev16041 public class IdManagerTestModule extends AbstractGuiceJsr250Module { @Override - protected void configureBindings() throws Exception { + protected void configureBindings() { bind(DataImportBootReady.class).toInstance(new DataImportBootReady() {}); bind(IdManagerService.class).to(IdManager.class); bind(LockManagerService.class).to(LockManagerServiceImpl.class); @@ -36,24 +36,7 @@ public class IdManagerTestModule extends AbstractGuiceJsr250Module { bind(LockListener.class); bind(IdPoolListener.class); bind(JobCoordinatorEventsWaiter.class).to(TestableJobCoordinatorEventsWaiter.class); - - /*AbstractBaseDataBrokerTest test = new AbstractBaseDataBrokerTest() { - @Override - protected AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer() { - return new AbstractDataBrokerTestCustomizer() { - @Override - public ListeningExecutorService getCommitCoordinatorExecutor() { - return MoreExecutors.listeningDecorator(Executors.newCachedThreadPool()); - } - }; - } - }; - test.setup(); - DataBroker dataBroker = test.getDataBroker();*/ - /***************/ - AbstractConcurrentDataBrokerTest dataBrokerTest = new AbstractConcurrentDataBrokerTest(false) {}; - dataBrokerTest.setup(); - DataBroker dataBroker = dataBrokerTest.getDataBroker(); + DataBroker dataBroker = DataBrokerTestModule.dataBroker(); bind(DataBroker.class).toInstance(dataBroker); } } diff --git a/idmanager/pom.xml b/idmanager/pom.xml index 501281096..0c3b94995 100644 --- a/idmanager/pom.xml +++ b/idmanager/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java index 8172b81e3..bea808cbb 100644 --- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java +++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java @@ -9,9 +9,6 @@ package org.opendaylight.genius.interfacemanager.test; import static org.mockito.Mockito.mock; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; -import java.util.concurrent.Executors; import org.opendaylight.daexim.DataImportBootReady; import org.opendaylight.genius.datastoreutils.listeners.DataTreeEventCallbackRegistrar; import org.opendaylight.genius.datastoreutils.testutils.AbstractTestableListener; @@ -47,8 +44,8 @@ import org.opendaylight.genius.utils.hwvtep.HwvtepNodeHACache; import org.opendaylight.infrautils.caches.CacheProvider; import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module; import org.opendaylight.mdsal.binding.api.DataBroker; -import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractBaseDataBrokerTest; -import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTestCustomizer; +import org.opendaylight.mdsal.binding.dom.adapter.ConstantAdapterContext; +import org.opendaylight.mdsal.binding.testutils.DataBrokerTestModule; import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService; import org.opendaylight.mdsal.eos.binding.dom.adapter.BindingDOMEntityOwnershipServiceAdapter; import org.opendaylight.mdsal.eos.dom.simple.SimpleDOMEntityOwnershipService; @@ -71,24 +68,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev16041 public class InterfaceManagerTestModule extends AbstractGuiceJsr250Module { @Override - protected void configureBindings() throws Exception { + protected void configureBindings() { // Bindings for services from this project // Bindings for external services to "real" implementations // Bindings to test infra (fakes & mocks) - AbstractBaseDataBrokerTest test = new AbstractBaseDataBrokerTest() { - @Override - protected AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer() { - return new AbstractDataBrokerTestCustomizer() { - @Override - public ListeningExecutorService getCommitCoordinatorExecutor() { - return MoreExecutors.listeningDecorator(Executors.newCachedThreadPool()); - } - }; - } - }; - test.setup(); - DataBroker dataBroker = test.getDataBroker(); + DataBrokerTestModule dataBrokerTestModule = new DataBrokerTestModule(false); + DataBroker dataBroker = dataBrokerTestModule.getDataBroker(); bind(DataBroker.class).toInstance(dataBroker); bind(DataTreeEventCallbackRegistrar.class).toInstance(mock(DataTreeEventCallbackRegistrar.class)); bind(ManagedNewTransactionRunner.class).toInstance(mock(ManagedNewTransactionRunner.class)); @@ -108,7 +94,7 @@ public class InterfaceManagerTestModule extends AbstractGuiceJsr250Module { bind(ServiceRecoveryRegistry.class).toInstance(mock(ServiceRecoveryRegistry.class)); EntityOwnershipService entityOwnershipService = new BindingDOMEntityOwnershipServiceAdapter( new SimpleDOMEntityOwnershipService(), - test.getDataBrokerTestCustomizer().getAdapterContext()); + new ConstantAdapterContext(dataBrokerTestModule.getBindingToNormalizedNodeCodec())); bind(EntityOwnershipService.class).toInstance(entityOwnershipService); bind(EntityOwnershipUtils.class); bind(AlivenessMonitorService.class).toInstance(mock(AlivenessMonitorService.class)); diff --git a/interfacemanager/pom.xml b/interfacemanager/pom.xml index f91346055..88838b52d 100644 --- a/interfacemanager/pom.xml +++ b/interfacemanager/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/ipv6util/pom.xml b/ipv6util/pom.xml index 45aa77403..461aa683d 100644 --- a/ipv6util/pom.xml +++ b/ipv6util/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/ItmTestModule.java b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/ItmTestModule.java index a9c646941..0f1ba8936 100644 --- a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/ItmTestModule.java +++ b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/ItmTestModule.java @@ -9,9 +9,6 @@ package org.opendaylight.genius.itm.tests; import static org.mockito.Mockito.mock; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; -import java.util.concurrent.Executors; import org.opendaylight.daexim.DataImportBootReady; import org.opendaylight.genius.cloudscaler.api.TombstonedNodeManager; import org.opendaylight.genius.cloudscaler.rpcservice.TombstonedNodeManagerImpl; @@ -42,8 +39,8 @@ import org.opendaylight.genius.utils.clustering.EntityOwnershipUtils; import org.opendaylight.infrautils.diagstatus.DiagStatusService; import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module; import org.opendaylight.mdsal.binding.api.DataBroker; -import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractBaseDataBrokerTest; -import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTestCustomizer; +import org.opendaylight.mdsal.binding.dom.adapter.ConstantAdapterContext; +import org.opendaylight.mdsal.binding.testutils.DataBrokerTestModule; import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService; import org.opendaylight.mdsal.eos.binding.dom.adapter.BindingDOMEntityOwnershipServiceAdapter; import org.opendaylight.mdsal.eos.dom.simple.SimpleDOMEntityOwnershipService; @@ -66,23 +63,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev16041 public class ItmTestModule extends AbstractGuiceJsr250Module { @Override - protected void configureBindings() throws Exception { + protected void configureBindings() { // Bindings for services from this project - /*AbstractBaseDataBrokerTest test = new AbstractBaseDataBrokerTest() { - @Override - protected AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer() { - return new AbstractDataBrokerTestCustomizer() { - @Override - public ListeningExecutorService getCommitCoordinatorExecutor() { - return MoreExecutors.listeningDecorator(Executors.newCachedThreadPool()); - } - }; - } - }; - test.setup(); - DataBroker dataBroker = test.getDataBroker(); - bind(DataBroker.class).toInstance(dataBroker);*/ - bind(ItmRpcService.class).to(ItmManagerRpcService.class); bind(ItmProvider.class); ItmConfig itmConfigObj = new ItmConfigBuilder() @@ -107,34 +89,8 @@ public class ItmTestModule extends AbstractGuiceJsr250Module { bind(IdManagerService.class).to(IdManager.class); bind(LockManagerService.class).to(LockManagerServiceImpl.class); bind(JobCoordinatorEventsWaiter.class).to(TestableJobCoordinatorEventsWaiter.class); - - AbstractBaseDataBrokerTest test = new AbstractBaseDataBrokerTest() { - @Override - protected AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer() { - return new AbstractDataBrokerTestCustomizer() { - @Override - public ListeningExecutorService getCommitCoordinatorExecutor() { - return MoreExecutors.listeningDecorator(Executors.newCachedThreadPool()); - } - }; - } - }; - test.setup(); - DataBroker dataBroker = test.getDataBroker(); - - /*AbstractBaseDataBrokerTest test = new AbstractBaseDataBrokerTest() { - protected AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer() { - return new ConcurrentDataBrokerTestCustomizer(false); - } - }; - test.setup(); - DataBroker dataBroker = test.getDataBroker();*/ - - /*DataBrokerTestModule dataBrokerTestModule = new DataBrokerTestModule(false); - DataBroker dataBroker = dataBrokerTestModule.getDataBroker();*/ - - /*DataBrokerTestWiring dataBrokerTestWiring = new DataBrokerTestWiring(); - DataBroker dataBroker = DataBrokerTestWiring.dataBroker();*/ + DataBrokerTestModule dataBrokerTestModule = new DataBrokerTestModule(false); + DataBroker dataBroker = dataBrokerTestModule.getDataBroker(); bind(DataBroker.class).toInstance(dataBroker); DataTreeEventCallbackRegistrar dataTreeEventCallbackRegistrar = @@ -146,7 +102,8 @@ public class ItmTestModule extends AbstractGuiceJsr250Module { bind(ServiceRecoveryRegistry.class).toInstance(mock(ServiceRecoveryRegistry.class)); bind(ItmDiagStatusProvider.class).toInstance(mock(ItmDiagStatusProvider.class)); EntityOwnershipService entityOwnershipService = new BindingDOMEntityOwnershipServiceAdapter( - new SimpleDOMEntityOwnershipService(), test.getDataBrokerTestCustomizer().getAdapterContext()); + new SimpleDOMEntityOwnershipService(), + new ConstantAdapterContext(dataBrokerTestModule.getBindingToNormalizedNodeCodec())); bind(EntityOwnershipService.class).toInstance(entityOwnershipService); bind(EntityOwnershipUtils.class); bind(TombstonedNodeManager.class).to(TombstonedNodeManagerImpl.class); diff --git a/itm/pom.xml b/itm/pom.xml index 448ae00d7..bed1668be 100644 --- a/itm/pom.xml +++ b/itm/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/karaf/pom.xml b/karaf/pom.xml index fe7b6e59c..e5aee5368 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent karaf4-parent - 7.0.1 + 7.0.2 diff --git a/lockmanager/pom.xml b/lockmanager/pom.xml index e413489bd..060e31c97 100644 --- a/lockmanager/pom.xml +++ b/lockmanager/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/mdsalutil/mdsalutil-api/pom.xml b/mdsalutil/mdsalutil-api/pom.xml index 517173d44..47f46fb30 100644 --- a/mdsalutil/mdsalutil-api/pom.xml +++ b/mdsalutil/mdsalutil-api/pom.xml @@ -166,13 +166,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-binding-test-utils - test - - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test - test-jar diff --git a/mdsalutil/mdsalutil-impl/pom.xml b/mdsalutil/mdsalutil-impl/pom.xml index 240130c5d..642885c84 100644 --- a/mdsalutil/mdsalutil-impl/pom.xml +++ b/mdsalutil/mdsalutil-impl/pom.xml @@ -87,18 +87,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-binding-test-utils - test - - - org.opendaylight.mdsal - mdsal-binding-dom-adapter - test - test-jar org.opendaylight.controller sal-test-model - test ${project.groupId} diff --git a/mdsalutil/mdsalutil-testutils/pom.xml b/mdsalutil/mdsalutil-testutils/pom.xml index 98d9e1f88..fa950a00d 100644 --- a/mdsalutil/mdsalutil-testutils/pom.xml +++ b/mdsalutil/mdsalutil-testutils/pom.xml @@ -72,13 +72,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal - mdsal-binding-test-utils - test + mdsal-binding-dom-adapter + test-jar + compile org.opendaylight.mdsal - mdsal-binding-dom-adapter - test-jar + mdsal-binding-test-utils compile diff --git a/mdsalutil/mdsalutil-testutils/src/main/java/org/opendaylight/genius/datastoreutils/testutils/DataBrokerFailuresModule.java b/mdsalutil/mdsalutil-testutils/src/main/java/org/opendaylight/genius/datastoreutils/testutils/DataBrokerFailuresModule.java index 13443adb0..b80dfde07 100644 --- a/mdsalutil/mdsalutil-testutils/src/main/java/org/opendaylight/genius/datastoreutils/testutils/DataBrokerFailuresModule.java +++ b/mdsalutil/mdsalutil-testutils/src/main/java/org/opendaylight/genius/datastoreutils/testutils/DataBrokerFailuresModule.java @@ -7,13 +7,9 @@ */ package org.opendaylight.genius.datastoreutils.testutils; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; import com.google.inject.AbstractModule; -import java.util.concurrent.Executors; import org.opendaylight.mdsal.binding.api.DataBroker; -import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractBaseDataBrokerTest; -import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTestCustomizer; +import org.opendaylight.mdsal.binding.testutils.DataBrokerTestModule; /** * Guice Module which correctly binds the {@link DataBrokerFailures}. @@ -22,26 +18,14 @@ import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTestCus */ public class DataBrokerFailuresModule extends AbstractModule { - private DataBroker realDataBroker; + private final DataBroker realDataBroker; public DataBrokerFailuresModule(DataBroker realDataBroker) { this.realDataBroker = realDataBroker; } public DataBrokerFailuresModule() throws Exception { - AbstractBaseDataBrokerTest dataBrokerTest = new AbstractBaseDataBrokerTest() { - @Override - protected AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer() { - return new AbstractDataBrokerTestCustomizer() { - @Override - public ListeningExecutorService getCommitCoordinatorExecutor() { - return MoreExecutors.listeningDecorator(Executors.newCachedThreadPool()); - } - }; - } - }; - dataBrokerTest.setup(); - this.realDataBroker = dataBrokerTest.getDataBroker(); + this(DataBrokerTestModule.dataBroker()); } @Override diff --git a/mdsalutil/mdsalutil-testutils/src/test/java/org/opendaylight/genius/infra/tests/ManagedNewTransactionRunnerImplTest.java b/mdsalutil/mdsalutil-testutils/src/test/java/org/opendaylight/genius/infra/tests/ManagedNewTransactionRunnerImplTest.java index 0757669af..66787432e 100644 --- a/mdsalutil/mdsalutil-testutils/src/test/java/org/opendaylight/genius/infra/tests/ManagedNewTransactionRunnerImplTest.java +++ b/mdsalutil/mdsalutil-testutils/src/test/java/org/opendaylight/genius/infra/tests/ManagedNewTransactionRunnerImplTest.java @@ -17,11 +17,8 @@ import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUti import static org.opendaylight.genius.infra.Datastore.OPERATIONAL; import static org.opendaylight.infrautils.testutils.Asserts.assertThrows; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; import java.io.IOException; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Executors; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; @@ -34,8 +31,7 @@ import org.opendaylight.infrautils.testutils.LogCaptureRule; import org.opendaylight.infrautils.testutils.LogRule; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.WriteTransaction; -import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractBaseDataBrokerTest; -import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTestCustomizer; +import org.opendaylight.mdsal.binding.testutils.DataBrokerTestModule; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.common.api.OptimisticLockFailedException; import org.opendaylight.mdsal.common.api.TransactionCommitFailedException; @@ -67,20 +63,8 @@ public class ManagedNewTransactionRunnerImplTest { } @Before - public void beforeTest() throws Exception { - AbstractBaseDataBrokerTest test = new AbstractBaseDataBrokerTest() { - @Override - protected AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer() { - return new AbstractDataBrokerTestCustomizer() { - @Override - public ListeningExecutorService getCommitCoordinatorExecutor() { - return MoreExecutors.listeningDecorator(Executors.newCachedThreadPool()); - } - }; - } - }; - test.setup(); - testableDataBroker = new DataBrokerFailuresImpl(test.getDataBroker()); + public void beforeTest() { + testableDataBroker = new DataBrokerFailuresImpl(new DataBrokerTestModule(true).getDataBroker()); managedNewTransactionRunner = createManagedNewTransactionRunnerToTest(testableDataBroker); singleTransactionDataBroker = new SingleTransactionDataBroker(testableDataBroker); } diff --git a/mdsalutil/pom.xml b/mdsalutil/pom.xml index 3f97b1cac..d6a44a302 100644 --- a/mdsalutil/pom.xml +++ b/mdsalutil/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/networkutils/networkutils/src/test/java/org/opendaylight/genius/networkutils/test/NetworkUtilTestModule.java b/networkutils/networkutils/src/test/java/org/opendaylight/genius/networkutils/test/NetworkUtilTestModule.java index 47de56a24..c3ed6194b 100644 --- a/networkutils/networkutils/src/test/java/org/opendaylight/genius/networkutils/test/NetworkUtilTestModule.java +++ b/networkutils/networkutils/src/test/java/org/opendaylight/genius/networkutils/test/NetworkUtilTestModule.java @@ -9,9 +9,6 @@ package org.opendaylight.genius.networkutils.test; import static org.mockito.Mockito.mock; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; -import java.util.concurrent.Executors; import org.opendaylight.daexim.DataImportBootReady; import org.opendaylight.genius.idmanager.IdManager; import org.opendaylight.genius.lockmanager.impl.LockManagerServiceImpl; @@ -21,8 +18,7 @@ import org.opendaylight.genius.networkutils.impl.RDUtilsImpl; import org.opendaylight.genius.networkutils.impl.VniUtilsImpl; import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module; import org.opendaylight.mdsal.binding.api.DataBroker; -import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractBaseDataBrokerTest; -import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTestCustomizer; +import org.opendaylight.mdsal.binding.testutils.DataBrokerTestModule; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.LockManagerService; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.networkutils.config.rev181129.NetworkConfig; @@ -31,19 +27,8 @@ public class NetworkUtilTestModule extends AbstractGuiceJsr250Module { @Override protected void configureBindings() throws Exception { - AbstractBaseDataBrokerTest test = new AbstractBaseDataBrokerTest() { - @Override - protected AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer() { - return new AbstractDataBrokerTestCustomizer() { - @Override - public ListeningExecutorService getCommitCoordinatorExecutor() { - return MoreExecutors.listeningDecorator(Executors.newCachedThreadPool()); - } - }; - } - }; - test.setup(); - DataBroker dataBroker = test.getDataBroker(); + DataBrokerTestModule dataBrokerTestModule = new DataBrokerTestModule(false); + DataBroker dataBroker = dataBrokerTestModule.getDataBroker(); bind(DataBroker.class).toInstance(dataBroker); bind(NetworkConfig.class).toInstance(mock(NetworkConfig.class)); bind(IdManagerService.class).to(IdManager.class); diff --git a/networkutils/pom.xml b/networkutils/pom.xml index dab3ef212..1888f135f 100644 --- a/networkutils/pom.xml +++ b/networkutils/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2 diff --git a/pom.xml b/pom.xml index ffc953aa0..25d4be0ed 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> org.opendaylight.odlparent odlparent-lite - 7.0.1 + 7.0.2