BGPCEP-717: Add logback config file

 for reduce log level of yang parser.
As a result we reduce 1G output to
only 12M

- set debug loglevel for test

Change-Id: I5ed2c81e006b3d78193383ad78e5e01f9cbdccb2
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/bgp/benchmark-app/src/test/resources/logback-test.xml b/bgp/benchmark-app/src/test/resources/logback-test.xml
index d567a79021afefe256513909791ecefa6b78a46b..57bb947219620ca80d8469271647f18d3afd28e4 100644 (file)
--- a/bgp/benchmark-app/src/test/resources/logback-test.xml
+++ b/bgp/benchmark-app/src/test/resources/logback-test.xml
@@ -6,22 +6,23 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-    <appender name="console" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%-6p %d{HH:mm:ss.SSS} [%10.10t] %30.30c %x - %m%n"/>
-        </layout>
+<configuration scan="true">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
     </appender>
 
-    <logger name="org.opendaylight.yangtools.yang.parser" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="console"/>
+    <logger name="org.opendaylight.protocol" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+    <logger name="org.opendaylight.bgpcep" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
     </logger>
 
-    <root>
-        <priority value="DEBUG"/>
-        <appender-ref ref="console"/>
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
     </root>
-</log4j:configuration>
\ No newline at end of file
+</configuration>
\ No newline at end of file

diff --git a/bgp/openconfig-state/src/test/resources/logback-test.xml b/bgp/openconfig-state/src/test/resources/logback-test.xml
index d567a79021afefe256513909791ecefa6b78a46b..57bb947219620ca80d8469271647f18d3afd28e4 100644 (file)
--- a/bgp/openconfig-state/src/test/resources/logback-test.xml
+++ b/bgp/openconfig-state/src/test/resources/logback-test.xml
@@ -6,22 +6,23 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-    <appender name="console" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%-6p %d{HH:mm:ss.SSS} [%10.10t] %30.30c %x - %m%n"/>
-        </layout>
+<configuration scan="true">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
     </appender>
 
-    <logger name="org.opendaylight.yangtools.yang.parser" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="console"/>
+    <logger name="org.opendaylight.protocol" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+    <logger name="org.opendaylight.bgpcep" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
     </logger>
 
-    <root>
-        <priority value="DEBUG"/>
-        <appender-ref ref="console"/>
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
     </root>
-</log4j:configuration>
\ No newline at end of file
+</configuration>
\ No newline at end of file

diff --git a/bgp/rib-impl/src/test/resources/logback-test.xml b/bgp/rib-impl/src/test/resources/logback-test.xml
index d567a79021afefe256513909791ecefa6b78a46b..57bb947219620ca80d8469271647f18d3afd28e4 100644 (file)
--- a/bgp/rib-impl/src/test/resources/logback-test.xml
+++ b/bgp/rib-impl/src/test/resources/logback-test.xml
@@ -6,22 +6,23 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-    <appender name="console" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%-6p %d{HH:mm:ss.SSS} [%10.10t] %30.30c %x - %m%n"/>
-        </layout>
+<configuration scan="true">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
     </appender>
 
-    <logger name="org.opendaylight.yangtools.yang.parser" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="console"/>
+    <logger name="org.opendaylight.protocol" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+    <logger name="org.opendaylight.bgpcep" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
     </logger>
 
-    <root>
-        <priority value="DEBUG"/>
-        <appender-ref ref="console"/>
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
     </root>
