Modified a few fields from OVSDB ambiguity

Change-Id: Id86437e91ea77e76e2685c9209cb92b3f3b1e5c3
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdates.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdates.java
index 6311666c9a67b7b6845a9a31fd550c7f9f7584f2..f484102c00a3960bfa52f57079da7a57f5eab587 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdates.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdates.java
@@ -11,15 +11,29 @@ package org.opendaylight.ovsdb.lib.message;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.Maps;
+import org.opendaylight.ovsdb.lib.table.Bridge;
+import org.opendaylight.ovsdb.lib.table.Capability;
+import org.opendaylight.ovsdb.lib.table.Interface;
+import org.opendaylight.ovsdb.lib.table.Port;
+import org.opendaylight.ovsdb.lib.table.Controller;
+import org.opendaylight.ovsdb.lib.table.Manager;
+import org.opendaylight.ovsdb.lib.table.Mirror;
+import org.opendaylight.ovsdb.lib.table.NetFlow;
+import org.opendaylight.ovsdb.lib.table.Open_vSwitch;
+import org.opendaylight.ovsdb.lib.table.Qos;
+import org.opendaylight.ovsdb.lib.table.Queue;
+import org.opendaylight.ovsdb.lib.table.SFlow;
+import org.opendaylight.ovsdb.lib.table.SSL;
+import org.opendaylight.ovsdb.lib.table.Flow_Sample_Collector_Set;
+import org.opendaylight.ovsdb.lib.table.Flow_Table;
+import org.opendaylight.ovsdb.lib.table.IPFIX;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 import java.util.Map;
 import java.util.Set;
 
-import org.opendaylight.ovsdb.lib.table.*;
-import org.opendaylight.ovsdb.lib.table.internal.Table;
-
 
