Removed the static usage of open_vSwitch from transactBuilder and made it a dynamic...

The actual change is in TransactBuilder.java
-        List<Object> lists = Lists.newArrayList((Object)"Open_vSwitch");
+        List<Object> lists = Lists.newArrayList((Object)dbSchema.getName());

But this change of passing the databaseSchema to the TransactBuilder calls for changing a
few APIs across the library.

This fix is needed in order for hardware_vtep testing to proceed.

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

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/library/OvsdbLibraryIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/library/OvsdbLibraryIT.java
index 5f1a22bc1f3d2f5be303f2110a0583163de59109..81ec74049205993342abcc2041a74d2025f4b93f 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/library/OvsdbLibraryIT.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/library/OvsdbLibraryIT.java
@@ -134,7 +134,7 @@ public class OvsdbLibraryIT extends OvsdbIntegrationTestBase {
 
     static String testBridgeName = "br_test";
     static UUID testBridgeUuid = null;
-    private void createTypedBridge() throws IOException, InterruptedException, ExecutionException, NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+    private void createTypedBridge(DatabaseSchema dbSchema) throws IOException, InterruptedException, ExecutionException, NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
         Bridge bridge = client.createTypedRowWrapper(Bridge.class);
         bridge.setName(testBridgeName);
         bridge.setStatus(ImmutableMap.of("key","value"));
@@ -145,7 +145,7 @@ public class OvsdbLibraryIT extends OvsdbIntegrationTestBase {
 
         int insertOperationIndex = 0;
 
-        TransactionBuilder transactionBuilder = client.transactBuilder()
+        TransactionBuilder transactionBuilder = client.transactBuilder(dbSchema)
                 .add(op.insert(bridge.getSchema())
                         .withId(testBridgeName)
                         .value(bridge.getNameColumn()))
@@ -182,7 +182,7 @@ public class OvsdbLibraryIT extends OvsdbIntegrationTestBase {
                                                      " with Tables : " + dbSchema.getTables());
 
             // A simple Typed Test to make sure a Typed wrapper bundle can coexist in an OSGi environment
-            createTypedBridge();
+            createTypedBridge(dbSchema);
         }
 
         if (isSchemaSupported(HARDWARE_VTEP)) {
@@ -197,8 +197,8 @@ public class OvsdbLibraryIT extends OvsdbIntegrationTestBase {
     public void tearDown() throws InterruptedException, ExecutionException {
         Bridge bridge = client.getTypedRowWrapper(Bridge.class, null);
         OpenVSwitch openVSwitch = client.getTypedRowWrapper(OpenVSwitch.class, null);
-
-        ListenableFuture<List<OperationResult>> results = client.transactBuilder()
+        DatabaseSchema dbSchema = client.getSchema(OPEN_VSWITCH_SCHEMA).get();
+        ListenableFuture<List<OperationResult>> results = client.transactBuilder(dbSchema)
                 .add(op.delete(bridge.getSchema())
                         .where(bridge.getNameColumn().getSchema().opEqual(testBridgeName))
                         .build())

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/OvsdbClient.java b/library/src/main/java/org/opendaylight/ovsdb/lib/OvsdbClient.java
index cefa4bf92d5fdc66b1b8ab8607414e211d416b78..34a0d2eb8bfd4f812606d93ed046df88f8a9c20b 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/OvsdbClient.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/OvsdbClient.java
@@ -50,7 +50,7 @@ public interface OvsdbClient {
      * Allows for a mini DSL way of collecting the transactions to be executed against the ovsdb instance.
      * @return TransactionBuilder
      */
-    TransactionBuilder transactBuilder();
+    TransactionBuilder transactBuilder(DatabaseSchema dbSchema);
 
     /**
      * Execute the list of operations in a single Transactions. Similar to the transactBuilder() method
@@ -59,7 +59,7 @@ public interface OvsdbClient {
      * cancel on the Future would cause OVSDB cancel operation to be fired against
      * the device.
      */
-    ListenableFuture<List<OperationResult>> transact(List<Operation> operations);
+    ListenableFuture<List<OperationResult>> transact(DatabaseSchema dbSchema, List<Operation> operations);
 
 
     /**

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java b/library/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java
index c2afd024fa376a130e64ea33c6eb3e48bb8887e6..3ddccc044351c268a4a76e944087742b4f22c270 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java
@@ -9,17 +9,17 @@
  */
 package org.opendaylight.ovsdb.lib.impl;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
 import io.netty.channel.Channel;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+
 import org.opendaylight.ovsdb.lib.EchoServiceCallbackFilters;
 import org.opendaylight.ovsdb.lib.LockAquisitionCallback;
 import org.opendaylight.ovsdb.lib.LockStolenCallback;
@@ -48,14 +48,16 @@ import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.UUID;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.base.Function;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
 
 
 public class OvsdbClientImpl implements OvsdbClient {
@@ -134,10 +136,10 @@ public class OvsdbClientImpl implements OvsdbClient {
     }
 
     @Override
-    public ListenableFuture<List<OperationResult>> transact(List<Operation> operations) {
+    public ListenableFuture<List<OperationResult>> transact(DatabaseSchema dbSchema, List<Operation> operations) {
 
         //todo, we may not need transactionbuilder if we can have JSON objects
-        TransactBuilder builder = new TransactBuilder();
+        TransactBuilder builder = new TransactBuilder(dbSchema);
         for (Operation o : operations) {
             builder.addOperation(o);
         }
@@ -213,8 +215,8 @@ public class OvsdbClientImpl implements OvsdbClient {
     }
 
     @Override
-    public TransactionBuilder transactBuilder() {
-        return new TransactionBuilder(this);
+    public TransactionBuilder transactBuilder(DatabaseSchema dbSchema) {
+        return new TransactionBuilder(this, dbSchema);
     }
 
 

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/message/TransactBuilder.java b/library/src/main/java/org/opendaylight/ovsdb/lib/message/TransactBuilder.java
index 344c1b6584caeb8849d9dbfaf0b3b49997a66d14..07a5a175cdc9abbf2fbbdde62c5bac0151772c30 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/message/TransactBuilder.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/message/TransactBuilder.java
@@ -9,15 +9,21 @@
  */
 package org.opendaylight.ovsdb.lib.message;
 
-import com.google.common.collect.Lists;
+import java.util.List;
 
 import org.opendaylight.ovsdb.lib.jsonrpc.Params;
 import org.opendaylight.ovsdb.lib.operations.Operation;
-import java.util.List;
+import org.opendaylight.ovsdb.lib.schema.DatabaseSchema;
+
+import com.google.common.collect.Lists;
 
 public class TransactBuilder implements Params {
 
     List<Operation> requests = Lists.newArrayList();
+    DatabaseSchema dbSchema;
+    public TransactBuilder (DatabaseSchema dbSchema) {
+        this.dbSchema = dbSchema;
+    }
 
     public List<Operation> getRequests() {
         return requests;
@@ -25,7 +31,7 @@ public class TransactBuilder implements Params {
 
     @Override
     public List<Object> params() {
-        List<Object> lists = Lists.newArrayList((Object)"Open_vSwitch");
+        List<Object> lists = Lists.newArrayList((Object)dbSchema.getName());
         lists.addAll(requests);
         return lists;
     }

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/operations/TransactionBuilder.java b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/TransactionBuilder.java
index 37eb2aa199e8bed7899518f678305a48afcbde23..5b946925b60ae244a290011ca23862b123f31f0f 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/operations/TransactionBuilder.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/operations/TransactionBuilder.java
@@ -27,12 +27,9 @@ public class TransactionBuilder {
     OvsdbClientImpl ovs;
     ArrayList<Operation> operations = Lists.newArrayList();
 
-    public TransactionBuilder(OvsdbClientImpl ovs) {
+    public TransactionBuilder(OvsdbClientImpl ovs, DatabaseSchema schema) {
         this.ovs = ovs;
-    }
-
-    public TransactionBuilder(DatabaseSchema eDatabaseSchema) {
-        this.eDatabaseSchema = eDatabaseSchema;
+        eDatabaseSchema = schema;
     }
 
     public ArrayList<Operation> getOperations() {
@@ -49,6 +46,6 @@ public class TransactionBuilder {
     }
 
     public ListenableFuture<List<OperationResult>> execute() {
-        return ovs.transact(operations);
+        return ovs.transact(eDatabaseSchema, operations);
     }
 }

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/schema/DatabaseSchema.java b/library/src/main/java/org/opendaylight/ovsdb/lib/schema/DatabaseSchema.java
index 9240af4dadfaa9c805e287a00d6a1e73de61f19b..b626567bd201fc444fefedcf8c17e59c3eb41b42 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/schema/DatabaseSchema.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/schema/DatabaseSchema.java
@@ -17,7 +17,6 @@ import java.util.Set;
 
 import org.opendaylight.ovsdb.lib.error.ParsingException;
 import org.opendaylight.ovsdb.lib.notation.Version;
-import org.opendaylight.ovsdb.lib.operations.TransactionBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,10 +53,6 @@ public class DatabaseSchema {
         return this.getTables().contains(table);
     }
 
-    public TransactionBuilder beginTransaction() {
-        return new TransactionBuilder(this);
-    }
-
     public <E extends TableSchema<E>> E table(String tableName, Class<E> clazz) {
         TableSchema<E> table = tables.get(tableName);
 

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 bc0a077e07d2da7da18119bcb35d022e071bb275..bcad3ab6090a6c2b308a63d557f43481bc497395 100644 (file)
--- a/library/src/test/java/org/opendaylight/ovsdb/lib/OvsdbClientTestIT.java
+++ b/library/src/test/java/org/opendaylight/ovsdb/lib/OvsdbClientTestIT.java
@@ -165,7 +165,7 @@ public class OvsdbClientTestIT extends OvsdbTestBase {
         List<MonitorRequest<GenericTableSchema>> monitorRequests = Lists.newArrayList();
         ColumnSchema<GenericTableSchema, UUID> _uuid = ovsTable.column("_uuid", UUID.class);
 
-        List<OperationResult> results = ovs.transactBuilder()
+        List<OperationResult> results = ovs.transactBuilder(dbSchema)
                .add(op.select(ovsTable)
                       .column(_uuid))
                       .execute()
@@ -193,7 +193,7 @@ public class OvsdbClientTestIT extends OvsdbTestBase {
         String namedUuid = "br_test";
         int insertOperationIndex = 0;
         UUID parentTable = selectOpenVSwitchTableUuid();
-        TransactionBuilder transactionBuilder = ovs.transactBuilder()
+        TransactionBuilder transactionBuilder = ovs.transactBuilder(dbSchema)
                  /*
                   * Make sure that the position of insert operation matches the insertOperationIndex.
                   * This will be used later when the Results are processed.
@@ -248,7 +248,7 @@ public class OvsdbClientTestIT extends OvsdbTestBase {
          * Adding a separate Assert operation in a transaction. Lets not mix this with other
          * valid transactions as above.
          */
-        ListenableFuture<List<OperationResult>> results = ovs.transactBuilder()
+        ListenableFuture<List<OperationResult>> results = ovs.transactBuilder(dbSchema)
                 .add(op.delete(bridge)
                         .where(name.opEqual(testBridgeName))
                         .build())
@@ -271,7 +271,7 @@ public class OvsdbClientTestIT extends OvsdbTestBase {
          * Adding a separate Abort operation in a transaction. Lets not mix this with other
          * valid transactions as above.
          */
-        ListenableFuture<List<OperationResult>> results = ovs.transactBuilder()
+        ListenableFuture<List<OperationResult>> results = ovs.transactBuilder(dbSchema)
                 .add(op.delete(bridge)
                         .where(name.opEqual(testBridgeName))
                         .build())
@@ -321,7 +321,7 @@ public class OvsdbClientTestIT extends OvsdbTestBase {
         ColumnSchema<GenericTableSchema, UUID> _uuid = ovsTable.column("_uuid", UUID.class);
         UUID parentTable = selectOpenVSwitchTableUuid();
 
-        ListenableFuture<List<OperationResult>> results = ovs.transactBuilder()
+        ListenableFuture<List<OperationResult>> results = ovs.transactBuilder(dbSchema)
                 .add(op.delete(bridge)
                         .where(name.opEqual(testBridgeName))
                         .build())

diff --git a/library/src/test/java/org/opendaylight/ovsdb/lib/OvsdbClientTestITTyped.java b/library/src/test/java/org/opendaylight/ovsdb/lib/OvsdbClientTestITTyped.java
index 8c86d44ed280d4b97692beaa774d59763cde0afc..39f3194ac4203c816cb8beedb33a4cbddc99efce 100644 (file)
--- a/library/src/test/java/org/opendaylight/ovsdb/lib/OvsdbClientTestITTyped.java
+++ b/library/src/test/java/org/opendaylight/ovsdb/lib/OvsdbClientTestITTyped.java
@@ -62,7 +62,7 @@ public class OvsdbClientTestITTyped extends OvsdbTestBase {
         String namedUuid = "br_test";
         int insertOperationIndex = 0;
 
-        TransactionBuilder transactionBuilder = ovs.transactBuilder()
+        TransactionBuilder transactionBuilder = ovs.transactBuilder(dbSchema)
                 .add(op.insert(rBridge)
                         .withId(namedUuid))
                 .add(op.mutate(ovsTable)
@@ -108,7 +108,7 @@ public class OvsdbClientTestITTyped extends OvsdbTestBase {
         GenericTableSchema ovsTable = dbSchema.table("Open_vSwitch", GenericTableSchema.class);
         ColumnSchema<GenericTableSchema, Set<UUID>> bridges = ovsTable.multiValuedColumn("bridges", UUID.class);
 
-        ListenableFuture<List<OperationResult>> results = ovs.transactBuilder()
+        ListenableFuture<List<OperationResult>> results = ovs.transactBuilder(dbSchema)
                 .add(op.delete(bridge)
                         .where(name.opEqual(testBridgeName))
                         .build())

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
index 3b8040eabd5b62172882b284f9c27177a82e3463..2677c8491ebb3c62facd509cb2167484d1ef0a5f 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
@@ -249,7 +249,8 @@ public class ConfigurationService implements IPluginInBridgeDomainConfigService,
         logger.debug("insertRow Connection : {} Table : {} ParentTable : {} Parent Column: {} Parent UUID : {} Row : {}",
                      client.getConnectionInfo(), tableName, parentColumn[0], parentColumn[1], parentUuid, row);
 
-        TransactionBuilder transactionBuilder = client.transactBuilder();
+        DatabaseSchema dbSchema = client.getDatabaseSchema(OvsVswitchdSchemaConstants.DATABASE_NAME);
+        TransactionBuilder transactionBuilder = client.transactBuilder(dbSchema);
 
         String namedUuid = "Transaction_"+ tableName;
         this.processInsertTransaction(client, OvsVswitchdSchemaConstants.DATABASE_NAME, tableName,
@@ -286,8 +287,8 @@ public class ConfigurationService implements IPluginInBridgeDomainConfigService,
         logger.debug("updateRow : Connection : {} databaseName : {} tableName : {} rowUUID : {} row : {}",
                       client.getConnectionInfo(), databaseName, tableName, rowUUID, row.toString());
         try{
-            TransactionBuilder transactionBuilder = client.transactBuilder();
             DatabaseSchema dbSchema = client.getDatabaseSchema(databaseName);
+            TransactionBuilder transactionBuilder = client.transactBuilder(dbSchema);
             TableSchema<GenericTableSchema> tableSchema = dbSchema.table(tableName, GenericTableSchema.class);
             ColumnSchema<GenericTableSchema, UUID> _uuid = tableSchema.column("_uuid", UUID.class);
             transactionBuilder.add(op.update(tableSchema, row)
@@ -346,7 +347,8 @@ public class ConfigurationService implements IPluginInBridgeDomainConfigService,
         logger.debug("deleteRow : Connection : {} databaseName : {} tableName : {} Uuid : {} ParentTable : {} ParentColumn : {}",
                 client.getConnectionInfo(), databaseName, tableName, uuid, parentColumn[0], parentColumn[1]);
 
-        TransactionBuilder transactionBuilder = client.transactBuilder();
+        DatabaseSchema dbSchema = client.getDatabaseSchema(databaseName);
+        TransactionBuilder transactionBuilder = client.transactBuilder(dbSchema);
         this.processDeleteTransaction(client, OvsVswitchdSchemaConstants.DATABASE_NAME, tableName,
                                       parentColumn[0], parentColumn[1], uuid, transactionBuilder);
 

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/BridgeTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/BridgeTestCases.java
index 24d857a6d1fdec1a62ff079fda7911f6920d7d84..081e467d6a5c789463cde59d5a2f8ab8ab19e308 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/BridgeTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/BridgeTestCases.java
@@ -58,7 +58,7 @@ public class BridgeTestCases extends OpenVswitchSchemaTestBase {
 
         int insertOperationIndex = 0;
 
-        TransactionBuilder transactionBuilder = this.ovs.transactBuilder()
+        TransactionBuilder transactionBuilder = this.ovs.transactBuilder(OpenVswitchSchemaSuiteIT.dbSchema)
                 .add(op.insert(bridge.getSchema())
                         .withId(TEST_BRIDGE_NAME)
                         .value(bridge.getNameColumn()))

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ControllerTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ControllerTestCases.java
index f4463ac4459e00774ddeb68d7dfe23f7290c3add..68ff0be1bfd2fe866982112c09fe7060324c516d 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ControllerTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ControllerTestCases.java
@@ -54,7 +54,7 @@ public class ControllerTestCases extends OpenVswitchSchemaTestBase {
         Bridge bridge = ovs.getTypedRowWrapper(Bridge.class, null);
 
         String transactionUuidStr = "controller";
-        TransactionBuilder transactionBuilder = ovs.transactBuilder()
+        TransactionBuilder transactionBuilder = ovs.transactBuilder(OpenVswitchSchemaSuiteIT.dbSchema)
                 .add(op.insert(controller1.getSchema())
                         .withId(transactionUuidStr)
                         .value(controller1.getTargetColumn()))
@@ -80,7 +80,7 @@ public class ControllerTestCases extends OpenVswitchSchemaTestBase {
         Bridge monitoredBridge = ovs.getTypedRowWrapper(Bridge.class, bridgeRow);
         Assert.assertEquals(1, monitoredBridge.getControllerColumn().getData().size());
 
-        transactionBuilder = ovs.transactBuilder()
+        transactionBuilder = ovs.transactBuilder(OpenVswitchSchemaSuiteIT.dbSchema)
                 .add(op.insert(controller2.getSchema())
                         .withId(transactionUuidStr)
                         .value(controller2.getTargetColumn()))

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSetTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSetTestCases.java
index 95bbdc5534a63c0b6953212805f226d02689423f..1df69112e66262419a99f565e098c8bb2be77a89 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSetTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSetTestCases.java
@@ -65,7 +65,7 @@ public class FlowSampleCollectorSetTestCases extends OpenVswitchSchemaTestBase {
         flowSampleCollectorSet.setExternalIds(ImmutableMap.of("<3", "ovs"));
         flowSampleCollectorSet.setBridge(OpenVswitchSchemaSuiteIT.getTestBridgeUuid());
         Bridge bridge = ovs.getTypedRowWrapper(Bridge.class, null);
-        TransactionBuilder transactionBuilder = ovs.transactBuilder()
+        TransactionBuilder transactionBuilder = ovs.transactBuilder(OpenVswitchSchemaSuiteIT.dbSchema)
                 .add(op.insert(flowSampleCollectorSet.getSchema())
                         .value(flowSampleCollectorSet.getIdColumn())
                         .value(flowSampleCollectorSet.getExternalIdsColumn())

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTableTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTableTestCases.java
index a0dbb9296f6757f6c738a648e240ed86e15e7386..031daf7f154f5c8e7809948d2e9daedfc2a63ec0 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTableTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTableTestCases.java
@@ -88,7 +88,7 @@ public class FlowTableTestCases extends OpenVswitchSchemaTestBase {
         }
         flowTable.setFlowLimit(ImmutableSet.of(flowLimit));
         Bridge bridge = ovs.getTypedRowWrapper(Bridge.class, null);
-        TransactionBuilder transactionBuilder = ovs.transactBuilder()
+        TransactionBuilder transactionBuilder = ovs.transactBuilder(OpenVswitchSchemaSuiteIT.dbSchema)
                 .add(op.insert(flowTable)
                         .withId(flowTableUuidStr))
                 .add(op.mutate(bridge.getSchema())

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/IpfixTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/IpfixTestCases.java
index 944f36c58a77380ee214d5e7b050e79372c2924b..e4015cc759ddae2f961cd3a56f4af30a6e683ea1 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/IpfixTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/IpfixTestCases.java
@@ -85,7 +85,7 @@ public class IpfixTestCases extends OpenVswitchSchemaTestBase {
         ipfix.setSampling(ImmutableSet.of(sampling));
         ipfix.setExternalIds(ImmutableMap.of("<3", "ovs"));
         Bridge bridge = ovs.getTypedRowWrapper(Bridge.class, null);
-        TransactionBuilder transactionBuilder = ovs.transactBuilder()
+        TransactionBuilder transactionBuilder = ovs.transactBuilder(OpenVswitchSchemaSuiteIT.dbSchema)
                 .add(op.insert(ipfix)
                         .withId(ipfixUuidStr))
                 .add(op.mutate(bridge.getSchema())

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ManagerTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ManagerTestCases.java
index 0d73f59c20ac82a2255d899695596d00e077582c..0f438948b2304dc30a462cf3496d46b7a796442f 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ManagerTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ManagerTestCases.java
@@ -57,7 +57,7 @@ public class ManagerTestCases extends OpenVswitchSchemaTestBase {
         manager.setExternalIds(externalIds);
 
         int insertSslOperationIndex = 0;
-        TransactionBuilder transactionBuilder = ovs.transactBuilder()
+        TransactionBuilder transactionBuilder = ovs.transactBuilder(OpenVswitchSchemaSuiteIT.dbSchema)
                 .add(op.insert(manager.getSchema())
                         .withId(mgrUuidStr)
                         .value(manager.getTargetColumn())

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MirrorTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MirrorTestCases.java
index 86b71d05b74eb8a85d08111e100e00c50c364d2f..eef10ca9216e795baad9579c4d0c64356f5e5c41 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MirrorTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MirrorTestCases.java
@@ -58,7 +58,7 @@ public class MirrorTestCases extends OpenVswitchSchemaTestBase {
         Bridge bridge = ovs.getTypedRowWrapper(Bridge.class, null);
 
         int insertMirrorOperationIndex = 0;
-        TransactionBuilder transactionBuilder = ovs.transactBuilder()
+        TransactionBuilder transactionBuilder = ovs.transactBuilder(OpenVswitchSchemaSuiteIT.dbSchema)
                 .add(op.insert(mirror.getSchema())
                         .withId(mirrorUuidStr)
                         .value(mirror.getNameColumn())

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MonitorTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MonitorTestCases.java
index fc51bb381ba7218fbd78495ee8d3b2a553e2edfe..2cadb22b9065977329efa8b5359dd5abeeec0924 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MonitorTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MonitorTestCases.java
@@ -42,24 +42,23 @@ import com.google.common.collect.Lists;
 public class MonitorTestCases extends OpenVswitchSchemaTestBase {
 
     Logger logger = LoggerFactory.getLogger(PortAndInterfaceTestCases.class);
-    DatabaseSchema dbSchema = null;
 
     @Override
     @Before
     public void setUp() throws ExecutionException, InterruptedException, TimeoutException, IOException {
         super.setUp();
-        dbSchema = this.ovs.getSchema(OPEN_VSWITCH_SCHEMA).get();
+        OpenVswitchSchemaSuiteIT.dbSchema = this.ovs.getSchema(OPEN_VSWITCH_SCHEMA).get();
     }
 
     @Test
     public void monitorTables() throws ExecutionException, InterruptedException, IOException {
-        Assert.assertNotNull(dbSchema);
+        Assert.assertNotNull(OpenVswitchSchemaSuiteIT.dbSchema);
 
         List<MonitorRequest<GenericTableSchema>> monitorRequests = Lists.newArrayList();
         monitorRequests.add(this.getAllColumnsMonitorRequest(Bridge.class));
         monitorRequests.add(this.getAllColumnsMonitorRequest(OpenVSwitch.class));
 
-        TableUpdates updates = ovs.monitor(dbSchema, monitorRequests, new UpdateMonitor());
+        TableUpdates updates = ovs.monitor(OpenVswitchSchemaSuiteIT.dbSchema, monitorRequests, new UpdateMonitor());
         Assert.assertNotNull(updates);
         this.updateTableCache(updates);
     }

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/NetflowTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/NetflowTestCases.java
index b4bcad1e57d0e453a7939fb91de16134ea26918b..6edc3e25bedb4c1de6eae1b3e328894de9d2e0ef 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/NetflowTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/NetflowTestCases.java
@@ -55,7 +55,7 @@ public class NetflowTestCases extends OpenVswitchSchemaTestBase {
         netFlow.setActivityTimeout(ImmutableSet.of(activityTimeout));
         netFlow.setExternalIds(ImmutableMap.of("big", "baby"));
         Bridge bridge = ovs.getTypedRowWrapper(Bridge.class, null);
-        TransactionBuilder transactionBuilder = ovs.transactBuilder()
+        TransactionBuilder transactionBuilder = ovs.transactBuilder(OpenVswitchSchemaSuiteIT.dbSchema)
                 .add(op.insert(netFlow.getSchema())
                         .withId(netFlowUuidStr)
                         .value(netFlow.getTargetsColumn())

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaSuiteIT.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaSuiteIT.java
index 3fe071596e7e9d317978f13de1e7a65d062d498d..150c3c39098a8537a02ea2f83e9dd5e574272355 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaSuiteIT.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaSuiteIT.java
@@ -9,14 +9,15 @@
  */
 package org.opendaylight.ovsdb.schema.openvswitch;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.opendaylight.ovsdb.lib.OvsdbClient;
 import org.opendaylight.ovsdb.lib.notation.Row;
 import org.opendaylight.ovsdb.lib.notation.UUID;
-
-import java.util.HashMap;
-import java.util.Map;
+import org.opendaylight.ovsdb.lib.schema.DatabaseSchema;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
@@ -39,6 +40,7 @@ import java.util.Map;
 public class OpenVswitchSchemaSuiteIT {
 
     // Keep this data between test runs
+    static DatabaseSchema dbSchema;
     static OvsdbClient ovsdbClient;
     static UUID testBridgeUuid;
     static UUID testSslUuid;

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaTestBase.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaTestBase.java
index 0d6a1118648d832231544cdee14c11b5440b3fc2..06ad097cab49bda7b01ab20e9f27e713b9ef3646 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaTestBase.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaTestBase.java
@@ -10,17 +10,6 @@
 
 package org.opendaylight.ovsdb.schema.openvswitch;
 
-import com.google.common.util.concurrent.ListenableFuture;
-import junit.framework.Assert;
-import org.junit.Before;
-import org.opendaylight.ovsdb.lib.OvsdbClient;
-import org.opendaylight.ovsdb.lib.OvsdbConnection;
-import org.opendaylight.ovsdb.lib.OvsdbConnectionListener;
-import org.opendaylight.ovsdb.lib.impl.OvsdbConnectionService;
-import org.opendaylight.ovsdb.lib.message.OvsdbRPC;
-import org.opendaylight.ovsdb.lib.notation.Row;
-import org.opendaylight.ovsdb.lib.notation.UUID;
-
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.List;
@@ -34,6 +23,19 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.opendaylight.ovsdb.lib.OvsdbClient;
+import org.opendaylight.ovsdb.lib.OvsdbConnection;
+import org.opendaylight.ovsdb.lib.OvsdbConnectionListener;
+import org.opendaylight.ovsdb.lib.impl.OvsdbConnectionService;
+import org.opendaylight.ovsdb.lib.message.OvsdbRPC;
+import org.opendaylight.ovsdb.lib.notation.Row;
+import org.opendaylight.ovsdb.lib.notation.UUID;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
 public abstract class OpenVswitchSchemaTestBase implements OvsdbRPC.Callback{
     private final static String SERVER_IPADDRESS = "ovsdbserver.ipaddress";
     private final static String SERVER_PORT = "ovsdbserver.port";

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/PortAndInterfaceTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/PortAndInterfaceTestCases.java
index 7484156a1aebadf3bfe9b8d8425213c31324f938..ff8223314285b96203977cb692f595bf7948c359 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/PortAndInterfaceTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/PortAndInterfaceTestCases.java
@@ -57,7 +57,7 @@ public class PortAndInterfaceTestCases extends OpenVswitchSchemaTestBase {
         intf.setExternalIds(ImmutableMap.of("vm-id", "12345abcedf78910"));
 
         Bridge bridge = ovs.getTypedRowWrapper(Bridge.class, null);
-        TransactionBuilder transactionBuilder = ovs.transactBuilder()
+        TransactionBuilder transactionBuilder = ovs.transactBuilder(OpenVswitchSchemaSuiteIT.dbSchema)
                 .add(op.insert(port.getSchema())
                         .withId(portUuidStr)
                         .value(port.getNameColumn())

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QosTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QosTestCases.java
index 5a325b57fefe86a48c8e5ae6f6bd93f31c19a446..4e61b60d01ef85626750a65e27c64a9adf07f201 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QosTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QosTestCases.java
@@ -75,7 +75,7 @@ public class QosTestCases extends OpenVswitchSchemaTestBase {
         int insertQosOperationIndex = 2;
         Bridge bridge = ovs.getTypedRowWrapper(Bridge.class, null);
 
-        TransactionBuilder transactionBuilder = ovs.transactBuilder()
+        TransactionBuilder transactionBuilder = ovs.transactBuilder(OpenVswitchSchemaSuiteIT.dbSchema)
                 .add(op.insert(port.getSchema())
                         .withId(portUuidStr)
                         .value(port.getNameColumn()))

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QueueTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QueueTestCases.java
index 8a92a8dd61e6c2cd0f3a0a2289b80330f5c65f89..ab2aa266e55cea3c04b64a0cc3059a34ffb40fa1 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QueueTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QueueTestCases.java
@@ -65,7 +65,7 @@ public class QueueTestCases extends OpenVswitchSchemaTestBase {
         // The transaction index for the Queue insert is used to store the Queue UUID
         int insertQueueOperationIndex = 0;
         // Reference the Port row to insert the Queue with UID or Port name
-        TransactionBuilder transactionBuilder = ovs.transactBuilder()
+        TransactionBuilder transactionBuilder = ovs.transactBuilder(OpenVswitchSchemaSuiteIT.dbSchema)
                 .add(op.insert(queue.getSchema())
                         .withId(queueUuidStr)
                         .value(queue.getDscpColumn())

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SflowTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SflowTestCases.java
index 1341bb555a5ef35483cdceebbdfe1986e52474e9..32162da4c2c4bbe5bcbab8c5b8d50c8671aec18f 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SflowTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SflowTestCases.java
@@ -60,7 +60,7 @@ public class SflowTestCases extends OpenVswitchSchemaTestBase {
         sFlow.setSampling(ImmutableSet.of(sampling));
         sFlow.setExternalIds(ImmutableMap.of("kit", "tah"));
         Bridge bridge = ovs.getTypedRowWrapper(Bridge.class, null);
-        TransactionBuilder transactionBuilder = ovs.transactBuilder()
+        TransactionBuilder transactionBuilder = ovs.transactBuilder(OpenVswitchSchemaSuiteIT.dbSchema)
                 .add(op.insert(sFlow.getSchema())
                         .withId(sFlowUuidStr)
                         .value(sFlow.getTargetsColumn())

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SslTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SslTestCases.java
index 253824d583f8e42d4eacf1cf231be551f1311115..f8273c24c1cf3a73b61ee1a50560ffffbf6c0ee9 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SslTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SslTestCases.java
@@ -57,7 +57,7 @@ public class SslTestCases extends OpenVswitchSchemaTestBase {
         OpenVSwitch openVSwitch = ovs.getTypedRowWrapper(OpenVSwitch.class, null);
         // The transaction index for the SSL insert is used to store the SSL UUID
         int insertSslOperationIndex = 0;
-        TransactionBuilder transactionBuilder = ovs.transactBuilder()
+        TransactionBuilder transactionBuilder = ovs.transactBuilder(OpenVswitchSchemaSuiteIT.dbSchema)
                 .add(op.insert(ssl.getSchema())
                         .withId(sslUuidStr)
                         .value(ssl.getCertificateColumn())

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/TearDown.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/TearDown.java
index 1a1b6f680c506f8bc246b036dc135023f5f0b6d3..89414e235b7a902412c7600d75e77220d9611e20 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/TearDown.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/TearDown.java
@@ -61,7 +61,7 @@ public class TearDown extends OpenVswitchSchemaTestBase {
         Queue queue = this.ovs.getTypedRowWrapper(Queue.class, null);
         Manager manager = this.ovs.getTypedRowWrapper(Manager.class, null);
 
-        TransactionBuilder transactionBuilder = this.ovs.transactBuilder();
+        TransactionBuilder transactionBuilder = this.ovs.transactBuilder(OpenVswitchSchemaSuiteIT.dbSchema);
 
         if (schemaVersion.compareTo(flowSampleCollectorSetFromVersion) >= 0) {
             FlowSampleCollectorSet flowSampleCollectorSet = this.ovs.getTypedRowWrapper(FlowSampleCollectorSet.class, null);