-</log4j:configuration>
\ No newline at end of file
+</configuration>
\ No newline at end of file

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java
index 63f4a9714adf4b1e364b48aafc56f7a653ce8200..ec9dc77f6aa1fbccab7c676d7f1a80cf81def464 100644 (file)
--- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java
@@ -7,12 +7,14 @@
  */
 package org.opendaylight.bgpcep.bgp.topology.provider;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -83,8 +85,8 @@ public abstract class AbstractTopologyBuilder<T extends Route> implements Cluste
         final Class<? extends SubsequentAddressFamily> safi, final long listenerResetLimitInMillsec,
         final int listenerResetEnforceCounter) {
         this.dataProvider = dataProvider;
-        this.locRibReference = Preconditions.checkNotNull(locRibReference);
-        this.topologyKey = new TopologyKey(Preconditions.checkNotNull(topologyId));
+        this.locRibReference = requireNonNull(locRibReference);
+        this.topologyKey = new TopologyKey(requireNonNull(topologyId));
         this.topologyTypes = types;
         this.afi = afi;
         this.safi = safi;
@@ -207,7 +209,7 @@ public abstract class AbstractTopologyBuilder<T extends Route> implements Cluste
                 // we do nothing but print out the log. Transaction chain restart will be done in #onTransactionChainFailed()
                 LOG.error("Failed to propagate change (transaction {}) by listener {}", trans.getIdentifier(), AbstractTopologyBuilder.this, t);
             }
-        });
+        }, MoreExecutors.directExecutor());
     }
 
     @VisibleForTesting
@@ -230,7 +232,7 @@ public abstract class AbstractTopologyBuilder<T extends Route> implements Cluste
     }
 
     private synchronized void initOperationalTopology() {
-        Preconditions.checkNotNull(this.chain, "A valid transaction chain must be provided.");
+        requireNonNull(this.chain, "A valid transaction chain must be provided.");
         final WriteTransaction trans = this.chain.newWriteOnlyTransaction();
         trans.put(LogicalDatastoreType.OPERATIONAL, this.topology,
             new TopologyBuilder().setKey(this.topologyKey).setServerProvided(Boolean.TRUE).setTopologyTypes(this.topologyTypes)
@@ -246,7 +248,7 @@ public abstract class AbstractTopologyBuilder<T extends Route> implements Cluste
                 LOG.error("Failed to initialize topology {} (transaction {}) by listener {}", AbstractTopologyBuilder.this.topology,
                     trans.getIdentifier(), AbstractTopologyBuilder.this, t);
             }
-        });
+        }, MoreExecutors.directExecutor());
     }
 
     /**
@@ -254,10 +256,10 @@ public abstract class AbstractTopologyBuilder<T extends Route> implements Cluste
      * @throws TransactionCommitFailedException
      */
     private synchronized ListenableFuture<Void> destroyOperationalTopology() {
-        Preconditions.checkNotNull(this.chain, "A valid transaction chain must be provided.");
+        requireNonNull(this.chain, "A valid transaction chain must be provided.");
         final WriteTransaction trans = this.chain.newWriteOnlyTransaction();
         trans.delete(LogicalDatastoreType.OPERATIONAL, getInstanceIdentifier());
-        final CheckedFuture<Void, TransactionCommitFailedException> future = trans.submit();
+        final ListenableFuture<Void> future = trans.submit();
         Futures.addCallback(future, new FutureCallback<Void>() {
             @Override
             public void onSuccess(final Void result) {
@@ -269,7 +271,7 @@ public abstract class AbstractTopologyBuilder<T extends Route> implements Cluste
                 LOG.error("Unable to reset operational topology {} (transaction {})",
                     AbstractTopologyBuilder.this.topology, trans.getIdentifier(), t);
             }
-        });
+        }, MoreExecutors.directExecutor());
         clearTopology();
         return future;
     }
@@ -310,7 +312,7 @@ public abstract class AbstractTopologyBuilder<T extends Route> implements Cluste
      */
     @VisibleForTesting
     protected synchronized void resetListener() {
-        Preconditions.checkNotNull(this.listenerRegistration, "Listener on topology %s hasn't been initialized.", this);
+        requireNonNull(this.listenerRegistration, "Listener on topology " + this + " hasn't been initialized.");
         LOG.debug("Resetting data change listener for topology builder {}", getInstanceIdentifier());
         // unregister current listener to prevent incoming data tree change first
         unregisterDataChangeListener();
@@ -362,9 +364,9 @@ public abstract class AbstractTopologyBuilder<T extends Route> implements Cluste
                 this.listenerScheduledRestartEnforceCounter = 0;
                 resetListener();
                 return true;
-            } else {
-                resetTransactionChain();
             }
