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 <robert.varga@pantheon.tech>

diff --git a/alivenessmonitor/pom.xml b/alivenessmonitor/pom.xml
index ff83f64f9dfa84096b3743a38587caf1441ac202..7de2955b82ddaf10794571e90681872a0cab28d2 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/arputil/arputil-impl/pom.xml b/arputil/arputil-impl/pom.xml
index 499e73f409371cb096218ad9538c4b664960c3fb..15602df98941e48c4efb2d6617ea43d8b986e913 100644 (file)
--- 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
       <artifactId>javax.inject</artifactId>
     </dependency>
     <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-dom-adapter</artifactId>
-      <scope>test</scope>
-      <type>test-jar</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>testutils</artifactId>

diff --git a/arputil/pom.xml b/arputil/pom.xml
index 53aad2be56c6b3f4cc35bc1c5cd6787865464786..af58253bedde83f12ee501536aed57f158989f58 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index a33173412d98c2325c5ec78747e4a58dfb214715..acfd2b3c87d8ba8abe12d65bfdbee0911f94c5e0 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

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 70051b24e0955fa8f8830ee971434fc2692176d2..8d2e5476fc8305970af2e72087b91858da9f485d 100644 (file)
--- 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 634132b0a48bb255236d4f8a4fd0457f28a9f529..093c55a0854e7e628324cfbcd5e6f05a9037311e 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index 4f04a1e5d720934fbfe23bd0c26259d78acc173d..0ce60b4473a9cbf87244e29eadafd3cb43fd22a4 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <relativePath/>
   </parent>
 
@@ -34,7 +34,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/commons/checkstyle/pom.xml b/commons/checkstyle/pom.xml
index 06cf97fbd6be22ce52a68d465f217ed9faae602e..20093209f7c7767c144e96ffc24380efa0f1e825 100644 (file)
--- 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
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/commons/pom.xml b/commons/pom.xml
index 31b2be9492461c8c6cbe5f18e2f7408c7551660d..f999de26cd71d09443c7284cc94cc910bed8a36f 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/commons/quality-parent/pom.xml b/commons/quality-parent/pom.xml
index dbd79e05a93ff09738e076c86a620af559a6bfff..d982cd3db7f716cb3e1adf583f64b5cc69e93c10 100644 (file)
--- a/commons/quality-parent/pom.xml
+++ b/commons/quality-parent/pom.xml
@@ -29,21 +29,21 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>5.0.1</version>
+        <version>5.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/fcapsapplication/pom.xml b/fcapsapplication/pom.xml
index aac128a6f59ea3250d4fd9e53c954aa7d360e481..a83da9d21c37f5b7cb3dadd0061e6bee62cc5adb 100644 (file)
--- 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
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/fcapsmanager/pom.xml b/fcapsmanager/pom.xml
index 0f9b0ad90467fe68f398022c969501a22809bb7e..825fc0b9792d88f11eb0e95f753dd4cf5c10c8d4 100644 (file)
--- 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
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/genius-features/pom.xml b/features/genius-features/pom.xml
index 0015d6d935bff3b92f38e10a8e3e23ee4a97e337..4168529a15a4260b0238bf3db543657194018ab1 100644 (file)
--- a/features/genius-features/pom.xml
+++ b/features/genius-features/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-genius-api/pom.xml b/features/odl-genius-api/pom.xml
index 3bb5f3e47dddce9405318567ff87133b5a0c0b83..71c133cb2857d1f310e7395bba6f0eed1b5444f1 100644 (file)
--- a/features/odl-genius-api/pom.xml
+++ b/features/odl-genius-api/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 
@@ -27,7 +27,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/features/odl-genius-fcaps-application/pom.xml b/features/odl-genius-fcaps-application/pom.xml
index a0bebf668d7d48201448b01376b699e99b55d1cf..9ab36f16b0df2aecd1e1aa066eb645bdbaca0229 100644 (file)
--- a/features/odl-genius-fcaps-application/pom.xml
+++ b/features/odl-genius-fcaps-application/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-genius-fcaps-framework/pom.xml b/features/odl-genius-fcaps-framework/pom.xml
index 420ee220b1c0cd50e3388e9880729a44b18d9213..5ee16aa894a7eea4db4b6a5b90de7c8c1569be85 100644 (file)
--- a/features/odl-genius-fcaps-framework/pom.xml
+++ b/features/odl-genius-fcaps-framework/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-genius-rest/pom.xml b/features/odl-genius-rest/pom.xml
index def7b2ff2d34c471e86a12912ef1fd3e34a06855..8b09dfaabe4269dc953e322a993c034f007e9c04 100644 (file)
--- a/features/odl-genius-rest/pom.xml
+++ b/features/odl-genius-rest/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-genius/pom.xml b/features/odl-genius/pom.xml
index 00e0d3831e050e79f7df7d4dfffb4d91c54558eb..2732ecb6fc0e3509ebd8f083183e47372c494c67 100644 (file)
--- a/features/odl-genius/pom.xml
+++ b/features/odl-genius/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 24ad747da786c8bc239fc88837a9c1fa14aa8d44..9f2d87f8394fd88472bcb81c0dc1e795deeb007a 100644 (file)
--- 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
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

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 19c2dc06af850853e99826d8b83d160e71ec8d2d..207d50b2ba363de73242dd6c67f02334cb183fa3 100644 (file)
--- 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 501281096c0fb572a3d9d23a6a7fae0d18f958f6..0c3b94995419bd599bbb705711cc10a13d53a0e7 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

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 8172b81e38c2b0d321413faa6c1053c44536ac9e..bea808cbb4b43a574979456f32b7f12c591f2851 100644 (file)
--- 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 f913460553159a649ed5974ee7b71024dad8b501..88838b52d6c10978035eec807124ffc297829dc9 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/ipv6util/pom.xml b/ipv6util/pom.xml
index 45aa7740382c29fc7122563f33b366c607f3699c..461aa683df12166861a7ea8ef0768bd2a2d33ab3 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

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 a9c646941a4e5dd96f057ab1e48dbdc502612513..0f1ba8936dd5851f587b5bb8a6df4b3e496e9ece 100644 (file)
--- 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 448ae00d75c86e5c3e3438d642dbea796d564fcf..bed1668bea839d3cb4f7503556df5712a4eb4c13 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index fe7b6e59c1be5657bcad6a49ee5773b7900f6b53..e5aee5368b01478412cf663f0c8f45dd5ee3c482 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/lockmanager/pom.xml b/lockmanager/pom.xml
index e413489bdd58f9e625eba61159c398cba1da0094..060e31c97e629c270094607ee8b1ef77d311093b 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/mdsalutil/mdsalutil-api/pom.xml b/mdsalutil/mdsalutil-api/pom.xml
index 517173d44872ec30ef7ee157c8012e1d2e5e68d4..47f46fb30c0f0dcb859417bd694e2266681762fd 100644 (file)
--- 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
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-test-utils</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-dom-adapter</artifactId>
-      <scope>test</scope>
-      <type>test-jar</type>
     </dependency>
   </dependencies>
 

