Merge remote-tracking branch 'origin/master' into merge-branch

[netvirt.git] / northbound / src / main / java / org / opendaylight / ovsdb / northbound / OVSDBRow.java

diff --git a/northbound/src/main/java/org/opendaylight/ovsdb/northbound/OVSDBRow.java b/northbound/src/main/java/org/opendaylight/ovsdb/northbound/OVSDBRow.java
index 86567364aaa181e64c6c5bd1698585d377c01175..fc2624ec40b305a48613caeb22e41e3d53d31e95 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/ovsdb/northbound/OVSDBRow.java
+++ b/northbound/src/main/java/org/opendaylight/ovsdb/northbound/OVSDBRow.java
@@ -12,6 +12,7 @@ package org.opendaylight.ovsdb.northbound;
 import org.opendaylight.ovsdb.lib.table.Bridge;
 import org.opendaylight.ovsdb.lib.table.Capability;
 import org.opendaylight.ovsdb.lib.table.Controller;
+import org.opendaylight.ovsdb.lib.table.IPFIX;
 import org.opendaylight.ovsdb.lib.table.Interface;
 import org.opendaylight.ovsdb.lib.table.Manager;
 import org.opendaylight.ovsdb.lib.table.Mirror;
@@ -59,7 +60,8 @@ public class OVSDBRow {
         @JsonSubTypes.Type(value=Qos.class, name="QoS"),
         @JsonSubTypes.Type(value=Queue.class, name="Queue"),
         @JsonSubTypes.Type(value=SFlow.class, name="sFlow"),
-        @JsonSubTypes.Type(value=SSL.class, name="SSL")
+        @JsonSubTypes.Type(value=SSL.class, name="SSL"),
+        @JsonSubTypes.Type(value=IPFIX.class, name="IPFIX")
         })
     Table row;