Merge "Added Mutate operation" into topic/schema

diff --combined library/src/main/java/org/opendaylight/ovsdb/lib/operations/Operations.java
index 912ff67caa5d3c961cadc8bbfab0c0d08533ecdd,b86af3406e0d0e1d12b4319de1a571d890a5a420..c88b0adecbdc5649d28bbe234e1ab4381aa5f50c
--- 1/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Operations.java
--- 2/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Operations.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Operations.java
@@@ -29,6 -29,10 +29,10 @@@ public class Operations 
          return new Delete<>(schema);
      }
  
+     public <E extends TableSchema<E>> Mutate<E> mutate(TableSchema<E> schema) {
+         return new Mutate<>(schema);
+     }
+ 
      public Commit commit(Boolean durable) {
          return new Commit(durable);
      }
@@@ -41,15 -45,4 +45,15 @@@
          return new Select<>(schema);
      }
  
 -}
 +    public Comment comment(String comment) {
 +        return new Comment(comment);
 +    }
 +
 +    /*
 +     * Could not use Java keyword "assert" which clashes with the ovsdb json-rpc method.
 +     * using assertion instead.
 +     */
 +    public Assert assertion(String lock) {
 +        return new Assert(lock);
 +    }
- }
++}

diff --combined library/src/test/java/org/opendaylight/ovsdb/lib/OvsDBClientTestIT.java
index c09afc1293219323526a7f1142ee278aae44e10d,de49027e4806a8660ed62e8b9c11b2a3106181f5..2a25b22a64f68462590fa7afbbc1ba44380f3283
--- 1/library/src/test/java/org/opendaylight/ovsdb/lib/OvsDBClientTestIT.java
--- 2/library/src/test/java/org/opendaylight/ovsdb/lib/OvsDBClientTestIT.java
+++ b/library/src/test/java/org/opendaylight/ovsdb/lib/OvsDBClientTestIT.java
@@@ -9,12 -9,14 +9,12 @@@
   */
  package org.opendaylight.ovsdb.lib;
  
 -import com.google.common.collect.Lists;
 -import com.google.common.collect.Sets;
 -import com.google.common.util.concurrent.ListenableFuture;
  import static org.opendaylight.ovsdb.lib.operations.Operations.op;
  
  import java.io.IOException;
  import java.util.List;
  import java.util.Map;
 +import java.util.Set;
  import java.util.concurrent.ExecutionException;
  import java.util.concurrent.ExecutorService;
  import java.util.concurrent.Executors;
@@@ -30,6 -32,7 +30,7 @@@ import org.opendaylight.ovsdb.lib.messa
  import org.opendaylight.ovsdb.lib.message.TableUpdate;
  import org.opendaylight.ovsdb.lib.message.TableUpdates;
  import org.opendaylight.ovsdb.lib.message.UpdateNotification;
+ import org.opendaylight.ovsdb.lib.notation.Mutator;
  import org.opendaylight.ovsdb.lib.operations.OperationResult;
  import org.opendaylight.ovsdb.lib.schema.ColumnSchema;
  import org.opendaylight.ovsdb.lib.schema.DatabaseSchema;
@@@ -38,9 -41,7 +39,9 @@@ import org.opendaylight.ovsdb.lib.schem
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
 -import java.util.Set;
 +import com.google.common.collect.Lists;
 +import com.google.common.collect.Sets;
 +import com.google.common.util.concurrent.ListenableFuture;
  
  
  public class OvsDBClientTestIT extends OvsdbTestBase {
@@@ -65,20 -66,22 +66,24 @@@
  
          ListenableFuture<List<OperationResult>> results = ovs.transactBuilder()
                  .add(op.insert(bridge)
 -                        .value(name, "br-int")
 -                        .value(flood_vlans, Sets.newHashSet(100, 101, 4001))
 -                )
 +                        .value(name, "br-test")
 +                        .value(flood_vlans, Sets.newHashSet(100, 101, 4001)))
 +                .add(op.comment("Inserting Bridge br-int"))
                  .add(op.update(bridge)
                          .set(fail_mode, "secure")
                          .where(name.opEqual("br-int"))
                          .operation())
 +                .add(op.comment("Updating fail_mode to secure on Bridge br-int"))
                  .add(op.select(bridge)
                          .column(name)
                          .where(name.opEqual("br-int"))
                          .operation())
+                 .add(op.mutate(bridge)
+                         .addMutation(flood_vlans, Mutator.INSERT, Sets.newHashSet(100, 101, 4001))
+                         .where(name.opEqual("br-int"))
+                         .operation())
                  .add(op.commit(true))
 +                .add(op.comment("Commiting the operation"))
                  .execute();
  
          List<OperationResult> operationResults = results.get();
@@@ -89,9 -92,7 +94,9 @@@
                  .add(op.delete(bridge)
                          .where(name.opEqual("br-int"))
                          .operation())
 +                .add(op.comment("Deleting Bridge br-int"))
                  .add(op.commit(true))
 +                .add(op.comment("Commiting the operation"))
                  .execute();
  
          operationResults = results.get();
@@@ -111,27 -112,8 +116,27 @@@
  
          operationResults = results.get();
          Assert.assertFalse(operationResults.isEmpty());
 +        /* Testing for Abort Error */
 +        Assert.assertFalse(operationResults.get(1).getError() == null);
          System.out.println("Abort operation results = " + operationResults);
  
 +        /*
 +         * Adding a separate Abort operation in a transaction. Lets not mix this with other
 +         * valid transactions as above.
 +         */
 +        results = ovs.transactBuilder()
 +                .add(op.delete(bridge)
 +                        .where(name.opEqual("br-int"))
 +                        .operation())
 +                .add(op.assertion("Assert12345")) // Failing intentionally
 +                .execute();
 +
 +        operationResults = results.get();
 +        Assert.assertFalse(operationResults.isEmpty());
 +        /* Testing for an Assertion Error */
 +        Assert.assertFalse(operationResults.get(1).getError() == null);
 +        System.out.println("Assert operation results = " + operationResults);
 +
      }
  
      @Test