/*
- * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2015, 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,
package org.opendaylight.controller.config.it.base;
+import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.when;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
+
import com.google.common.base.Stopwatch;
import java.io.File;
import java.io.IOException;
private static final String KARAF_DISTRO_GROUPID = "org.opendaylight.odlparent";
/*
- * Property names to override defaults for karaf distro artifactId, groupId, version, and type
+ * Property names to override defaults for karaf distro artifactId, groupId,
+ * version, and type
*/
private static final String KARAF_DISTRO_VERSION_PROP = "karaf.distro.version";
private static final String KARAF_DISTRO_TYPE_PROP = "karaf.distro.type";
private static final String KARAF_DISTRO_GROUPID_PROP = "karaf.distro.groupId";
/**
- * Property file used to store the Karaf distribution version
+ * Property file used to store the Karaf distribution version.
*/
private static final String PROPERTIES_FILENAME = "abstractconfigtestbase.properties";
/**
* This method need only be overridden if using the config system.
*
+ * @deprecated
+ *
* @return the config module name
*/
@Deprecated
/**
* This method need only be overridden if using the config system.
*
+ * @deprecated
+ *
* @return the config module instance name
*/
@Deprecated
public Option getLoggingOption() {
Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
- logConfiguration(AbstractConfigTestBase.class),
- LogLevel.INFO.name());
+ "log4j2.logger.config-it-base.name",
+ AbstractConfigTestBase.class.getPackage().getName());
+ option = composite(option, editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
+ "log4j2.logger.config-it-base.level",
+ LogLevel.INFO.name()));
return option;
}
/**
- * Override this method to provide more options to config
+ * Override this method to provide more options to config.
*
* @return An array of additional config options
*/
return null;
}
+ /**
+ * Returns a Log4J logging configuration property name for the given class's package name of the form
+ * "log4j.logger.package_name".
+ *
+ * @deprecated The karaf logging provider is now Log4J2 so logging configurations must conform to the Log4J2 style.
+ * This method is kept for compilation backwards compatibility but will be removed in a future release.
+ */
+ @Deprecated
public String logConfiguration(final Class<?> klazz) {
return "log4j.logger." + klazz.getPackage().getName();
}
public String getKarafDistro() {
- String groupId = System.getProperty(KARAF_DISTRO_GROUPID_PROP,KARAF_DISTRO_GROUPID);
- String artifactId = System.getProperty(KARAF_DISTRO_ARTIFACTID_PROP,KARAF_DISTRO_ARTIFACTID);
+ String groupId = System.getProperty(KARAF_DISTRO_GROUPID_PROP, KARAF_DISTRO_GROUPID);
+ String artifactId = System.getProperty(KARAF_DISTRO_ARTIFACTID_PROP, KARAF_DISTRO_ARTIFACTID);
String version = System.getProperty(KARAF_DISTRO_VERSION_PROP);
- String type = System.getProperty(KARAF_DISTRO_TYPE_PROP,KARAF_DISTRO_TYPE);
+ String type = System.getProperty(KARAF_DISTRO_TYPE_PROP, KARAF_DISTRO_TYPE);
if (version == null) {
- // We use a properties file to retrieve ${karaf.version}, instead of .versionAsInProject()
+ // We use a properties file to retrieve ${karaf.version}, instead of
+ // .versionAsInProject()
// This avoids forcing all users to depend on Karaf in their POMs
Properties abstractConfigTestBaseProps = new Properties();
try (InputStream abstractConfigTestBaseInputStream = Thread.currentThread().getContextClassLoader()
}
version = abstractConfigTestBaseProps.getProperty(KARAF_DISTRO_VERSION_PROP);
}
- MavenArtifactUrlReference karafUrl = maven()
- .groupId(groupId)
- .artifactId(artifactId)
- .version(version)
+ MavenArtifactUrlReference karafUrl = maven().groupId(groupId).artifactId(artifactId).version(version)
.type(type);
return karafUrl.getURL();
}
when(Boolean.getBoolean(KARAF_DEBUG_PROP))
.useOptions(KarafDistributionOption.debugConfiguration(KARAF_DEBUG_PORT, true)),
karafDistributionConfiguration().frameworkUrl(getKarafDistro())
- .unpackDirectory(new File(PAX_EXAM_UNPACK_DIRECTORY))
- .useDeployFolder(false),
+ .unpackDirectory(new File(PAX_EXAM_UNPACK_DIRECTORY)).useDeployFolder(false),
when(Boolean.getBoolean(KEEP_UNPACK_DIRECTORY_PROP)).useOptions(keepRuntimeFolder()),
features(getFeatureRepo(), getFeatureName()),
- mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api", "1.0.0"),
- getLoggingOption(),
+ mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api", "1.0.0"), getLoggingOption(),
mvnLocalRepoOption(),
- editConfigurationFilePut(ETC_ORG_OPS4J_PAX_LOGGING_CFG, "log4j.rootLogger", "INFO, stdout, osgi:*")};
+ editConfigurationFilePut(ETC_ORG_OPS4J_PAX_LOGGING_CFG, "log4j2.rootLogger.level", "INFO") };
return OptionUtils.combine(options, getAdditionalOptions());
}
@Before
+ @SuppressWarnings("IllegalCatch")
public void setup() throws Exception {
String moduleName = getModuleName();
String instanceName = getInstanceName();
- if(moduleName == null || instanceName == null) {
+ if (moduleName == null || instanceName == null) {
return;
}
- LOG.info("Module: {} Instance: {} attempting to configure.",
- moduleName, instanceName);
+ LOG.info("Module: {} Instance: {} attempting to configure.", moduleName, instanceName);
Stopwatch stopWatch = Stopwatch.createStarted();
ObjectName objectName = null;
- for(int i = 0;i<MODULE_TIMEOUT_MILLIS;i++) {
+ for (int i = 0; i < MODULE_TIMEOUT_MILLIS; i++) {
try {
- ConfigRegistry configRegistryClient = new ConfigRegistryJMXClient(ManagementFactory
- .getPlatformMBeanServer());
+ ConfigRegistry configRegistryClient = new ConfigRegistryJMXClient(
+ ManagementFactory.getPlatformMBeanServer());
objectName = configRegistryClient.lookupConfigBean(moduleName, instanceName);
- LOG.info("Module: {} Instance: {} ObjectName: {}.",
- moduleName,instanceName,objectName);
+ LOG.info("Module: {} Instance: {} ObjectName: {}.", moduleName, instanceName, objectName);
break;
} catch (final Exception e) {
- if(i<MODULE_TIMEOUT_MILLIS) {
+ if (i < MODULE_TIMEOUT_MILLIS) {
Thread.sleep(1);
continue;
} else {
}
}
}
- if(objectName != null) {
- LOG.info("Module: {} Instance: {} configured after {} ms",
- moduleName,instanceName,
- stopWatch.elapsed(TimeUnit.MILLISECONDS));
+ if (objectName != null) {
+ LOG.info("Module: {} Instance: {} configured after {} ms", moduleName, instanceName,
+ stopWatch.elapsed(TimeUnit.MILLISECONDS));
} else {
- throw new RuntimeException("NOT FOUND Module: " +moduleName + " Instance: " + instanceName +
- " configured after " + stopWatch.elapsed(TimeUnit.MILLISECONDS) + " ms");
+ throw new RuntimeException("NOT FOUND Module: " + moduleName + " Instance: " + instanceName
+ + " configured after " + stopWatch.elapsed(TimeUnit.MILLISECONDS) + " ms");
}
}
@Rule
public TestRule watcher = new TestWatcher() {
-
@Override
protected void starting(final Description description) {
LOG.info("TestWatcher: Starting test: {}", description.getDisplayName());
LOG.info("TestWatcher: Test skipped: {} ", description.getDisplayName(), ex);
}
};
-
}
Code Review / controller.git / blobdiff