+
+            resetTransactionChain();
         }
         return false;
     }

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java
index aabf76a6975278698e2e44bd8c16937e881a9614..ef65c6a2ecd56d499068844fde5de06cbb6ce6d7 100644 (file)
--- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.bgpcep.bgp.topology.provider;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
@@ -138,7 +140,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder<LinkstateR
         private final TerminationPoint tp;
 
         private TpHolder(final TerminationPoint tp) {
-            this.tp = Preconditions.checkNotNull(tp);
+            this.tp = requireNonNull(tp);
         }
 
         private synchronized void addLink(final LinkId id, final boolean isRemote) {
@@ -197,11 +199,11 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder<LinkstateR
 
             if (!this.advertized) {
                 if (this.tps.isEmpty() && this.prefixes.isEmpty()) {
-                    LOG.debug("Removing unadvertized unused node {}", this.nb.getNodeId());
+                    LOG.trace("Removing unadvertized unused node {}", this.nb.getNodeId());
                     return true;
                 }
 
-                LOG.debug("Node {} is still implied by {} TPs and {} prefixes", this.nb.getNodeId(), this.tps.size(), this.prefixes.size());
+                LOG.trace("Node {} is still implied by {} TPs and {} prefixes", this.nb.getNodeId(), this.tps.size(), this.prefixes.size());
             }
 
             // Re-generate termination points
@@ -213,7 +215,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder<LinkstateR
             // Write the node out
             final Node n = this.nb.addAugmentation(Node1.class, new Node1Builder().setIgpNodeAttributes(this.inab.build()).build()).build();
             trans.put(LogicalDatastoreType.OPERATIONAL, nid, n);
-            LOG.debug("Created node {} at {}", n, nid);
+            LOG.trace("Created node {} at {}", n, nid);
             return false;
         }
 
@@ -223,11 +225,11 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder<LinkstateR
                 if (!this.advertized) {
                     if (this.tps.isEmpty() && this.prefixes.isEmpty()) {
                         trans.delete(LogicalDatastoreType.OPERATIONAL, nid);
-                        LOG.debug("Removing unadvertized unused node {}", this.nb.getNodeId());
+                        LOG.trace("Removing unadvertized unused node {}", this.nb.getNodeId());
                         return true;
                     }
 
-                    LOG.debug("Node {} is still implied by {} TPs and {} prefixes", this.nb.getNodeId(), this.tps.size(), this.prefixes.size());
+                    LOG.trace("Node {} is still implied by {} TPs and {} prefixes", this.nb.getNodeId(), this.tps.size(), this.prefixes.size());
                 }
                 return false;
         }
@@ -237,7 +239,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder<LinkstateR
             if (h != null) {
                 if (h.removeLink(link, isRemote)) {
                     this.tps.remove(tp);
-                    LOG.debug("Removed TP {}", tp);
+                    LOG.trace("Removed TP {}", tp);
                 }
             } else {
                 LOG.warn("Removed non-present TP {} by link {}", tp, link);
@@ -265,8 +267,8 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder<LinkstateR
         }
 
         private void advertized(final NodeBuilder nb, final IgpNodeAttributesBuilder inab) {
-            this.nb = Preconditions.checkNotNull(nb);
-            this.inab = Preconditions.checkNotNull(inab);
+            this.nb = requireNonNull(nb);
+            this.inab = requireNonNull(inab);
             this.advertized = true;
             LOG.debug("Node {} is advertized", nb.getNodeId());
         }
@@ -558,21 +560,21 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder<LinkstateR
         lb.addAugmentation(Link1.class, new Link1Builder().setIgpLinkAttributes(ilab.build()).build());
 
         final NodeId srcNode = buildNodeId(base, l.getLocalNodeDescriptors());
-        LOG.debug("Link {} implies source node {}", l, srcNode);
+        LOG.trace("Link {} implies source node {}", l, srcNode);
 
         final NodeId dstNode = buildNodeId(base, l.getRemoteNodeDescriptors());
