Fix integrationtest log levels

[lispflowmapping.git] / integrationtest / src / test / java / org / opendaylight / lispflowmapping / integrationtest / MappingServiceIntegrationTest.java

diff --git a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
index d53205aa6e2a8a9e12d4143e7a3418ea01f561e4..8365f3f44d4db3bf12132cbbfb74bd267c43fc10 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
+++ b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
@@ -28,7 +28,6 @@ import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenario
 import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D_WP_100_1_SB;
 import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D_WP_50_2_SB;
 import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_E_SB;
-import static org.ops4j.pax.exam.CoreOptions.composite;
 import static org.ops4j.pax.exam.CoreOptions.maven;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
@@ -199,23 +198,17 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase {
         return "odl-lispflowmapping-msmr";
     }
 
-    @Override
-    public Option getLoggingOption() {
-        Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
-                "log4j2.logger.lispflowmapping.name",
-                "org.opendaylight.lispflowmapping");
-        option = composite(option, editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
-                "log4j2.logger.lispflowmapping.level",
-                LogLevel.TRACE.name()));
-        option = composite(option, super.getLoggingOption());
-        return option;
-    }
-
     @Override
     protected Option[] getAdditionalOptions() {
         return new Option[] {
                 keepRuntimeFolder(),
-                configureConsole().ignoreLocalConsole().ignoreRemoteShell()
+                configureConsole().ignoreLocalConsole().ignoreRemoteShell(),
+                editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
+                        "log4j2.logger.lispflowmapping.name",
+                        "org.opendaylight.lispflowmapping"),
+                editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
+                        "log4j2.logger.lispflowmapping.level",
+                        LogLevel.TRACE.name())
         };
     }