Fixed a bug in where condition usage in Update & Delete operations.

Also moved Delete operation to a seperate transaction in the Test code to test multiple transactions.

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

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Delete.java b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Delete.java
index 006721290080a80492dab4919b0e63cd2d618985..c4e82904c7a1fdce9487b76cd726794bfdaf9333 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Delete.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Delete.java
@@ -11,11 +11,12 @@
 
 package org.opendaylight.ovsdb.lib.operations;
 
-import com.google.common.collect.Lists;
+import java.util.List;
+
 import org.opendaylight.ovsdb.lib.notation.Condition;
 import org.opendaylight.ovsdb.lib.schema.TableSchema;
 
-import java.util.List;
+import com.google.common.collect.Lists;
 
 public class Delete<E extends TableSchema<E>> extends Operation<E> implements ConditionalOperation {
 
@@ -32,6 +33,7 @@ public class Delete<E extends TableSchema<E>> extends Operation<E> implements Co
     }
 
     public Where where(Condition condition) {
+        where.add(condition);
         return new Where(this);
     }
 

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Update.java b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Update.java
index 29c5d2dd1bf3b21c6ea12ce1e7dbb9f77e3326f3..0fba9e2d65d16760d848d79d20f83a74e35933ae 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Update.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Update.java
@@ -12,14 +12,15 @@
 
 package org.opendaylight.ovsdb.lib.operations;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import java.util.List;
+import java.util.Map;
+
 import org.opendaylight.ovsdb.lib.notation.Condition;
 import org.opendaylight.ovsdb.lib.schema.ColumnSchema;
 import org.opendaylight.ovsdb.lib.schema.TableSchema;
 
-import java.util.List;
-import java.util.Map;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 
 public class Update<E extends TableSchema<E>> extends Operation<E> implements ConditionalOperation {
 
@@ -45,6 +46,7 @@ public class Update<E extends TableSchema<E>> extends Operation<E> implements Co
     }
 
     public Where where(Condition condition) {
+        where.add(condition);
         return new Where(this);
     }
 

diff --git a/library/src/test/java/org/opendaylight/ovsdb/lib/OvsDBClientTestIT.java b/library/src/test/java/org/opendaylight/ovsdb/lib/OvsDBClientTestIT.java
index 4d9069e3fb6b2b718995aa0014ab7339a3ec2f7a..a5999ecf65370c731752fd1d58dcacf5514ad075 100644 (file)
--- a/library/src/test/java/org/opendaylight/ovsdb/lib/OvsDBClientTestIT.java
+++ b/library/src/test/java/org/opendaylight/ovsdb/lib/OvsDBClientTestIT.java
@@ -67,15 +67,24 @@ public class OvsDBClientTestIT extends OvsdbTestBase {
                         .where(name.opEqual("br-int"))
                         //.and(name.opEqual("br-int"))
                         .operation())
+                .add(op.commit(true))
+                .execute();
+
+        List<OperationResult> operationResults = results.get();
+        Assert.assertFalse(operationResults.isEmpty());
+        System.out.println("Insert & Update operation results = " + operationResults);
+
+        results = ovs.transactBuilder()
                 .add(op.delete(bridge)
                         .where(name.opEqual("br-int"))
                         .operation())
                 .add(op.commit(true))
                 .execute();
 
-        List<OperationResult> operationResults = results.get();
+        operationResults = results.get();
         Assert.assertFalse(operationResults.isEmpty());
-        System.out.println("operationResults = " + operationResults);
+        System.out.println("Delete operation results = " + operationResults);
+
     }
 
     @Test