import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-//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;
*/
private static final int MODULE_TIMEOUT = 10000;
private static int configTimes = 0;
- private static boolean extras = false;
public abstract String getModuleName();
public abstract String getInstanceName();
- public abstract boolean setExtras();
-
public abstract MavenUrlReference getFeatureRepo();
public abstract String getFeatureName();
- public Option[] getLoggingOptions(boolean extras) {
+ public Option[] getLoggingOptions() {
Option[] options = new Option[] {
editConfigurationFilePut(SouthboundITConstants.ORG_OPS4J_PAX_LOGGING_CFG,
logConfiguration(AbstractConfigTestBase.class),
return "log4j.logger." + klazz.getPackage().getName();
}
- public Option[] getFeaturesOptions(boolean extras) {
+ public Option[] getFeaturesOptions() {
return new Option[]{};
}
- public Option[] getPropertiesOptions(boolean extras) {
+ public Option[] getPropertiesOptions() {
return new Option[]{};
}
public MavenArtifactUrlReference getKarafDistro() {
- /*MavenArtifactUrlReference karafUrl = maven()
- .groupId("org.opendaylight.controller")
- .artifactId("opendaylight-karaf-empty")
- .version("1.5.0-SNAPSHOT")
- .type("zip");*/
- MavenArtifactUrlReference karafUrl = maven()
+ MavenArtifactUrlReference karafUrl;
+ karafUrl = maven()
+ // karaf-empty is busted
+ //.groupId("org.opendaylight.controller")
+ //.artifactId("opendaylight-karaf-empty")
+ //.version("1.5.0-SNAPSHOT")
.groupId("org.opendaylight.ovsdb")
.artifactId("southbound-karaf")
.version("1.1.0-SNAPSHOT")
public Option[] config() {
LOG.info("Calling config, configTimes: {}", configTimes);
configTimes++;
- extras = setExtras();
Option[] options = new Option[] {
- // KarafDistributionOption.debugConfiguration("5005", true),
+ //KarafDistributionOption.debugConfiguration("5005", true),
karafDistributionConfiguration()
.frameworkUrl(getKarafDistro())
.unpackDirectory(new File("target/exam"))
keepRuntimeFolder(),
//features(getFeatureRepo() , getFeatureName())
};
- options = ObjectArrays.concat(options, getFeaturesOptions(extras), Option.class);
- options = ObjectArrays.concat(options, getLoggingOptions(extras), Option.class);
- options = ObjectArrays.concat(options, getPropertiesOptions(extras), Option.class);
+ options = ObjectArrays.concat(options, getFeaturesOptions(), Option.class);
+ options = ObjectArrays.concat(options, getLoggingOptions(), Option.class);
+ options = ObjectArrays.concat(options, getPropertiesOptions(), Option.class);
return options;
}