-public  class TableUpdates extends Response {
+public class TableUpdates extends Response {
 
     Map<Table.Name, TableUpdate> map = Maps.newHashMap();
 
@@ -32,12 +46,10 @@ public  class TableUpdates extends Response {
         return map.get(name);
     }
 
-
     private <T extends Table> void put(Table.Name<T> name, TableUpdate<T> update) {
         map.put(name, update);
     }
 
-
     @JsonProperty("Interface")
     public TableUpdate<Interface> getInterfaceUpdate() {
         return getUpdate(Interface.NAME);
@@ -154,4 +166,31 @@ public  class TableUpdates extends Response {
     public void setSSLUpdate(TableUpdate<SSL> sslUpdate) {
         put(SSL.NAME, sslUpdate);
     }
+
+    @JsonProperty("Flow_Table")
+    public TableUpdate<Flow_Table> getFlow_TableUpdate() {
+        return getUpdate(Flow_Table.NAME);
+    }
+
+    public void setFlow_TableUpdate(TableUpdate<Flow_Table> Flow_TableUpdate) {
+        put(Flow_Table.NAME, Flow_TableUpdate);
+    }
+
+    @JsonProperty("Flow_Sample_Collector_Set")
+    public TableUpdate<Flow_Sample_Collector_Set> getFlow_Sample_Collector_SetUpdate() {
+        return getUpdate(Flow_Sample_Collector_Set.NAME);
+    }
+
+    public void setFlow_Sample_Collector_SetUpdate(TableUpdate<Flow_Sample_Collector_Set> Flow_Sample_Collector_SetUpdate) {
+        put(Flow_Sample_Collector_Set.NAME, Flow_Sample_Collector_SetUpdate);
+    }
+
+    @JsonProperty("IPFIX")
+    public TableUpdate<IPFIX> getIPFIXUpdate() {
+        return getUpdate(IPFIX.NAME);
+    }
+
+    public void setIPFIXUpdate(TableUpdate<IPFIX> IPFIXUpdate) {
+        put(IPFIX.NAME, IPFIXUpdate);
+    }
 }

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Flow_Sample_Collector_Set.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Flow_Sample_Collector_Set.java
new file mode 100644 (file)
index 0000000..8b2117f
--- /dev/null
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Flow_Sample_Collector_Set.java
@@ -0,0 +1,78 @@
+package org.opendaylight.ovsdb.lib.table;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.opendaylight.ovsdb.lib.notation.OvsDBMap;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
+
+/**
+ * Per ovs-vswitchd.conf.db 2.0.90
+ *
+ * A summary of the Flow_Sample_Collector_Set fields:
+ * bridge           Bridge
+ * ipfix             ipfix (optional)
+ * external_ids     map of string-string pairs
+ */
+
+public class Flow_Sample_Collector_Set extends Table<Flow_Sample_Collector_Set> {
+
+    public static final Name<Flow_Sample_Collector_Set> NAME = new Name<Flow_Sample_Collector_Set>("Flow_Sample_Collector_Set") {};
+
+    private Integer id;
+    private Bridge bridge;
+    private IPFIX ipfix;
+    private OvsDBMap<String, String> external_ids;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Bridge getBridge() {
+        return bridge;
+    }
+
+    public void setBridge(Bridge bridge) {
+        this.bridge = bridge;
+    }
+
+    public IPFIX getIpfix() {
+        return ipfix;
+    }
+
+    public void setIpfix(IPFIX ipfix) {
+        this.ipfix = ipfix;
+    }
+
+    public OvsDBMap<String, String> getExternal_ids() {
+        return external_ids;
+    }
+
+    public void setExternal_ids(OvsDBMap<String, String> external_ids) {
+        this.external_ids = external_ids;
+    }
+
+    @Override
+    @JsonIgnore
+    public Name<Flow_Sample_Collector_Set> getTableName() {
+        return NAME;
+    }
+
+    @Override
+    public String toString() {
+        return "Flow_Sample_Collector_Set [" +
+                "id=" + id +
+                ", bridge=" + bridge +
+                ", ipfix=" + ipfix +
+                ", external_ids=" + external_ids +
+                "]";
+    }
+
+    public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column<Flow_Sample_Collector_Set> {
+        id,
+        bridge,
+        external_ids,
+    }
+}

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Flow_Table.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Flow_Table.java
new file mode 100644 (file)
index 0000000..e7a085b
--- /dev/null
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Flow_Table.java
@@ -0,0 +1,77 @@
+package org.opendaylight.ovsdb.lib.table;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
+
+/**
+ * Per ovs-vswitchd.conf.db 2.0.90
+ *
+ * Summary of the Flow_Table fields:
+ * name optional    string
+ * flow_limit       integer, at least 0 (optional)
+ * overflow_policy  optional string, either refuse or evict
+ * groups           set of strings
+ */
+
+public class Flow_Table extends Table<Flow_Table> {
+
+    public static final Name<Flow_Table> NAME = new Name<Flow_Table>("Flow_Table") {};
+
+    private String name;
+    private Integer flow_limit;
+    private OvsDBSet<String> overflow_policy;
+    private OvsDBSet<String> groups;
+
+    public Flow_Table() {
+    }
+
+    public Integer getFlow_limit() {
+        return flow_limit;
+    }
+
+    public void setFlow_limit(Integer flow_limit) {
+        this.flow_limit = flow_limit;
+    }
+
+    public OvsDBSet<String> getOverflow_policy() {
+        return overflow_policy;
+    }
+
+    public void setOverflow_policy(OvsDBSet<String> overflow_policy) {
+        this.overflow_policy = overflow_policy;
+    }
+
+    public OvsDBSet<String> getGroups() {
+        return groups;
+    }
+
+    public void setGroups(OvsDBSet<String> groups) {
+        this.groups = groups;
+    }
+
+    @Override
+    @JsonIgnore
+    public Name<Flow_Table> getTableName() {
+        return NAME;
+    }
+
+    @Override
+    public String toString() {
+        return "Flow_Table [" +
+                "name=" + name +
+                ", flow_limit=" + flow_limit +
+                ", overflow_policy=" + overflow_policy +
+                ", groups=" + groups +
+                "]";
+    }
+
+
+    public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column<Flow_Table> {
+        name,
+        flow_limit,
+        overflow_policy,
+        groups,
+
+    }
+}
\ No newline at end of file

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/IPFIX.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/IPFIX.java
new file mode 100644 (file)
index 0000000..01b39c9
--- /dev/null
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/IPFIX.java
@@ -0,0 +1,109 @@
+package org.opendaylight.ovsdb.lib.table;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.opendaylight.ovsdb.lib.notation.OvsDBMap;
+import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
+
+/**
+ * Per ovs-vswitchd.conf.db 2.0.90
+ *
+ * Summary of the IPFIX fields:
+ * targets               set of 1 or more strings
+ * sampling              integer, in range 1 to 4,294,967,295 (optional)
+ * obs_domain_id         integer, in range 0 to 4,294,967,295 (optional)
+ * obs_point_id          integer, in range 0 to 4,294,967,295 (optional)
+ * cache_active_timeout  integer, in range 0 to 4,200 (optional)
+ * cache_max_flows        integer, in range 0 to 4,294,967,295 (optional)
+ */
+
+public class IPFIX extends Table<IPFIX> {
+
+    public static final Name<IPFIX> NAME = new Name<IPFIX>("IPFIX") {};
+
+    private OvsDBSet<String> targets;
+    private OvsDBSet<Integer> sampling;
+    private Integer obs_domain_id;
+    private Integer obs_point_id;
+    private OvsDBSet<Integer> cache_active_timeout;
+    private OvsDBSet<Integer> cache_max_flows;
+    private OvsDBMap<String, String> external_ids;
+
+    public IPFIX() {
+    }
+
+    public OvsDBSet<String> getTargets() {
+        return targets;
+    }
+
+    public void setTargets(OvsDBSet<String> targets) {
+        this.targets = targets;
+    }
+
+    public OvsDBSet<Integer> getSampling() {
+        return sampling;
+    }
+
+    public void setSampling(OvsDBSet<Integer> sampling) {
+        this.sampling = sampling;
+    }
+
+    public Integer getObs_domain_id() {
+        return obs_domain_id;
+    }
+
+    public void setObs_domain_id(Integer obs_domain_id) {
+        this.obs_domain_id = obs_domain_id;
+    }
+
+    public Integer getObs_point_id() {
+        return obs_point_id;
+    }
+
+    public void setObs_point_id(Integer obs_point_id) {
+        this.obs_point_id = obs_point_id;
+    }
+
+    public OvsDBSet<Integer> getCache_active_timeout() {
+        return cache_active_timeout;
+    }
+
+    public void setCache_active_timeout(OvsDBSet<Integer> cache_active_timeout) {
+        this.cache_active_timeout = cache_active_timeout;
+    }
+
+    public OvsDBSet<Integer> getCache_max_flows() {
+        return cache_max_flows;
+    }
+
+    public void setCache_max_flows(OvsDBSet<Integer> cache_max_flows) {
+        this.cache_max_flows = cache_max_flows;
+    }
+
+    public OvsDBMap<String, String> getExternal_ids() {
+        return external_ids;
+    }
+
+    public void setExternal_ids(OvsDBMap<String, String> external_ids) {
+        this.external_ids = external_ids;
+    }
+
+    @Override
+    @JsonIgnore
+    public Name<IPFIX> getTableName() {
+        return NAME;
+    }
+
+    @Override
+    public String toString() {
+        return "IPFIX [" +
+                "targets=" + targets +
+                ", sampling=" + sampling +
+                ", obs_domain_id=" + obs_domain_id +
+                ", obs_point_id=" + obs_point_id +
+                ", cache_active_timeout=" + cache_active_timeout +
+                ", cache_max_flows=" + cache_max_flows +
+                ", external_ids=" + external_ids +
+                "]";
+    }
+}

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Tables.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Tables.java
index 30f7635508e7e2c8adbb2316ec9b6d004239d79d..b66a49ee4769d3c5287b0bab3b8e92c08d475aa6 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Tables.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Tables.java
@@ -9,13 +9,29 @@
  */
 package org.opendaylight.ovsdb.lib.table.internal;
 
+import org.opendaylight.ovsdb.lib.table.Bridge;
+import org.opendaylight.ovsdb.lib.table.Capability;
+import org.opendaylight.ovsdb.lib.table.Interface;
+import org.opendaylight.ovsdb.lib.table.Port;
+import org.opendaylight.ovsdb.lib.table.Controller;
+import org.opendaylight.ovsdb.lib.table.Manager;
+import org.opendaylight.ovsdb.lib.table.Mirror;
+import org.opendaylight.ovsdb.lib.table.NetFlow;
+import org.opendaylight.ovsdb.lib.table.Open_vSwitch;
+import org.opendaylight.ovsdb.lib.table.Qos;
+import org.opendaylight.ovsdb.lib.table.Queue;
+import org.opendaylight.ovsdb.lib.table.SFlow;
+import org.opendaylight.ovsdb.lib.table.SSL;
+import org.opendaylight.ovsdb.lib.table.Flow_Sample_Collector_Set;
+import org.opendaylight.ovsdb.lib.table.Flow_Table;
+import org.opendaylight.ovsdb.lib.table.IPFIX;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.opendaylight.ovsdb.lib.table.*;
-
 public class Tables {
     public static List<Table> tables = new ArrayList<Table>();
+
     static {
         tables.add(new Bridge());
         tables.add(new Port());
@@ -30,7 +46,11 @@ public class Tables {
         tables.add(new Queue());
         tables.add(new SFlow());
         tables.add(new SSL());
+        tables.add(new Flow_Sample_Collector_Set());
+        tables.add(new Flow_Table());
+        tables.add(new IPFIX());
     }
+
     public static List<Table> getTables() {
         return tables;
     }