Merge "Changed lookup of Controller IP to the following: - Start with OVSDB config...

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

diff --git a/northbound/ovsdb/src/main/java/org/opendaylight/ovsdb/northbound/OVSDBRow.java b/northbound/ovsdb/src/main/java/org/opendaylight/ovsdb/northbound/OVSDBRow.java
index 24e849a1871b830c86e5497e930575443152663f..5bdb3c8ff187bd10400bee5b9c6951ee1f141e82 100644 (file)
--- a/northbound/ovsdb/src/main/java/org/opendaylight/ovsdb/northbound/OVSDBRow.java
+++ b/northbound/ovsdb/src/main/java/org/opendaylight/ovsdb/northbound/OVSDBRow.java
@@ -1,7 +1,17 @@
+/*
+ * Copyright (C) 2013 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Authors : Madhu Venugopal, Brent Salisbury
+ */
 package org.opendaylight.ovsdb.northbound;
 
 import org.codehaus.jackson.annotate.JsonSubTypes;
 import org.codehaus.jackson.annotate.JsonTypeInfo;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.opendaylight.ovsdb.lib.table.Bridge;
 import org.opendaylight.ovsdb.lib.table.Capability;
 import org.opendaylight.ovsdb.lib.table.Controller;
@@ -17,6 +27,7 @@ import org.opendaylight.ovsdb.lib.table.SFlow;
 import org.opendaylight.ovsdb.lib.table.SSL;
 import org.opendaylight.ovsdb.lib.table.internal.Table;
 
+@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
 public class OVSDBRow {
     String parent_uuid;
     /*
@@ -53,6 +64,12 @@ public class OVSDBRow {
 
     public OVSDBRow() {
     }
+
+    public OVSDBRow(String parent_uuid, Table row) {
+        this.parent_uuid = parent_uuid;
+        this.row = row;
+    }
+
     public String getParent_uuid() {
         return parent_uuid;
     }