/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2013, 2017 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import java.util.concurrent.ThreadPoolExecutor;
import javax.management.InstanceAlreadyExistsException;
import javax.management.InstanceNotFoundException;
+import javax.management.IntrospectionException;
import javax.management.MBeanException;
import javax.management.ObjectName;
import javax.management.ReflectionException;
* dependencies.
*/
public class SimpleConfigurationTest extends AbstractConfigTest {
- private static final int numberOfThreads = 5;
- private final int numberOfThreads2 = 10;
- private static final String fixed1 = "fixed1";
- private static final List<ObjectName> emptyONs = Collections
- .<ObjectName> emptyList();
- private static final ObjectName platformFixed1ON = ObjectNameUtil
- .createReadOnlyModuleON(TestingFixedThreadPoolModuleFactory.NAME, fixed1);
- private static final List<ObjectName> fixed1List = Arrays
- .asList(platformFixed1ON);
+ private static final int NUMBER_OF_THREADS = 5;
+ private static final int NUMBER_OF_THREADS2 = 10;
+ private static final String FIXED1 = "fixed1";
+ private static final List<ObjectName> EMPTYO_NS = Collections.<ObjectName>emptyList();
+ private static final ObjectName PLATFORM_FIXED1ON = ObjectNameUtil
+ .createReadOnlyModuleON(TestingFixedThreadPoolModuleFactory.NAME, FIXED1);
+ private static final List<ObjectName> FIXED1_LIST = Arrays.asList(PLATFORM_FIXED1ON);
@Before
public void setUp() {
- super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(mockedContext,
- new TestingFixedThreadPoolModuleFactory()));
+ super.initConfigTransactionManagerImpl(
+ new HardcodedModuleFactoriesResolver(mockedContext, new TestingFixedThreadPoolModuleFactory()));
}
@After
}
private ObjectName firstCommit() throws Exception {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
+ ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
ObjectName fixed1names = createFixedThreadPool(transaction);
assertEquals(1, configRegistryClient.getOpenConfigs().size());
CommitStatus commitStatus = transaction.commit();
assertEquals(0, configRegistryClient.getOpenConfigs().size());
- CommitStatus expected = new CommitStatus(Arrays.asList(ObjectNameUtil
- .withoutTransactionName(fixed1names)), emptyONs, emptyONs);
+ CommitStatus expected = new CommitStatus(Arrays.asList(ObjectNameUtil.withoutTransactionName(fixed1names)),
+ EMPTYO_NS, EMPTYO_NS);
assertEquals(expected, commitStatus);
- assertEquals(1, TestingFixedThreadPool.allExecutors.size());
- assertFalse(TestingFixedThreadPool.allExecutors.get(0).isShutdown());
+ assertEquals(1, TestingFixedThreadPool.ALL_EXECUTORS.size());
+ assertFalse(TestingFixedThreadPool.ALL_EXECUTORS.get(0).isShutdown());
return fixed1names;
}
- static ObjectName createFixedThreadPool(
- final ConfigTransactionJMXClient transaction)
+ static ObjectName createFixedThreadPool(final ConfigTransactionJMXClient transaction)
throws InstanceAlreadyExistsException, InstanceNotFoundException {
transaction.assertVersion(0, 1);
- ObjectName fixed1names = transaction.createModule(
- TestingFixedThreadPoolModuleFactory.NAME, fixed1);
- TestingFixedThreadPoolConfigMXBean fixedConfigProxy = transaction
- .newMXBeanProxy(fixed1names, TestingFixedThreadPoolConfigMXBean.class);
- fixedConfigProxy.setThreadCount(numberOfThreads);
+ ObjectName fixed1names = transaction.createModule(TestingFixedThreadPoolModuleFactory.NAME, FIXED1);
+ TestingFixedThreadPoolConfigMXBean fixedConfigProxy = transaction.newMXBeanProxy(fixed1names,
+ TestingFixedThreadPoolConfigMXBean.class);
+ fixedConfigProxy.setThreadCount(NUMBER_OF_THREADS);
- ObjectName retrievedNames = transaction.lookupConfigBean(
- TestingFixedThreadPoolModuleFactory.NAME, fixed1);
+ ObjectName retrievedNames = transaction.lookupConfigBean(TestingFixedThreadPoolModuleFactory.NAME, FIXED1);
assertEquals(fixed1names, retrievedNames);
return fixed1names;
}
@Test
public void testCreateAndDestroyBeanInSameTransaction() throws Exception {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
+ ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
ObjectName fixed1names = createFixedThreadPool(transaction);
transaction.destroyModule(fixed1names);
CommitStatus commitStatus = transaction.commit();
@Test
public void testValidationUsingJMXClient() throws Exception {
- ConfigTransactionClient transaction = configRegistryClient
- .createTransaction();
+ ConfigTransactionClient transaction = configRegistryClient.createTransaction();
testValidation(transaction);
}
-
- private static void testValidation(final ConfigTransactionClient transaction)
- throws InstanceAlreadyExistsException, ReflectionException,
- InstanceNotFoundException, MBeanException, ConflictingVersionException {
- ObjectName fixed1names = transaction.createModule(
- TestingFixedThreadPoolModuleFactory.NAME, fixed1);
+ private static void testValidation(final ConfigTransactionClient transaction) throws InstanceAlreadyExistsException,
+ ReflectionException, InstanceNotFoundException, MBeanException, ConflictingVersionException {
+ ObjectName fixed1names = transaction.createModule(TestingFixedThreadPoolModuleFactory.NAME, FIXED1);
// call validate on config bean
try {
- platformMBeanServer.invoke(fixed1names, "validate", new Object[0],
- new String[0]);
+ platformMBeanServer.invoke(fixed1names, "validate", new Object[0], new String[0]);
fail();
} catch (final MBeanException e) {
Exception targetException = e.getTargetException();
transaction.validateBean(fixed1names);
fail();
} catch (final ValidationException e) {
- for (Map.Entry<String, Map<String, ExceptionMessageWithStackTrace>> exception : e
- .getFailedValidations().entrySet()) {
- for (Map.Entry<String, ExceptionMessageWithStackTrace> entry : exception
- .getValue().entrySet()) {
- assertEquals(
- "Parameter 'threadCount' must be greater than 0",
- entry.getValue().getMessage());
+ for (Map.Entry<String, Map<String, ExceptionMessageWithStackTrace>> exception : e.getFailedValidations()
+ .entrySet()) {
+ for (Map.Entry<String, ExceptionMessageWithStackTrace> entry : exception.getValue().entrySet()) {
+ assertEquals("Parameter 'threadCount' must be greater than 0", entry.getValue().getMessage());
}
}
}
transaction.validateConfig();
fail();
} catch (final ValidationException e) {
- for (Map.Entry<String, Map<String, ExceptionMessageWithStackTrace>> exception : e
- .getFailedValidations().entrySet()) {
- for (Map.Entry<String, ExceptionMessageWithStackTrace> entry : exception
- .getValue().entrySet()) {
- assertEquals(
- "Parameter 'threadCount' must be greater than 0",
- entry.getValue().getMessage());
+ for (Map.Entry<String, Map<String, ExceptionMessageWithStackTrace>> exception : e.getFailedValidations()
+ .entrySet()) {
+ for (Map.Entry<String, ExceptionMessageWithStackTrace> entry : exception.getValue().entrySet()) {
+ assertEquals("Parameter 'threadCount' must be greater than 0", entry.getValue().getMessage());
}
}
}
try {
transaction.commit();
} catch (final ValidationException e) {
- for (Map.Entry<String, Map<String, ExceptionMessageWithStackTrace>> exception : e
- .getFailedValidations().entrySet()) {
- for (Map.Entry<String, ExceptionMessageWithStackTrace> entry : exception
- .getValue().entrySet()) {
- assertEquals(
- "Parameter 'threadCount' must be greater than 0",
- entry.getValue().getMessage());
+ for (Map.Entry<String, Map<String, ExceptionMessageWithStackTrace>> exception : e.getFailedValidations()
+ .entrySet()) {
+ for (Map.Entry<String, ExceptionMessageWithStackTrace> entry : exception.getValue().entrySet()) {
+ assertEquals("Parameter 'threadCount' must be greater than 0", entry.getValue().getMessage());
}
}
}
@Test
public void test_createThreadPool_changeNumberOfThreads() throws Exception {
firstCommit();
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
+ ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
TestingFixedThreadPoolConfigMXBean fixedConfigProxy = startReconfiguringFixed1ThreadPool(transaction);
- assertEquals(numberOfThreads, fixedConfigProxy.getThreadCount());
- fixedConfigProxy.setThreadCount(numberOfThreads2);
+ assertEquals(NUMBER_OF_THREADS, fixedConfigProxy.getThreadCount());
+ fixedConfigProxy.setThreadCount(NUMBER_OF_THREADS2);
CommitStatus commitStatus = transaction.commit();
- checkThreadPools(1, numberOfThreads2);
- CommitStatus expected = new CommitStatus(emptyONs, fixed1List, emptyONs);
+ checkThreadPools(1, NUMBER_OF_THREADS2);
+ CommitStatus expected = new CommitStatus(EMPTYO_NS, FIXED1_LIST, EMPTYO_NS);
assertEquals(expected, commitStatus);
}
// 2, check that configuration was copied to platform
ObjectName on = ObjectNameUtil.withoutTransactionName(fixed1name);
platformMBeanServer.getMBeanInfo(on);
- assertEquals(numberOfThreads, platformMBeanServer.getAttribute(on, "ThreadCount"));
+ assertEquals(NUMBER_OF_THREADS, platformMBeanServer.getAttribute(on, "ThreadCount"));
// 3, shutdown fixed1 in new transaction
- assertFalse(TestingFixedThreadPool.allExecutors.get(0).isShutdown());
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
+ assertFalse(TestingFixedThreadPool.ALL_EXECUTORS.get(0).isShutdown());
+ ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
// check versions
transaction.assertVersion(1, 2);
// test that it was copied to new transaction
- ObjectName retrievedName = transaction.lookupConfigBean(
- TestingFixedThreadPoolModuleFactory.NAME, fixed1);
+ ObjectName retrievedName = transaction.lookupConfigBean(TestingFixedThreadPoolModuleFactory.NAME, FIXED1);
assertNotNull(retrievedName);
// check that number of threads was copied from dynamic
- TestingFixedThreadPoolConfigMXBean fixedConfigProxy = transaction
- .newMXBeanProxy(retrievedName, TestingFixedThreadPoolConfigMXBean.class);
- assertEquals(numberOfThreads, fixedConfigProxy.getThreadCount());
+ TestingFixedThreadPoolConfigMXBean fixedConfigProxy = transaction.newMXBeanProxy(retrievedName,
+ TestingFixedThreadPoolConfigMXBean.class);
+ assertEquals(NUMBER_OF_THREADS, fixedConfigProxy.getThreadCount());
// destroy
- transaction.destroyModule(ObjectNameUtil.createTransactionModuleON(
- transaction.getTransactionName(),
- TestingFixedThreadPoolModuleFactory.NAME, fixed1));
+ transaction.destroyModule(ObjectNameUtil.createTransactionModuleON(transaction.getTransactionName(),
+ TestingFixedThreadPoolModuleFactory.NAME, FIXED1));
transaction.commit();
// 4, check
assertEquals(2, configRegistryClient.getVersion());
- assertEquals(0, TestingFixedThreadPool.allExecutors.size());
+ assertEquals(0, TestingFixedThreadPool.ALL_EXECUTORS.size());
// dynamic config should be removed from platform
try {
platformMBeanServer.getMBeanInfo(on);
fail();
- } catch (final Exception e) {
+ } catch (final ReflectionException | InstanceNotFoundException | IntrospectionException e) {
assertTrue(e instanceof InstanceNotFoundException);
}
}
// 1, start transaction, create new fixed thread pool
firstCommit();
// destroy and recreate with different # of threads
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
-
- transaction.destroyModule(ObjectNameUtil.createTransactionModuleON(
- transaction.getTransactionName(),
- TestingFixedThreadPoolModuleFactory.NAME, fixed1));
-
- ObjectName fixed1name = transaction.createModule(
- TestingFixedThreadPoolModuleFactory.NAME, fixed1);
- TestingFixedThreadPoolConfigMXBean fixedConfigProxy = transaction
- .newMXBeanProxy(fixed1name, TestingFixedThreadPoolConfigMXBean.class);
- fixedConfigProxy.setThreadCount(numberOfThreads2);
+ ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
+
+ transaction.destroyModule(ObjectNameUtil.createTransactionModuleON(transaction.getTransactionName(),
+ TestingFixedThreadPoolModuleFactory.NAME, FIXED1));
+
+ ObjectName fixed1name = transaction.createModule(TestingFixedThreadPoolModuleFactory.NAME, FIXED1);
+ TestingFixedThreadPoolConfigMXBean fixedConfigProxy = transaction.newMXBeanProxy(fixed1name,
+ TestingFixedThreadPoolConfigMXBean.class);
+ fixedConfigProxy.setThreadCount(NUMBER_OF_THREADS2);
// commit
transaction.commit();
// check that first threadpool is closed
- checkThreadPools(1, numberOfThreads2);
+ checkThreadPools(1, NUMBER_OF_THREADS2);
}
private static void checkThreadPools(final int expectedTotalNumberOfExecutors,
final int expectedNumberOfThreadsInLastExecutor) {
- assertEquals(expectedTotalNumberOfExecutors,
- TestingFixedThreadPool.allExecutors.size());
+ assertEquals(expectedTotalNumberOfExecutors, TestingFixedThreadPool.ALL_EXECUTORS.size());
for (int i = 0; i < expectedTotalNumberOfExecutors - 1; i++) {
- assertTrue(TestingFixedThreadPool.allExecutors.get(i).isShutdown());
+ assertTrue(TestingFixedThreadPool.ALL_EXECUTORS.get(i).isShutdown());
}
- ThreadPoolExecutor lastExecutor = TestingFixedThreadPool.allExecutors
- .get(expectedTotalNumberOfExecutors - 1);
+ ThreadPoolExecutor lastExecutor = TestingFixedThreadPool.ALL_EXECUTORS.get(expectedTotalNumberOfExecutors - 1);
assertFalse(lastExecutor.isShutdown());
- assertEquals(expectedNumberOfThreadsInLastExecutor,
- lastExecutor.getMaximumPoolSize());
+ assertEquals(expectedNumberOfThreadsInLastExecutor, lastExecutor.getMaximumPoolSize());
}
@Test
// 1, start transaction, create new fixed thread pool
firstCommit();
// switch boolean to create new instance
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
+ ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
TestingFixedThreadPoolConfigMXBean fixedConfigProxy = startReconfiguringFixed1ThreadPool(transaction);
fixedConfigProxy.setTriggerNewInstanceCreation(true);
// commit
CommitStatus commitStatus = transaction.commit();
// check that new threadpool is created and old one is closed
- checkThreadPools(1, numberOfThreads);
- CommitStatus expected = new CommitStatus(emptyONs, emptyONs, fixed1List);
+ checkThreadPools(1, NUMBER_OF_THREADS);
+ CommitStatus expected = new CommitStatus(EMPTYO_NS, EMPTYO_NS, FIXED1_LIST);
assertEquals(expected, commitStatus);
}
// return MBeanProxy for 'fixed1' and current transaction
private static TestingFixedThreadPoolConfigMXBean startReconfiguringFixed1ThreadPool(
final ConfigTransactionJMXClient transaction) throws InstanceNotFoundException {
- ObjectName fixed1name = transaction.lookupConfigBean(
- TestingFixedThreadPoolModuleFactory.NAME, fixed1);
+ ObjectName fixed1name = transaction.lookupConfigBean(TestingFixedThreadPoolModuleFactory.NAME, FIXED1);
- TestingFixedThreadPoolConfigMXBean fixedConfigProxy = transaction
- .newMXBeanProxy(fixed1name, TestingFixedThreadPoolConfigMXBean.class);
+ TestingFixedThreadPoolConfigMXBean fixedConfigProxy = transaction.newMXBeanProxy(fixed1name,
+ TestingFixedThreadPoolConfigMXBean.class);
return fixedConfigProxy;
}
@Test
public void testAbort() throws Exception {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
+ ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
assertEquals(1, configRegistryClient.getOpenConfigs().size());
transaction.abortConfig();
try {
platformMBeanServer.getMBeanInfo(transaction.getObjectName());
fail();
- }catch(final InstanceNotFoundException e){
- assertEquals("org.opendaylight.controller:TransactionName=ConfigTransaction-0-1,type=ConfigTransaction", e.getMessage());
+ } catch (final InstanceNotFoundException e) {
+ assertEquals("org.opendaylight.controller:TransactionName=ConfigTransaction-0-1,type=ConfigTransaction",
+ e.getMessage());
}
}
@Test
public void testOptimisticLock_ConfigTransactionClient() throws Exception {
- ConfigTransactionJMXClient transaction1 = configRegistryClient
- .createTransaction();
- ConfigTransactionJMXClient transaction2 = configRegistryClient
- .createTransaction();
+ ConfigTransactionJMXClient transaction1 = configRegistryClient.createTransaction();
+ ConfigTransactionJMXClient transaction2 = configRegistryClient.createTransaction();
transaction2.assertVersion(0, 2);
transaction2.commit();
try {
transaction1.commit();
fail();
} catch (final ConflictingVersionException e) {
- assertEquals(
- "Optimistic lock failed. Expected parent version 2, was 0",
- e.getMessage());
+ assertEquals("Optimistic lock failed. Expected parent version 2, was 0", e.getMessage());
}
}
@Test
public void testOptimisticLock_ConfigRegistry() throws Exception {
- ConfigTransactionJMXClient transaction1 = configRegistryClient
- .createTransaction();
- ConfigTransactionJMXClient transaction2 = configRegistryClient
- .createTransaction();
+ ConfigTransactionJMXClient transaction1 = configRegistryClient.createTransaction();
+ ConfigTransactionJMXClient transaction2 = configRegistryClient.createTransaction();
transaction2.assertVersion(0, 2);
transaction2.commit();
try {
configRegistryClient.commitConfig(transaction1.getObjectName());
fail();
} catch (final ConflictingVersionException e) {
- assertEquals(
- "Optimistic lock failed. Expected parent version 2, was 0",
- e.getMessage());
+ assertEquals("Optimistic lock failed. Expected parent version 2, was 0", e.getMessage());
}
}
-
@Test
public void testQNames() {
Set<String> availableModuleFactoryQNames = configRegistryClient.getAvailableModuleFactoryQNames();
assertEquals(Sets.newHashSet(expected), availableModuleFactoryQNames);
}
-
}
Code Review / controller.git / blobdiff