Added more logs. 06/3806/2
authorDana Kutenicsova <dkutenic@cisco.com>
Tue, 17 Dec 2013 22:38:00 +0000 (23:38 +0100)
committerDana Kutenicsova <dkutenic@cisco.com>
Tue, 17 Dec 2013 22:41:04 +0000 (23:41 +0100)
Change-Id: I934e5d96f242b463cb761b4a42fe1e8f1773234a
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBTables.java

index fd8ef23f5f03f36d87dcb1a6d046edf05b503011..9367998e1c6e1b1df5e0dc53e104f3a233a8bf94 100644 (file)
@@ -55,10 +55,9 @@ import org.slf4j.LoggerFactory;
 import com.google.common.base.Preconditions;
 
 final class LinkstateAdjRIBsIn extends AbstractAdjRIBsIn<CLinkstateDestination, LinkstateRoute> {
-       private static final Logger LOG = LoggerFactory.getLogger(LinkstateAdjRIBsIn.class);
 
        private abstract static class LinkstateRIBEntryData<A extends LinkStateAttribute> extends
-       RIBEntryData<CLinkstateDestination, LinkstateRoute> {
+                       RIBEntryData<CLinkstateDestination, LinkstateRoute> {
                private final A lsattr;
 
                protected LinkstateRIBEntryData(final PathAttributes attributes, final A lsattr) {
@@ -85,7 +84,10 @@ final class LinkstateAdjRIBsIn extends AbstractAdjRIBsIn<CLinkstateDestination,
                }
        }
 
-       LinkstateAdjRIBsIn(final DataModificationTransaction trans, final RibReference rib, final Comparator<PathAttributes> comparator, final TablesKey key) {
+       private static final Logger LOG = LoggerFactory.getLogger(LinkstateAdjRIBsIn.class);
+
+       LinkstateAdjRIBsIn(final DataModificationTransaction trans, final RibReference rib, final Comparator<PathAttributes> comparator,
+                       final TablesKey key) {
                super(trans, rib, comparator, key);
        }
 
@@ -98,6 +100,7 @@ final class LinkstateAdjRIBsIn extends AbstractAdjRIBsIn<CLinkstateDestination,
        @Override
        public void addRoutes(final DataModificationTransaction trans, final Peer peer, final MpReachNlri nlri,
                        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.update.PathAttributes attributes) {
+               LOG.debug("Passed nlri {}", nlri);
                final LinkstateDestination keys = ((DestinationLinkstateCase) nlri.getAdvertizedRoutes().getDestinationType()).getDestinationLinkstate();
                if (keys == null) {
                        LOG.debug("No destinations present in advertized routes");
@@ -158,7 +161,7 @@ final class LinkstateAdjRIBsIn extends AbstractAdjRIBsIn<CLinkstateDestination,
                                                        }
                                                }
 
-                                               return  b.build();
+                                               return b.build();
                                        }
 
                                        @Override
@@ -204,4 +207,4 @@ final class LinkstateAdjRIBsIn extends AbstractAdjRIBsIn<CLinkstateDestination,
 
                super.remove(trans, peer, key);
        }
-}
\ No newline at end of file
+}
index 684a7648e7500cc65e2bdfeb7e27cd1dcf1994cd..e6f1a1f0b662cca1c67feb3ac619b0b83f69e473 100644 (file)
@@ -11,10 +11,15 @@ import org.opendaylight.protocol.bgp.rib.spi.AdjRIBsInFactory;
 import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.PathAttributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Preconditions;
 
 final class RIBTables {
+
+       private static final Logger LOG = LoggerFactory.getLogger(RIBTables.class);
+
        private final Map<TablesKey, AdjRIBsIn> tables = new HashMap<>();
        private final Comparator<PathAttributes> comparator;
        private final RIBExtensionConsumerContext registry;
@@ -25,21 +30,25 @@ final class RIBTables {
        }
 
        public synchronized AdjRIBsIn get(final TablesKey key) {
-               return tables.get(key);
+               return this.tables.get(key);
        }
 
        public synchronized AdjRIBsIn getOrCreate(final DataModificationTransaction trans, final RibReference rib, final TablesKey key) {
-               if (tables.containsKey(key)) {
-                       return tables.get(key);
+               LOG.debug("Looking for key {} in tables {}", key, this.tables);
+               if (this.tables.containsKey(key)) {
+                       LOG.trace("Key found {}.", this.tables.get(key));
+                       return this.tables.get(key);
                }
 
-               final AdjRIBsInFactory f = registry.getAdjRIBsInFactory(key.getAfi(), key.getSafi());
+               final AdjRIBsInFactory f = this.registry.getAdjRIBsInFactory(key.getAfi(), key.getSafi());
                if (f == null) {
+                       LOG.debug("RIBsInFactory not found for key {}, returning null", key);
                        return null;
                }
 
-               final AdjRIBsIn table = Preconditions.checkNotNull(f.createAdjRIBsIn(trans, rib, comparator, key));
-               tables.put(key, table);
+               final AdjRIBsIn table = Preconditions.checkNotNull(f.createAdjRIBsIn(trans, rib, this.comparator, key));
+               LOG.debug("Table {} created for key {}", table, key);
+               this.tables.put(key, table);
                return table;
        }
 }