From: Madhu Venugopal <mavenugo@gmail.com>
Date: Thu, 15 May 2014 21:37:27 +0000 (-0700)
Subject: Moving ipfix column to set<UUID> in Bridge table.
X-Git-Tag: release/helium~190
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=b0c145e7f8669a5102c39ec7ac979bbfbd6a6cab;p=ovsdb.git

Moving ipfix column to set<UUID> in Bridge table.

Please note that these fixes to the fixed tables will all be deprecated once the topic/schema
branch is collapsed into the master. These fixes are encouraged into the master only to support
existing users. That is the only reason we are not spending time with UT/IT scripts for these.

Change-Id: I48603ac3b204d4fde676100e95edcd02761d7586
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
---

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Bridge.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Bridge.java
index 9d0df0e8f..323ffa998 100644
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Bridge.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Bridge.java
@@ -34,7 +34,7 @@ public class Bridge extends Table<Bridge> {
     private Boolean stp_enable;
     private OvsDBMap<String, String> other_config;
     private OvsDBMap<String, String> external_ids;
-    UUID ipfix;
+    private OvsDBSet<UUID> ipfix;
 
     public Bridge() {
     }
@@ -158,13 +158,27 @@ public class Bridge extends Table<Bridge> {
         this.external_ids = external_ids;
     }
 
+    public void setSflow(OvsDBSet<UUID> sflow) {
+        this.sflow = sflow;
+    }
+
+    public OvsDBSet<UUID> getIpfix() {
+        return ipfix;
+    }
+
+    public void setIpfix(OvsDBSet<UUID> ipfix) {
+        this.ipfix = ipfix;
+    }
+
     @Override
     public String toString() {
-        return "Bridge [name=" + name + ", ports=" + ports + ", controller="
-                + controller + ", datapath_id=" + datapath_id
-                + ", datapath_type=" + datapath_type + ", fail_mode="
-                + fail_mode + ", status=" + status + ", stp_enable="
-                + stp_enable + ", other_config=" + other_config
-                + ", external_ids=" + external_ids + "]";
+        return "Bridge [name=" + name + ", ports=" + ports + ", mirrors="
+                + mirrors + ", controller=" + controller + ", datapath_id="
+                + datapath_id + ", datapath_type=" + datapath_type
+                + ", fail_mode=" + fail_mode + ", sflow=" + sflow
+                + ", netflow=" + netflow + ", protocols=" + protocols
+                + ", status=" + status + ", stp_enable=" + stp_enable
+                + ", other_config=" + other_config + ", external_ids="
+                + external_ids + ", ipfix=" + ipfix + "]";
     }
 }