diff --git a/mdsalutil/mdsalutil-impl/pom.xml b/mdsalutil/mdsalutil-impl/pom.xml
index 240130c5dafd4d41f1caf7a5a28a07f83364a82d..642885c8413303f4df58a2567dd7b6aebb7fc5ff 100644 (file)
--- 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
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-test-utils</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-dom-adapter</artifactId>
-      <scope>test</scope>
-      <type>test-jar</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-test-model</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/mdsalutil/mdsalutil-testutils/pom.xml b/mdsalutil/mdsalutil-testutils/pom.xml
index 98d9e1f886dfbcce466e9b0f843590ef34105346..fa950a00d6ce9995ea67f1b4a0c8693822ffd6f3 100644 (file)
--- 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
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-test-utils</artifactId>
-      <scope>test</scope>
+      <artifactId>mdsal-binding-dom-adapter</artifactId>
+      <type>test-jar</type>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-dom-adapter</artifactId>
-      <type>test-jar</type>
+      <artifactId>mdsal-binding-test-utils</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>

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 13443adb0f13fd9e9822b812373bbd91b40c5636..b80dfde072a69c92a5cf1b21b28147785bf45492 100644 (file)
--- 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 0757669af56e7da38cab6a6cbfea667551f81829..66787432efd9d5ac483870e4b040c476a6f75358 100644 (file)
--- 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 3f97b1cac713449c1c108e65840f3250de733d49..d6a44a30231815080bcc9bc86e590a97ba59113e 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

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 47de56a24b0ef747675ed8c5592d736c39b86821..c3ed6194b421cf21bfed8ad366e7e721f678c786 100644 (file)
--- 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 dab3ef212035b21924f3541bd6fe898232a43666..1888f135f5265497fa3a47d6072b94cc7863f2da 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index ffc953aa0bb063e3d2d59a27b39a801e0eda16c8..25d4be0edb899933b4070458fc01c3f4c8a1fa66 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>