Commit operation as per Section 5.2.7 of RFC 7047

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

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Commit.java b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Commit.java
new file mode 100644 (file)
index 0000000..19ddd8d
--- /dev/null
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Commit.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2014 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
+ */
+package org.opendaylight.ovsdb.lib.operations;
+
+
+public class Commit extends Operation {
+
+    public static final String COMMIT = "commit";
+    Boolean durable;
+
+    public Commit(Boolean durable) {
+        super(null, COMMIT);
+        this.durable = durable;
+    }
+
+    public Boolean isDurable() {
+        return durable;
+    }
+}

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/operations/CommitOperation.java b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/CommitOperation.java
deleted file mode 100644 (file)
index fec4e1f..0000000
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/operations/CommitOperation.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * 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
- */
-package org.opendaylight.ovsdb.lib.operations;
-
-public class CommitOperation extends Operation {
-
-}

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Operation.java b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Operation.java
index 1949d5db068611c7e53312d1f5406d7cc8de20db..00156aa9364d606a806cc10d9e3244c8d83c65ff 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Operation.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Operation.java
@@ -9,9 +9,10 @@
  */
 package org.opendaylight.ovsdb.lib.operations;
 
+import org.opendaylight.ovsdb.lib.schema.TableSchema;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.opendaylight.ovsdb.lib.schema.TableSchema;
 
 public abstract class Operation<E extends TableSchema<E>> {
 
@@ -64,7 +65,7 @@ public abstract class Operation<E extends TableSchema<E>> {
 
     @JsonProperty
     public String getTable() {
-        return tableSchema.getName();
+        return (tableSchema == null) ? null : tableSchema.getName();
     }
 
     @Override

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Operations.java b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Operations.java
index 4e84de23be20e4631d6a5e3aefa38299df400887..364262f2197dd0d1afdbd344153ae2b0f6d0df82 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Operations.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Operations.java
@@ -29,4 +29,7 @@ public class Operations {
         return new Delete<>(schema);
     }
 
+    public Commit commit(Boolean durable) {
+        return new Commit(durable);
+    }
 }
\ No newline at end of file

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 26ba3a673d0257233c4de814f47da10502394d5e..4d9069e3fb6b2b718995aa0014ab7339a3ec2f7a 100644 (file)
--- a/library/src/test/java/org/opendaylight/ovsdb/lib/OvsDBClientTestIT.java
+++ b/library/src/test/java/org/opendaylight/ovsdb/lib/OvsDBClientTestIT.java
@@ -9,9 +9,17 @@
  */
 package org.opendaylight.ovsdb.lib;
 
-import com.google.common.collect.Lists;
-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.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 import junit.framework.Assert;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.ovsdb.lib.message.MonitorRequest;
@@ -29,14 +37,8 @@ import org.opendaylight.ovsdb.lib.schema.TableSchema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import static org.opendaylight.ovsdb.lib.operations.Operations.op;
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.ListenableFuture;
 
 
 public class OvsDBClientTestIT extends OvsdbTestBase {
@@ -68,6 +70,7 @@ public class OvsDBClientTestIT extends OvsdbTestBase {
                 .add(op.delete(bridge)
                         .where(name.opEqual("br-int"))
                         .operation())
+                .add(op.commit(true))
                 .execute();
 
         List<OperationResult> operationResults = results.get();