Bug 6463 - Monitoring _version column on the ovsdb

table is generating huge updates from switch

Change-Id: I421d2af0adabb2197af7ec2ccb68a2e95e58d2e1
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

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 e2c23a2d3310fe527732500990b965e790a6738b..1045bbaa0b397cedc69fcdc650d0e1a9d4665bdf 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
@@ -151,12 +151,19 @@ public class SouthboundConstants {
                     + "Flow_Sample_Collector_Set Table is skipped")
             .build();
 
+    //Note: _version is an internal column of ovsdb schema, that gets updated
+    //with every change in the row of the table.
     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"}))
+            .put("Open_vSwitch", Arrays.asList(new String[]{"statistics","_version"}))
+            .put("Port", Arrays.asList(new String[]{"statistics","_version"}))
+            .put("Manager", Arrays.asList(new String[]{"_version"}))
+            .put("SSL", Arrays.asList(new String[]{"_version"}))
+            .put("QoS", Arrays.asList(new String[]{"_version"}))
+            .put("Queue", Arrays.asList(new String[]{"_version"}))
+            .put("Bridge", Arrays.asList(new String[]{"_version"}))
+            .put("Interface", Arrays.asList(new String[]{"statistics","_version"}))
+            .put("Controller", Arrays.asList(new String[]{"status","_version"}))
             .build();
 
     public enum VlanModes {

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 16696ecba20c0065697b8bd9f660f2ebe34fa7a3..b1e2c2d556fafb48eb0a637854903eb5417a7ab5 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
@@ -199,7 +199,7 @@ public class OvsdbConnectionInstanceTest {
         PowerMockito.verifyPrivate(ovsdbConnectionInstance, times(1)).invoke("monitorTables", anyString(),
                 any(DatabaseSchema.class));
 
-        verify(monitorBuilder, times(6)).addColumn(anyString());
+        verify(monitorBuilder, times(4)).addColumn(anyString());
     }
 
     @SuppressWarnings({ "unchecked" })