From 49b252c9dac680d8085628375d55bc62b8f343a2 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Wed, 21 May 2014 06:25:02 -0700 Subject: [PATCH] Abort operation as per Section 5.2.8 of RFC 7047 Change-Id: I74dd7e09b4ffc3a44e9876570e004c6637a6666f Signed-off-by: Madhu Venugopal --- .../{AbortOperation.java => Abort.java} | 8 ++++++-- .../ovsdb/lib/operations/Operations.java | 4 ++++ .../opendaylight/ovsdb/lib/OvsDBClientTestIT.java | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) rename library/src/main/java/org/opendaylight/ovsdb/lib/operations/{AbortOperation.java => Abort.java} (63%) diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/operations/AbortOperation.java b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Abort.java similarity index 63% rename from library/src/main/java/org/opendaylight/ovsdb/lib/operations/AbortOperation.java rename to library/src/main/java/org/opendaylight/ovsdb/lib/operations/Abort.java index b219fe951..78c4b54ab 100644 --- a/library/src/main/java/org/opendaylight/ovsdb/lib/operations/AbortOperation.java +++ b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/Abort.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Red Hat, Inc. + * 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, @@ -9,6 +9,10 @@ */ package org.opendaylight.ovsdb.lib.operations; -public class AbortOperation extends Operation { +public class Abort extends Operation { + public static final String ABORT = "abort"; + public Abort() { + super(null, ABORT); + } } 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 364262f21..206ddd64e 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 @@ -32,4 +32,8 @@ public class Operations { public Commit commit(Boolean durable) { return new Commit(durable); } + + public Abort abort() { + return new Abort(); + } } \ 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 a5999ecf6..db69e1522 100644 --- a/library/src/test/java/org/opendaylight/ovsdb/lib/OvsDBClientTestIT.java +++ b/library/src/test/java/org/opendaylight/ovsdb/lib/OvsDBClientTestIT.java @@ -85,6 +85,21 @@ public class OvsDBClientTestIT extends OvsdbTestBase { Assert.assertFalse(operationResults.isEmpty()); System.out.println("Delete 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.abort()) + .execute(); + + operationResults = results.get(); + Assert.assertFalse(operationResults.isEmpty()); + System.out.println("Abort operation results = " + operationResults); + } @Test -- 2.36.6