-        LOG.debug("Link {} implies destination node {}", l, dstNode);
+        LOG.trace("Link {} implies destination node {}", l, dstNode);
 
         final TerminationPoint srcTp = buildLocalTp(base, l.getLinkDescriptors());
-        LOG.debug("Link {} implies source TP {}", l, srcTp);
+        LOG.trace("Link {} implies source TP {}", l, srcTp);
 
         final TerminationPoint dstTp = buildRemoteTp(base, l.getLinkDescriptors());
-        LOG.debug("Link {} implies destination TP {}", l, dstTp);
+        LOG.trace("Link {} implies destination TP {}", l, dstTp);
 
         lb.setSource(new SourceBuilder().setSourceNode(srcNode).setSourceTp(srcTp.getTpId()).build());
         lb.setDestination(new DestinationBuilder().setDestNode(dstNode).setDestTp(dstTp.getTpId()).build());
 
-        LOG.debug("Created TP {} as link source", srcTp);
+        LOG.trace("Created TP {} as link source", srcTp);
         NodeHolder snh = this.nodes.get(srcNode);
         if (snh == null) {
             snh = getNode(srcNode);
@@ -580,7 +582,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder<LinkstateR
             putNode(trans, snh);
         } else {
             snh.addTp(srcTp, lb.getLinkId(), false);
-            final InstanceIdentifier<Node> nid = getNodeInstanceIdentifier(new NodeKey((NodeId) snh.getNodeId()));
+            final InstanceIdentifier<Node> nid = getNodeInstanceIdentifier(new NodeKey(snh.getNodeId()));
             trans.put(LogicalDatastoreType.OPERATIONAL, nid.child(TerminationPoint.class, srcTp.getKey()), srcTp);
         }
 
@@ -594,7 +596,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder<LinkstateR
             dnh.addTp(dstTp, lb.getLinkId(), true);
             final InstanceIdentifier<Node> nid = getInstanceIdentifier().child(
                     org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node.class,
-                    new NodeKey((NodeId) dnh.getNodeId()));
+                    new NodeKey(dnh.getNodeId()));
             trans.put(LogicalDatastoreType.OPERATIONAL, nid.child(TerminationPoint.class, dstTp.getKey()), dstTp);
         }
 
