Merge branch 'master' into topic/netvirtsbmerge

[ovsdb.git] / southbound / southbound-it / src / test / java / org / opendaylight / ovsdb / southbound / it / AbstractConfigTestBase.java

diff --git a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
index e471ec70a55587fdce711213925f178231a4c90c..01043f7da1e20daef3efb93d13d0c79a88e4c646 100644 (file)
--- a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
+++ b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
@@ -44,19 +44,16 @@ public abstract class AbstractConfigTestBase {
      */
     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),
@@ -69,11 +66,11 @@ public abstract class AbstractConfigTestBase {
         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[]{};
     }
 
@@ -103,7 +100,6 @@ public abstract class AbstractConfigTestBase {
     public Option[] config() {
         LOG.info("Calling config, configTimes: {}", configTimes);
         configTimes++;
-        extras = setExtras();
         Option[] options = new Option[] {
                 //KarafDistributionOption.debugConfiguration("5005", true),
                 karafDistributionConfiguration()
@@ -113,9 +109,9 @@ public abstract class AbstractConfigTestBase {
                 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;
     }