IT for remaining dbs and type versions/completions bindings
authorBrent Salisbury <brent.salisbury@gmail.com>
Mon, 30 Jun 2014 12:10:27 +0000 (08:10 -0400)
committerBrent Salisbury <brent.salisbury@gmail.com>
Fri, 4 Jul 2014 06:48:02 +0000 (02:48 -0400)
Patchset4-6:Modified ConfigService setManager and controllertest

Patchset3:
Changed controller table, target column to Set<String>

Patchset2:
-Updated the TypedBaseTable
s/extends TypedBaseTable/TypedBaseTable<GenericTableSchema>/g
-Adding remaining tables and IT minus Capabilities
-Will modify tests to the new abbreviated update as Dave
mentioned in his review. Need to unload local commits
for today.

Patchset1:
-Prolly a couple bindings version typos. Patch them if
you see them as Im going to nap a bit. Checking build
against IT as much as anything.

Change-Id: Ia1d9a3907f8c012ad7b1f00887d237cca1e53741
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java

index fc6d79337d38c034f4233c04365c1798c3617060..c6a991fc3d1e946c09e1bc529d37b91e9b18a47b 100644 (file)
@@ -23,6 +23,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutionException;
 
+import com.google.common.collect.ImmutableSet;
 import org.eclipse.osgi.framework.console.CommandInterpreter;
 import org.eclipse.osgi.framework.console.CommandProvider;
 import org.opendaylight.controller.clustering.services.IClusterGlobalServices;
@@ -493,7 +494,7 @@ public class ConfigurationService implements IPluginInBridgeDomainConfigService,
         for (InetAddress ofControllerAddress : ofControllerAddrs) {
             String newController = "tcp:"+ofControllerAddress.getHostAddress()+":"+ofControllerPort;
             Controller controllerRow = connection.getClient().createTypedRowWrapper(Controller.class);
-            controllerRow.setTarget(newController);
+            controllerRow.setTarget(ImmutableSet.of(newController));
             status = this.insertRow(node, controllerRow.getSchema().getName(), bridgeUUID, controllerRow.getRow());
         }
         return status.isSuccess();
@@ -978,7 +979,7 @@ public class ConfigurationService implements IPluginInBridgeDomainConfigService,
         Connection connection = connectionService.getConnection(node);
         OvsdbClient client = connection.getClient();
         Manager manager = client.createTypedRowWrapper(Manager.class);
-        manager.setTarget(managerip);
+        manager.setTarget(ImmutableSet.of(managerip));
 
         OpenVSwitch openVSwitch = connection.getClient().getTypedRowWrapper(OpenVSwitch.class, null);
         ConcurrentMap<String, Row> row = this.getRows(node, openVSwitch.getSchema().getName());