@@ -609,7 +611,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder<LinkstateR
             final LinkId link, final boolean isRemote) {
         final NodeHolder nh = this.nodes.get(node);
         if (nh != null) {
-            final InstanceIdentifier<Node> nid = getNodeInstanceIdentifier(new NodeKey((NodeId) nh.getNodeId()));
+            final InstanceIdentifier<Node> nid = getNodeInstanceIdentifier(new NodeKey(nh.getNodeId()));
             trans.delete(LogicalDatastoreType.OPERATIONAL, nid.child(TerminationPoint.class, new TerminationPointKey(tp)));
             nh.removeTp(tp, link, isRemote);
             checkNodeForRemoval(trans, nh);
@@ -865,7 +867,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder<LinkstateR
             putNode(trans, nh);
         } else {
             nh.addPrefix(pfx);
-            final InstanceIdentifier<Node> nid = getNodeInstanceIdentifier(new NodeKey((NodeId) nh.getNodeId()));
+            final InstanceIdentifier<Node> nid = getNodeInstanceIdentifier(new NodeKey(nh.getNodeId()));
             final InstanceIdentifier<IgpNodeAttributes> inaId = nid.builder().augmentation(Node1.class).child(IgpNodeAttributes.class).build();
             trans.put(LogicalDatastoreType.OPERATIONAL, inaId.child(Prefix.class, pk), pfx);
         }
@@ -876,7 +878,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder<LinkstateR
         final NodeHolder nh = this.nodes.get(node);
         if (nh != null) {
             LOG.debug("Removed prefix {}", p);
-            final InstanceIdentifier<Node> nid = getNodeInstanceIdentifier(new NodeKey((NodeId) nh.getNodeId()));
+            final InstanceIdentifier<Node> nid = getNodeInstanceIdentifier(new NodeKey(nh.getNodeId()));
             final InstanceIdentifier<IgpNodeAttributes> inaId = nid.builder().augmentation(Node1.class).child(IgpNodeAttributes.class).build();
             final IpPrefix ippfx = p.getPrefixDescriptors().getIpReachabilityInformation();
             if (ippfx == null) {

diff --git a/bgp/topology-provider/src/test/resources/logback-test.xml b/bgp/topology-provider/src/test/resources/logback-test.xml
index d567a79021afefe256513909791ecefa6b78a46b..57bb947219620ca80d8469271647f18d3afd28e4 100644 (file)
--- a/bgp/topology-provider/src/test/resources/logback-test.xml
+++ b/bgp/topology-provider/src/test/resources/logback-test.xml
@@ -6,22 +6,23 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-    <appender name="console" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%-6p %d{HH:mm:ss.SSS} [%10.10t] %30.30c %x - %m%n"/>
-        </layout>
+<configuration scan="true">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
     </appender>
 
-    <logger name="org.opendaylight.yangtools.yang.parser" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="console"/>
+    <logger name="org.opendaylight.protocol" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+    <logger name="org.opendaylight.bgpcep" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
     </logger>
 
-    <root>
-        <priority value="DEBUG"/>
-        <appender-ref ref="console"/>
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
     </root>
-</log4j:configuration>
\ No newline at end of file
+</configuration>
\ No newline at end of file

diff --git a/data-change-counter/src/test/resources/logback-test.xml b/data-change-counter/src/test/resources/logback-test.xml
index d567a79021afefe256513909791ecefa6b78a46b..57bb947219620ca80d8469271647f18d3afd28e4 100644 (file)
--- a/data-change-counter/src/test/resources/logback-test.xml
+++ b/data-change-counter/src/test/resources/logback-test.xml
@@ -6,22 +6,23 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-    <appender name="console" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%-6p %d{HH:mm:ss.SSS} [%10.10t] %30.30c %x - %m%n"/>
-        </layout>
+<configuration scan="true">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
     </appender>
 
-    <logger name="org.opendaylight.yangtools.yang.parser" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="console"/>
+    <logger name="org.opendaylight.protocol" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+    <logger name="org.opendaylight.bgpcep" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
     </logger>
 
-    <root>
-        <priority value="DEBUG"/>
-        <appender-ref ref="console"/>
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
     </root>
-</log4j:configuration>
\ No newline at end of file
+</configuration>
\ No newline at end of file

diff --git a/pcep/impl/src/test/resources/logback-test.xml b/pcep/impl/src/test/resources/logback-test.xml
index d567a79021afefe256513909791ecefa6b78a46b..57bb947219620ca80d8469271647f18d3afd28e4 100644 (file)
--- a/pcep/impl/src/test/resources/logback-test.xml
+++ b/pcep/impl/src/test/resources/logback-test.xml
@@ -6,22 +6,23 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-    <appender name="console" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%-6p %d{HH:mm:ss.SSS} [%10.10t] %30.30c %x - %m%n"/>
-        </layout>
+<configuration scan="true">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
     </appender>
 
-    <logger name="org.opendaylight.yangtools.yang.parser" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="console"/>
+    <logger name="org.opendaylight.protocol" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+    <logger name="org.opendaylight.bgpcep" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
     </logger>
 
-    <root>
-        <priority value="DEBUG"/>
-        <appender-ref ref="console"/>
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
     </root>
-</log4j:configuration>
\ No newline at end of file
+</configuration>
\ No newline at end of file

diff --git a/pcep/segment-routing/src/test/resources/logback-test.xml b/pcep/segment-routing/src/test/resources/logback-test.xml
index d567a79021afefe256513909791ecefa6b78a46b..57bb947219620ca80d8469271647f18d3afd28e4 100644 (file)
--- a/pcep/segment-routing/src/test/resources/logback-test.xml
+++ b/pcep/segment-routing/src/test/resources/logback-test.xml
@@ -6,22 +6,23 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-    <appender name="console" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%-6p %d{HH:mm:ss.SSS} [%10.10t] %30.30c %x - %m%n"/>
-        </layout>
+<configuration scan="true">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
     </appender>
 
-    <logger name="org.opendaylight.yangtools.yang.parser" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="console"/>
+    <logger name="org.opendaylight.protocol" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+    <logger name="org.opendaylight.bgpcep" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
     </logger>
 
-    <root>
-        <priority value="DEBUG"/>
-        <appender-ref ref="console"/>
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
     </root>
-</log4j:configuration>
\ No newline at end of file
+</configuration>
\ No newline at end of file

diff --git a/pcep/topology/topology-provider/src/test/resources/logback-test.xml b/pcep/topology/topology-provider/src/test/resources/logback-test.xml
index d567a79021afefe256513909791ecefa6b78a46b..57bb947219620ca80d8469271647f18d3afd28e4 100644 (file)
--- a/pcep/topology/topology-provider/src/test/resources/logback-test.xml
+++ b/pcep/topology/topology-provider/src/test/resources/logback-test.xml
@@ -6,22 +6,23 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-    <appender name="console" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%-6p %d{HH:mm:ss.SSS} [%10.10t] %30.30c %x - %m%n"/>
-        </layout>
+<configuration scan="true">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
     </appender>
 
-    <logger name="org.opendaylight.yangtools.yang.parser" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="console"/>
+    <logger name="org.opendaylight.protocol" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+    <logger name="org.opendaylight.bgpcep" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
     </logger>
 
-    <root>
-        <priority value="DEBUG"/>
-        <appender-ref ref="console"/>
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
     </root>
-</log4j:configuration>
\ No newline at end of file
+</configuration>
\ No newline at end of file

diff --git a/pcep/tunnel-provider/src/test/resources/logback-test.xml b/pcep/tunnel-provider/src/test/resources/logback-test.xml
index d567a79021afefe256513909791ecefa6b78a46b..57bb947219620ca80d8469271647f18d3afd28e4 100644 (file)
--- a/pcep/tunnel-provider/src/test/resources/logback-test.xml
+++ b/pcep/tunnel-provider/src/test/resources/logback-test.xml
@@ -6,22 +6,23 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-    <appender name="console" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%-6p %d{HH:mm:ss.SSS} [%10.10t] %30.30c %x - %m%n"/>
-        </layout>
+<configuration scan="true">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
     </appender>
 
-    <logger name="org.opendaylight.yangtools.yang.parser" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="console"/>
+    <logger name="org.opendaylight.protocol" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+    <logger name="org.opendaylight.bgpcep" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
     </logger>
 
-    <root>
-        <priority value="DEBUG"/>
-        <appender-ref ref="console"/>
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
     </root>
-</log4j:configuration>
\ No newline at end of file
+</configuration>
\ No newline at end of file

diff --git a/programming/impl/src/test/resources/logback-test.xml b/programming/impl/src/test/resources/logback-test.xml
index d567a79021afefe256513909791ecefa6b78a46b..57bb947219620ca80d8469271647f18d3afd28e4 100644 (file)
--- a/programming/impl/src/test/resources/logback-test.xml
+++ b/programming/impl/src/test/resources/logback-test.xml
@@ -6,22 +6,23 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-    <appender name="console" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%-6p %d{HH:mm:ss.SSS} [%10.10t] %30.30c %x - %m%n"/>
-        </layout>
+<configuration scan="true">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
     </appender>
 
-    <logger name="org.opendaylight.yangtools.yang.parser" additivity="false">
-        <level value="INFO"/>
-        <appender-ref ref="console"/>
+    <logger name="org.opendaylight.protocol" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+    <logger name="org.opendaylight.bgpcep" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="STDOUT"/>
     </logger>
 
-    <root>
-        <priority value="DEBUG"/>
-        <appender-ref ref="console"/>
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
     </root>
-</log4j:configuration>
\ No newline at end of file
+</configuration>
\ No newline at end of file