Fix tests in rib-impl-config to use 'singleton' name for global event executor.

Change-Id: Ic9609026145edd2850dd9ac7266eb43c83a97b1a
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>

diff --git a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/GlobalEventExecutorUtil.java b/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/GlobalEventExecutorUtil.java
index 245f3ffabe08e56e39ca6b56f6fe707b90825dbd..58df8bf9d67d800cf57b8f8f59b20db6f41e7a10 100644 (file)
--- a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/GlobalEventExecutorUtil.java
+++ b/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/GlobalEventExecutorUtil.java
@@ -7,24 +7,25 @@
  */
 package org.opendaylight.controller.config.yang.bgp.reconnectstrategy;
 
+import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
+import org.opendaylight.controller.config.yang.netty.eventexecutor.GlobalEventExecutorModuleFactory;
+
 import javax.management.InstanceAlreadyExistsException;
+import javax.management.InstanceNotFoundException;
 import javax.management.ObjectName;
 
-import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
-import org.opendaylight.controller.config.yang.netty.eventexecutor.GlobalEventExecutorModuleMXBean;
-
 public class GlobalEventExecutorUtil {
 
-       public static ObjectName createInstance(
-                       final ConfigTransactionJMXClient transaction,
-                       final String moduleName,
-                       final String instanceName)
+       public static ObjectName createOrGetInstance(
+            final ConfigTransactionJMXClient transaction)
                        throws InstanceAlreadyExistsException {
-               ObjectName nameCreated = transaction.createModule(
-                               moduleName, instanceName);
-               transaction.newMBeanProxy(nameCreated,
-                               GlobalEventExecutorModuleMXBean.class);
-               return nameCreated;
+        ObjectName on;
+        try {
+            on =  transaction.lookupConfigBean(GlobalEventExecutorModuleFactory.NAME, GlobalEventExecutorModuleFactory.SINGLETON_NAME);
+        } catch (InstanceNotFoundException e) {
+            on = transaction.createModule(GlobalEventExecutorModuleFactory.NAME, GlobalEventExecutorModuleFactory.SINGLETON_NAME);
+        }
+               return on;
        }
 
 }

diff --git a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/NeverReconnectStrategyModuleTest.java b/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/NeverReconnectStrategyModuleTest.java
index a95633ae4df1865adeb860cd18b65162aa490737..ce7abea9c6de88414863a5bfc02d80408386f91d 100644 (file)
--- a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/NeverReconnectStrategyModuleTest.java
+++ b/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/NeverReconnectStrategyModuleTest.java
@@ -7,13 +7,6 @@
  */
 package org.opendaylight.controller.config.yang.bgp.reconnectstrategy;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.ObjectName;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.config.api.ConflictingVersionException;
