From ca4736be3078110ca5a6a61419e67e0c56ac925f Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Wed, 21 May 2014 05:51:44 -0700 Subject: [PATCH] Commit operation as per Section 5.2.7 of RFC 7047 Change-Id: I9fd5ef994163549ea18e1fee7979c3105e8eb5f8 Signed-off-by: Madhu Venugopal --- .../ovsdb/lib/operations/Commit.java | 26 +++++++++++++++++++ .../ovsdb/lib/operations/CommitOperation.java | 14 ---------- .../ovsdb/lib/operations/Operation.java | 5 ++-- .../ovsdb/lib/operations/Operations.java | 3 +++ .../ovsdb/lib/OvsDBClientTestIT.java | 23 +++++++++------- 5 files changed, 45 insertions(+), 26 deletions(-) create mode 100644 library/src/main/java/org/opendaylight/ovsdb/lib/operations/Commit.java delete mode 100644 library/src/main/java/org/opendaylight/ovsdb/lib/operations/CommitOperation.java 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 index 000000000..19ddd8dd8 --- /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 index fec4e1f77..000000000 --- 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 1949d5db0..00156aa93 100644 --- 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> { @@ -64,7 +65,7 @@ public abstract class Operation> { @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 4e84de23b..364262f21 100644 --- 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 26ba3a673..4d9069e3f 100644 --- 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 operationResults = results.get(); -- 2.36.6