Filter out monitor updates for some columns

This filters out statistics and _version columns from all tables
when setting up monitoring for table updates.

This also filters out status column for Controller table.

Change-Id: I3ed875a6070c2ce61ab8ecf626a6856f99f8179f
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
index 8cb9917453ba342e82f069f8b84cf99338357f64..231956f7052c27ca20f8dfc63a5af1bb186178e5 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
@@ -11,6 +11,7 @@ import static org.opendaylight.ovsdb.lib.operations.Operations.op;
 
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.ListenableFuture;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -18,7 +19,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
+
 import javax.annotation.Nonnull;
+
 import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
 import org.opendaylight.controller.md.sal.common.api.clustering.Entity;
 import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipCandidateRegistration;
@@ -131,7 +134,7 @@ public class OvsdbConnectionInstance {
                 if (dbSchema != null) {
                     LOG.info("Monitoring database: {}", database);
                     callback = new OvsdbMonitorCallback(this, txInvoker);
-                    monitorAllTables(database, dbSchema);
+                    monitorTables(database, dbSchema);
                 } else {
                     LOG.info("No database {} found on {}", database, connectionInfo);
                 }
@@ -155,19 +158,27 @@ public class OvsdbConnectionInstance {
         }
     }
 
-    private void monitorAllTables(String database, DatabaseSchema dbSchema) {
+    private void monitorTables(String database, DatabaseSchema dbSchema) {
         Set<String> tables = dbSchema.getTables();
         if (tables != null) {
             List<MonitorRequest> monitorRequests = Lists.newArrayList();
             for (String tableName : tables) {
-                LOG.info("Southbound monitoring table {} in {}", tableName, dbSchema.getName());
-                GenericTableSchema tableSchema = dbSchema.table(tableName, GenericTableSchema.class);
-                Set<String> columns = tableSchema.getColumns();
-                MonitorRequestBuilder<GenericTableSchema> monitorBuilder = MonitorRequestBuilder.builder(tableSchema);
-                for (String column : columns) {
-                    monitorBuilder.addColumn(column);
+                if (!SouthboundConstants.SKIP_OVSDB_TABLE.containsKey(tableName)) {
+                    LOG.info("Southbound monitoring OVSDB schema table {}", tableName);
+                    GenericTableSchema tableSchema = dbSchema.table(tableName, GenericTableSchema.class);
+                    Set<String> columns = tableSchema.getColumns();
+                    MonitorRequestBuilder<GenericTableSchema> monitorBuilder
+                            = MonitorRequestBuilder.builder(tableSchema);
+                    List<String> skipColumns = SouthboundConstants.SKIP_COLUMN_FROM_TABLE.get(tableName);
+                    for (String column : columns) {
+                        if ( skipColumns == null || !skipColumns.contains(column)) {
+                            monitorBuilder.addColumn(column);
+                        } else {
+                            LOG.info("Southbound NOT monitoring column {} in table {}", column, tableName);
+                        }
+                    }
+                    monitorRequests.add(monitorBuilder.with(new MonitorSelect(true, true, true, true)).build());
                 }
-                monitorRequests.add(monitorBuilder.with(new MonitorSelect(true, true, true, true)).build());
             }
             this.callback.update(monitor(dbSchema, monitorRequests, callback), dbSchema);
         } else {

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundConstants.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundConstants.java
index 8939a22cb37a041402d59b0a47aef1f6a80047b7..e2c23a2d3310fe527732500990b965e790a6738b 100755 (executable)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundConstants.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundConstants.java
@@ -8,6 +8,11 @@
 package org.opendaylight.ovsdb.southbound;
 
 import com.google.common.collect.ImmutableBiMap;
+import com.google.common.collect.ImmutableMap;
+
+import java.util.Arrays;
+import java.util.List;
+
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.DatapathTypeBase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.DatapathTypeNetdev;
@@ -129,11 +134,31 @@ public class SouthboundConstants {
             .put(DatapathTypeSystem.class,"system")
             .put(DatapathTypeNetdev.class,"netdev")
             .build();
+
     public static final String IID_EXTERNAL_ID_KEY = "opendaylight-iid";
     public static final String QOS_ID_EXTERNAL_ID_KEY = "opendaylight-qos-id";
     public static final String QUEUE_ID_EXTERNAL_ID_KEY = "opendaylight-queue-id";
     public static final String AUTOATTACH_ID_EXTERNAL_ID_KEY = "opendaylight-autoattach-id";
 
+    public static final ImmutableMap<String,String> SKIP_OVSDB_TABLE
+            = new ImmutableMap.Builder<String,String>()
+            .put("Flow_Table","Update callback registration for Flow Table is skipped")
+            .put("Mirror","Update callback registration for Mirror Table is skipped")
+            .put("NetFlow","Update callback registration for NetFlow Table is skipped")
+            .put("sFlow","Update callback registration for sFlow Table is skipped")
+            .put("IPFIX","Update callback registration for IPFIX Table is skipped")
+            .put("Flow_Sample_Collector_Set","Update callback registration for "
+                    + "Flow_Sample_Collector_Set Table is skipped")
+            .build();
+
+    public static final ImmutableMap<String,List<String>> SKIP_COLUMN_FROM_TABLE
+            = new ImmutableMap.Builder<String,List<String>>()
+            .put("Open_vSwitch", Arrays.asList(new String[]{"statistics"}))
+            .put("Port", Arrays.asList(new String[]{"statistics"}))
+            .put("Interface", Arrays.asList(new String[]{"statistics"}))
+            .put("Controller", Arrays.asList(new String[]{"status"}))
+            .build();
+
     public enum VlanModes {
         ACCESS("access"),
         NATIVE_TAGGED("native-tagged"),

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java
index b32efd1f5292ca0732ff4246bc68dc59d9d8060d..37d057bcd78fc6d760140b1aab0c5c1a4aaaa52c 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java
@@ -439,8 +439,9 @@ public class SouthboundMapper {
             long numberOfConnections = 0;
             final String targetString = manager.getTargetColumn().getData();
 
-            final Map<String, String> statusAttributeMap = manager.getStatusColumn().getData();
-            if (statusAttributeMap.containsKey(N_CONNECTIONS_STR)) {
+            final Map<String, String> statusAttributeMap =
+                            (manager.getStatusColumn() == null) ? null : manager.getStatusColumn().getData();
+            if ((statusAttributeMap != null) && statusAttributeMap.containsKey(N_CONNECTIONS_STR)) {
                 String numberOfConnectionValueStr = statusAttributeMap.get(N_CONNECTIONS_STR);
                 numberOfConnections = Integer.parseInt(numberOfConnectionValueStr);
             } else {

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbOperationalCommandAggregator.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbOperationalCommandAggregator.java
index 4aebbbd1d115fb5135c207e931b301974262623b..79a772fc5d5bf4fa89adfabb8339e6497a1aee12 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbOperationalCommandAggregator.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbOperationalCommandAggregator.java
@@ -54,7 +54,11 @@ public class OvsdbOperationalCommandAggregator implements TransactionCommand {
     @Override
     public void execute(ReadWriteTransaction transaction) {
         for (TransactionCommand command: commands) {
-            command.execute(transaction);
+            try {
+                command.execute(transaction);
+            } catch (NullPointerException e) {
+                LOG.warn("Exception trying to execute {}", command, e);
+            }
         }
     }
 }

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstanceTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstanceTest.java
index 566501356f99ecd79d8ddc5c8a02f514661ac082..16696ecba20c0065697b8bd9f660f2ebe34fa7a3 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstanceTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstanceTest.java
@@ -129,10 +129,10 @@ public class OvsdbConnectionInstanceTest {
         doReturn(listenableDbSchema).when(ovsdbConnectionInstance).getSchema(anyString());
         when(listenableDbSchema.get()).thenReturn(dbSchema);
 
-        suppress(MemberMatcher.method(OvsdbConnectionInstance.class, "monitorAllTables", String.class,
+        suppress(MemberMatcher.method(OvsdbConnectionInstance.class, "monitorTables", String.class,
                 DatabaseSchema.class));
         ovsdbConnectionInstance.registerCallbacks();
-        PowerMockito.verifyPrivate(ovsdbConnectionInstance, times(1)).invoke("monitorAllTables", anyString(),
+        PowerMockito.verifyPrivate(ovsdbConnectionInstance, times(1)).invoke("monitorTables", anyString(),
                 any(DatabaseSchema.class));
     }
 
@@ -165,8 +165,8 @@ public class OvsdbConnectionInstanceTest {
     @SuppressWarnings("unchecked")
     public void testMonitorAllTables() throws Exception {
         Set<String> tables = new HashSet<>();
-        tables.add("tableName1");
-        tables.add("tableName2");
+        tables.add("Open_vSwitch");
+        tables.add("Port");
         DatabaseSchema dbSchema = mock(DatabaseSchema.class);
         when(dbSchema.getName()).thenReturn(SouthboundConstants.OPEN_V_SWITCH);
         when(dbSchema.getTables()).thenReturn(tables);
@@ -176,6 +176,8 @@ public class OvsdbConnectionInstanceTest {
         Set<String> columns = new HashSet<>();
         columns.add("columnName1");
         columns.add("columnName2");
+        columns.add("_version");
+        columns.add("statistics");
         when(tableSchema.getColumns()).thenReturn(columns);
         MonitorRequestBuilder<GenericTableSchema> monitorBuilder = mock(MonitorRequestBuilder.class);
         PowerMockito.mockStatic(MonitorRequestBuilder.class);
@@ -193,11 +195,11 @@ public class OvsdbConnectionInstanceTest {
         MemberModifier.field(OvsdbConnectionInstance.class, "callback").set(ovsdbConnectionInstance, callback);
         doNothing().when(callback).update(any(TableUpdates.class), any(DatabaseSchema.class));
 
-        Whitebox.invokeMethod(ovsdbConnectionInstance, "monitorAllTables", "database", dbSchema);
-        PowerMockito.verifyPrivate(ovsdbConnectionInstance, times(1)).invoke("monitorAllTables", anyString(),
+        Whitebox.invokeMethod(ovsdbConnectionInstance, "monitorTables", "database", dbSchema);
+        PowerMockito.verifyPrivate(ovsdbConnectionInstance, times(1)).invoke("monitorTables", anyString(),
                 any(DatabaseSchema.class));
 
-        verify(monitorBuilder, times(4)).addColumn(anyString());
+        verify(monitorBuilder, times(6)).addColumn(anyString());
     }
 
     @SuppressWarnings({ "unchecked" })