@@ -27,9 +20,16 @@ import org.opendaylight.controller.config.yang.reconnectstrategy.AbstractNeverRe
 import org.opendaylight.controller.config.yang.reconnectstrategy.NeverReconnectStrategyModuleFactory;
 import org.opendaylight.controller.config.yang.reconnectstrategy.NeverReconnectStrategyModuleMXBean;
 
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.InstanceNotFoundException;
+import javax.management.ObjectName;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 public class NeverReconnectStrategyModuleTest extends AbstractConfigTest {
 
-       private final String instanceName = "never";
+       private final String instanceName = GlobalEventExecutorModuleFactory.SINGLETON_NAME;
 
        private NeverReconnectStrategyModuleFactory factory;
        
@@ -49,7 +49,7 @@ public class NeverReconnectStrategyModuleTest extends AbstractConfigTest {
                try {
                        ConfigTransactionJMXClient transaction = configRegistryClient
                                        .createTransaction();
-                       createInstance(transaction, this.factory.getImplementationName(), instanceName, null, this.executorFactory.getImplementationName());
+                       createInstance(transaction, this.factory.getImplementationName(), instanceName, null);
                        transaction.validateConfig();
                        fail();
                } catch (ValidationException e) {
@@ -63,7 +63,7 @@ public class NeverReconnectStrategyModuleTest extends AbstractConfigTest {
                try {
                        ConfigTransactionJMXClient transaction = configRegistryClient
                                        .createTransaction();
-                       createInstance(transaction, this.factory.getImplementationName(), instanceName, -1, this.executorFactory.getImplementationName());
+                       createInstance(transaction, this.factory.getImplementationName(), instanceName, -1);
                        transaction.validateConfig();
                        fail();
                } catch (ValidationException e) {
@@ -75,7 +75,7 @@ public class NeverReconnectStrategyModuleTest extends AbstractConfigTest {
        public void testCreateBean() throws Exception {
                ConfigTransactionJMXClient transaction = configRegistryClient
                                .createTransaction();
-               createInstance(transaction, this.factory.getImplementationName(), instanceName, 500, this.executorFactory.getImplementationName());
+               createInstance(transaction, this.factory.getImplementationName(), instanceName, 500);
                transaction.validateConfig();
                CommitStatus status = transaction.commit();
                assertBeanCount(1, factory.getImplementationName());
@@ -87,7 +87,7 @@ public class NeverReconnectStrategyModuleTest extends AbstractConfigTest {
                        ConflictingVersionException, ValidationException {
                ConfigTransactionJMXClient transaction = configRegistryClient
                                .createTransaction();
-               createInstance(transaction, this.factory.getImplementationName(), instanceName, 500, this.executorFactory.getImplementationName());
+               createInstance(transaction, this.factory.getImplementationName(), instanceName, 500);
                transaction.commit();
                transaction = configRegistryClient.createTransaction();
                assertBeanCount(1, factory.getImplementationName());
@@ -102,7 +102,7 @@ public class NeverReconnectStrategyModuleTest extends AbstractConfigTest {
                        InstanceNotFoundException {
                ConfigTransactionJMXClient transaction = configRegistryClient
                                .createTransaction();
-               createInstance(transaction, this.factory.getImplementationName(), instanceName, 500, this.executorFactory.getImplementationName());
+               createInstance(transaction, this.factory.getImplementationName(), instanceName, 500);
                transaction.commit();
                transaction = configRegistryClient.createTransaction();
                assertBeanCount(1, factory.getImplementationName());
@@ -118,14 +118,13 @@ public class NeverReconnectStrategyModuleTest extends AbstractConfigTest {
 
        public static ObjectName createInstance(
                        final ConfigTransactionJMXClient transaction, final String moduleName,
-                       final String instanceName, final Integer timeout,
-                       final String eventexecutorModuleName) throws InstanceAlreadyExistsException {
+                       final String instanceName, final Integer timeout) throws InstanceAlreadyExistsException {
                ObjectName nameCreated = transaction.createModule(
                                moduleName, instanceName);
                NeverReconnectStrategyModuleMXBean mxBean = transaction.newMBeanProxy(
                                nameCreated, NeverReconnectStrategyModuleMXBean.class);
                mxBean.setTimeout(timeout);
-               mxBean.setExecutor(GlobalEventExecutorUtil.createInstance(transaction, eventexecutorModuleName, "global-event-executor1"));
+               mxBean.setExecutor(GlobalEventExecutorUtil.createOrGetInstance(transaction));
                return nameCreated;
        }
 

diff --git a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/ReconnectImmediatelyStrategyModuleTest.java b/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/ReconnectImmediatelyStrategyModuleTest.java
index bd201e85bd8b20beab67b2e3d74ca1f932ddf67e..e392e4b2c4129e6daae96e5ef26c77009f8cfad1 100644 (file)
--- a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/ReconnectImmediatelyStrategyModuleTest.java
+++ b/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/ReconnectImmediatelyStrategyModuleTest.java
@@ -7,13 +7,6 @@
  */
 package org.opendaylight.controller.config.yang.bgp.reconnectstrategy;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.ObjectName;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.config.api.ConflictingVersionException;
@@ -27,9 +20,16 @@ import org.opendaylight.controller.config.yang.reconnectstrategy.AbstractReconne
 import org.opendaylight.controller.config.yang.reconnectstrategy.ReconnectImmediatelyStrategyModuleFactory;
 import org.opendaylight.controller.config.yang.reconnectstrategy.ReconnectImmediatelyStrategyModuleMXBean;
 
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.InstanceNotFoundException;
+import javax.management.ObjectName;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 public class ReconnectImmediatelyStrategyModuleTest extends AbstractConfigTest {
 
-       private final String instanceName = "immediately";
+       private final String instanceName = GlobalEventExecutorModuleFactory.SINGLETON_NAME;
 
        private ReconnectImmediatelyStrategyModuleFactory factory;
 
@@ -49,7 +49,7 @@ public class ReconnectImmediatelyStrategyModuleTest extends AbstractConfigTest {
                try {
                        ConfigTransactionJMXClient transaction = configRegistryClient
                                        .createTransaction();
-                       createInstance(transaction, this.factory.getImplementationName(), instanceName, null, this.executorFactory.getImplementationName());
+                       createInstance(transaction, this.factory.getImplementationName(), instanceName, null);
                        transaction.validateConfig();
                        fail();
                } catch (ValidationException e) {
@@ -63,7 +63,7 @@ public class ReconnectImmediatelyStrategyModuleTest extends AbstractConfigTest {
                try {
                        ConfigTransactionJMXClient transaction = configRegistryClient
                                        .createTransaction();
-                       createInstance(transaction, this.factory.getImplementationName(), instanceName, -1, this.executorFactory.getImplementationName());
+                       createInstance(transaction, this.factory.getImplementationName(), instanceName, -1);
                        transaction.validateConfig();
                        fail();
                } catch (ValidationException e) {
@@ -75,7 +75,7 @@ public class ReconnectImmediatelyStrategyModuleTest extends AbstractConfigTest {
        public void testCreateBean() throws Exception {
                ConfigTransactionJMXClient transaction = configRegistryClient
                                .createTransaction();
-               createInstance(transaction, this.factory.getImplementationName(), instanceName, 500, this.executorFactory.getImplementationName());
+               createInstance(transaction, this.factory.getImplementationName(), instanceName, 500);
                transaction.validateConfig();
                CommitStatus status = transaction.commit();
                assertBeanCount(1, factory.getImplementationName());
@@ -87,7 +87,7 @@ public class ReconnectImmediatelyStrategyModuleTest extends AbstractConfigTest {
                        ConflictingVersionException, ValidationException {
                ConfigTransactionJMXClient transaction = configRegistryClient
                                .createTransaction();
-               createInstance(transaction, this.factory.getImplementationName(), instanceName, 100, this.executorFactory.getImplementationName());
+               createInstance(transaction, this.factory.getImplementationName(), instanceName, 100);
                transaction.commit();
                transaction = configRegistryClient.createTransaction();
                assertBeanCount(1, factory.getImplementationName());
@@ -102,7 +102,7 @@ public class ReconnectImmediatelyStrategyModuleTest extends AbstractConfigTest {
                        InstanceNotFoundException {
                ConfigTransactionJMXClient transaction = configRegistryClient
                                .createTransaction();
-               createInstance(transaction, this.factory.getImplementationName(), instanceName, 500, this.executorFactory.getImplementationName());
+               createInstance(transaction, this.factory.getImplementationName(), instanceName, 500);
                transaction.commit();
                transaction = configRegistryClient.createTransaction();
                assertBeanCount(1, factory.getImplementationName());
@@ -120,15 +120,14 @@ public class ReconnectImmediatelyStrategyModuleTest extends AbstractConfigTest {
        public static ObjectName createInstance(
                        final ConfigTransactionJMXClient transaction,
                        final String moduleName,
-                       final String instanceName, final Integer timeout,
-                       final String executorModuleName) throws InstanceAlreadyExistsException {
+                       final String instanceName, final Integer timeout) throws InstanceAlreadyExistsException {
                ObjectName nameCreated = transaction.createModule(
                                moduleName, instanceName);
                ReconnectImmediatelyStrategyModuleMXBean mxBean = transaction
                                .newMBeanProxy(nameCreated,
                                                ReconnectImmediatelyStrategyModuleMXBean.class);
                mxBean.setTimeout(timeout);
-               mxBean.setExecutor(GlobalEventExecutorUtil.createInstance(transaction, executorModuleName, "global-event-executor"));
+               mxBean.setExecutor(GlobalEventExecutorUtil.createOrGetInstance(transaction));
                return nameCreated;
        }
 

diff --git a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/TimedReconnectStrategyModuleTest.java b/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/TimedReconnectStrategyModuleTest.java
index 8174a73a44627f9c8c4594e4cbdf9a45b47e3b6a..0377155fe428425a2a6ef6168592f7674cfae53b 100644 (file)
--- a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/TimedReconnectStrategyModuleTest.java
+++ b/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/reconnectstrategy/TimedReconnectStrategyModuleTest.java
@@ -7,16 +7,6 @@
  */
 package org.opendaylight.controller.config.yang.bgp.reconnectstrategy;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.math.BigDecimal;
-
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.ObjectName;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.config.api.ConflictingVersionException;
@@ -30,11 +20,18 @@ import org.opendaylight.controller.config.yang.reconnectstrategy.AbstractTimedRe
 import org.opendaylight.controller.config.yang.reconnectstrategy.TimedReconnectStrategyModuleFactory;
 import org.opendaylight.controller.config.yang.reconnectstrategy.TimedReconnectStrategyModuleMXBean;
 
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.InstanceNotFoundException;
+import javax.management.ObjectName;
+import java.math.BigDecimal;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 public class TimedReconnectStrategyModuleTest extends AbstractConfigTest {
 
        private final String instanceName = "timed";
-       
-       private final String EXECUTOR_INSTANCE_NAME = "global-event-executor-insatnce"; 
 
        private TimedReconnectStrategyModuleFactory factory;
 
@@ -55,7 +52,7 @@ public class TimedReconnectStrategyModuleTest extends AbstractConfigTest {
                        ConfigTransactionJMXClient transaction = configRegistryClient
                                        .createTransaction();
                        createInstance(transaction, this.factory.getImplementationName(), instanceName, 500, 100L, null, 500L,
-                                       10L, 10000L, this.executorFactory.getImplementationName(), EXECUTOR_INSTANCE_NAME);
+                                       10L, 10000L);
                        transaction.validateConfig();
                        fail();
                } catch (ValidationException e) {
@@ -70,8 +67,7 @@ public class TimedReconnectStrategyModuleTest extends AbstractConfigTest {
                        ConfigTransactionJMXClient transaction = configRegistryClient
                                        .createTransaction();
                        createInstance(transaction, this.factory.getImplementationName(), instanceName, 500, 100L,
-                                       new BigDecimal(0.5), 500L, 10L, 10000L, this.executorFactory.getImplementationName(),
-                                       EXECUTOR_INSTANCE_NAME);
+                                       new BigDecimal(0.5), 500L, 10L, 10000L);
                        transaction.validateConfig();
                        fail();
                } catch (ValidationException e) {
@@ -86,8 +82,7 @@ public class TimedReconnectStrategyModuleTest extends AbstractConfigTest {
                        ConfigTransactionJMXClient transaction = configRegistryClient
                                        .createTransaction();
                        createInstance(transaction, this.factory.getImplementationName(), instanceName, null, 100L,
-                                       new BigDecimal(1.0), 500L, 10L, 10000L, this.executorFactory.getImplementationName(), 
-                                       EXECUTOR_INSTANCE_NAME);
+                                       new BigDecimal(1.0), 500L, 10L, 10000L);
                        transaction.validateConfig();
                        fail();
                } catch (ValidationException e) {
@@ -102,8 +97,7 @@ public class TimedReconnectStrategyModuleTest extends AbstractConfigTest {
                        ConfigTransactionJMXClient transaction = configRegistryClient
                                        .createTransaction();
                        createInstance(transaction, this.factory.getImplementationName(), instanceName, -1, 100L, new BigDecimal(
-                                       1.0), 500L, 10L, 10000L, this.executorFactory.getImplementationName(),
-                                       EXECUTOR_INSTANCE_NAME);
+                                       1.0), 500L, 10L, 10000L);
                        transaction.validateConfig();
                        fail();
                } catch (ValidationException e) {
@@ -118,8 +112,7 @@ public class TimedReconnectStrategyModuleTest extends AbstractConfigTest {
                        ConfigTransactionJMXClient transaction = configRegistryClient
                                        .createTransaction();
                        createInstance(transaction, this.factory.getImplementationName(), instanceName, 100, null,
-                                       new BigDecimal(1.0), 100L, 10L, 10000L, this.executorFactory.getImplementationName(),
-                                       EXECUTOR_INSTANCE_NAME);
+                                       new BigDecimal(1.0), 100L, 10L, 10000L);
                        transaction.validateConfig();
                        fail();
                } catch (ValidationException e) {
@@ -134,8 +127,7 @@ public class TimedReconnectStrategyModuleTest extends AbstractConfigTest {
                        ConfigTransactionJMXClient transaction = configRegistryClient
                                        .createTransaction();
                        createInstance(transaction, this.factory.getImplementationName(), instanceName, 100, 300L,
-                                       new BigDecimal(1.0), 100L, 10L, 10000L, this.executorFactory.getImplementationName(),
-                                       EXECUTOR_INSTANCE_NAME);
+                                       new BigDecimal(1.0), 100L, 10L, 10000L);
                        transaction.validateConfig();
                        fail();
                } catch (ValidationException e) {
@@ -149,8 +141,7 @@ public class TimedReconnectStrategyModuleTest extends AbstractConfigTest {
                ConfigTransactionJMXClient transaction = configRegistryClient
                                .createTransaction();
                createInstance(transaction, this.factory.getImplementationName(), instanceName, 500, 100L,
-                               new BigDecimal(1.0), 500L, 10L, 10000L, this.executorFactory.getImplementationName(),
-                               EXECUTOR_INSTANCE_NAME);
+                               new BigDecimal(1.0), 500L, 10L, 10000L);
                transaction.validateConfig();
                CommitStatus status = transaction.commit();
                assertBeanCount(1, factory.getImplementationName());
@@ -163,8 +154,7 @@ public class TimedReconnectStrategyModuleTest extends AbstractConfigTest {
                ConfigTransactionJMXClient transaction = configRegistryClient
                                .createTransaction();
                createInstance(transaction, this.factory.getImplementationName(), instanceName, 500, 100L,
-                               new BigDecimal(1.0), 500L, 10L, 10000L, this.executorFactory.getImplementationName(),
-                               EXECUTOR_INSTANCE_NAME);
+                               new BigDecimal(1.0), 500L, 10L, 10000L);
                transaction.commit();
                transaction = configRegistryClient.createTransaction();
                assertBeanCount(1, factory.getImplementationName());
@@ -181,7 +171,7 @@ public class TimedReconnectStrategyModuleTest extends AbstractConfigTest {
                                .createTransaction();
                createInstance(transaction, this.factory.getImplementationName(), instanceName, 500, 100L,
                                new BigDecimal(1.0), new Long(500), new Long(10), new Long(
-                                               10000), this.executorFactory.getImplementationName(),EXECUTOR_INSTANCE_NAME);
+                                               10000));
                transaction.commit();
                transaction = configRegistryClient.createTransaction();
                assertBeanCount(1, factory.getImplementationName());
@@ -203,8 +193,7 @@ public class TimedReconnectStrategyModuleTest extends AbstractConfigTest {
                        final String moduleName,
                        final String instanceName, final Integer connectTime,
                        final Long minSleep, final BigDecimal sleepFactor,
-                       final Long maxSleep, final Long maxAttempts, final Long deadline,
-                       final String executorModuleName, final String executorInstanceName) throws InstanceAlreadyExistsException {
+                       final Long maxSleep, final Long maxAttempts, final Long deadline) throws InstanceAlreadyExistsException {
                ObjectName nameCreated = transaction.createModule(
                                moduleName, instanceName);
                TimedReconnectStrategyModuleMXBean mxBean = transaction.newMBeanProxy(
@@ -215,7 +204,7 @@ public class TimedReconnectStrategyModuleTest extends AbstractConfigTest {
                mxBean.setMaxSleep(maxSleep);
                mxBean.setMinSleep(minSleep);
                mxBean.setSleepFactor(sleepFactor);
-               mxBean.setExecutor(GlobalEventExecutorUtil.createInstance(transaction, executorModuleName, executorInstanceName));
+               mxBean.setExecutor(GlobalEventExecutorUtil.createOrGetInstance(transaction));
                return nameCreated;
        }
 

diff --git a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleTest.java b/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleTest.java
index 64019ca5a586f0da3f15013fe7461032b83097d8..f780661d53360b54620f679f9a0d4001cf139113 100644 (file)
--- a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleTest.java
+++ b/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleTest.java
@@ -7,19 +7,7 @@
  */
 package org.opendaylight.controller.config.yang.bgp.rib.impl;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.Future;
-
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.ObjectName;
-
+import com.google.common.collect.Lists;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -50,23 +38,33 @@ import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
 import org.opendaylight.controller.md.sal.common.api.data.DataCommitHandler;
 import org.opendaylight.controller.sal.core.api.data.DataModificationTransaction;
 import org.opendaylight.controller.sal.core.api.data.DataProviderService;
-import org.opendaylight.yangtools.yang.model.api.SchemaServiceListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.RibId;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.SchemaServiceListener;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleListener;
 import org.osgi.framework.Filter;
 import org.osgi.framework.ServiceListener;
 import org.osgi.framework.ServiceReference;
 
-import com.google.common.collect.Lists;
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.InstanceNotFoundException;
+import javax.management.ObjectName;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Future;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
 
 public class RIBImplModuleTest extends AbstractConfigTest {
-       private static final String INSTANCE_NAME = "bgp-rib-impl";
+       private static final String INSTANCE_NAME = GlobalEventExecutorModuleFactory.SINGLETON_NAME;
        private static final String TRANSACTION_NAME = "testTransaction";
 
        private RIBImplModuleFactory factory;
@@ -202,7 +200,7 @@ public class RIBImplModuleTest extends AbstractConfigTest {
                ConfigTransactionJMXClient transaction = configRegistryClient
                                .createTransaction();
                createInstance(transaction, this.factory.getImplementationName(), INSTANCE_NAME, this.dataBrokerFactory.getImplementationName(),
-                               this.reconnectFactory.getImplementationName(), this.executorFactory.getImplementationName(), this.bgpFactory.getImplementationName(),
+                               this.reconnectFactory.getImplementationName(), this.bgpFactory.getImplementationName(),
                                this.sessionFacotry.getImplementationName(), this.dispactherFactory.getImplementationName(), this.threadgropFactory.getImplementationName(),
                                this.extensionFactory.getImplementationName(), this.ribExtensionsFactory.getImplementationName(), this.domBrokerFactory.getImplementationName(),
                                this.dataStroreFactory.getImplementationName());
@@ -210,7 +208,7 @@ public class RIBImplModuleTest extends AbstractConfigTest {
                CommitStatus status = transaction.commit();
                Thread.sleep(2000);
                assertBeanCount(1, factory.getImplementationName());
-               assertStatus(status, 16, 0, 0);
+               assertStatus(status, 15, 0, 0);
        }
 
        @After
@@ -219,20 +217,18 @@ public class RIBImplModuleTest extends AbstractConfigTest {
        }
 
        public static ObjectName createInstance(final ConfigTransactionJMXClient transaction, final String moduleName,
-                       final String instanceName, final String bindingDataModuleName, final String reconnectModueName, final String executorModuleName, final String bgpModuleName,
-                       final String sessionModuleName, final String dispatcherModuleName, final String threadgroupModuleName, final String extensionModuleName,
-                       final String ribExtensionsModuleName, final String domBrokerModuleName, final String dataStroreModuleName)
+                                            final String instanceName, final String bindingDataModuleName, final String reconnectModueName, final String bgpModuleName,
+                                            final String sessionModuleName, final String dispatcherModuleName, final String threadgroupModuleName, final String extensionModuleName,
+                                            final String ribExtensionsModuleName, final String domBrokerModuleName, final String dataStroreModuleName)
                                        throws Exception {
                ObjectName nameCreated = transaction.createModule(
                                moduleName, instanceName);
                RIBImplModuleMXBean mxBean = transaction.newMXBeanProxy(
                                nameCreated, RIBImplModuleMXBean.class);
-               ObjectName reconnectObjectName = TimedReconnectStrategyModuleTest.createInstance(transaction, reconnectModueName, "session-reconnect-strategy", 100, 1000L, new BigDecimal(1.0), 5000L, 2000L, null, executorModuleName,
-                               "global-event-executor1");
+               ObjectName reconnectObjectName = TimedReconnectStrategyModuleTest.createInstance(transaction, reconnectModueName, "session-reconnect-strategy", 100, 1000L, new BigDecimal(1.0), 5000L, 2000L, null);
                mxBean.setSessionReconnectStrategy(reconnectObjectName);
                mxBean.setDataProvider(createDataBrokerInstance(transaction, bindingDataModuleName, "data-broker-impl", domBrokerModuleName, dataStroreModuleName));
-               ObjectName reconnectStrategyON = TimedReconnectStrategyModuleTest.createInstance(transaction, reconnectModueName, "tcp-reconnect-strategy", 100, 1000L, new BigDecimal(1.0), 5000L, 2000L, null, executorModuleName,
-                               "global-event-executor2");
+               ObjectName reconnectStrategyON = TimedReconnectStrategyModuleTest.createInstance(transaction, reconnectModueName, "tcp-reconnect-strategy", 100, 1000L, new BigDecimal(1.0), 5000L, 2000L, null);
                mxBean.setTcpReconnectStrategy(reconnectStrategyON);
                mxBean.setBgp(Lists.newArrayList(BGPImplModuleTest.createInstance(transaction, bgpModuleName, "bgp-impl1", "localhost", 1, sessionModuleName, dispatcherModuleName, threadgroupModuleName, ribExtensionsModuleName, extensionModuleName)));
                mxBean.setExtensions(createRibExtensionsInstance(transaction, ribExtensionsModuleName, "rib-extensions-privider1"));