- Bug 4286: added support for IceStorm/IceGrid database plugins

- Fixed IceGrid database code to first save to the database and then
  do state changes.

4 files changed, 23 insertions, 4 deletions

diff --git a/cpp/test/IceGrid/replication/application.xml b/cpp/test/IceGrid/replication/application.xml
index 061ad77abbe..2d206d137fa 100644
--- a/cpp/test/IceGrid/replication/application.xml
+++ b/cpp/test/IceGrid/replication/application.xml
@@ -51,8 +51,8 @@
         <property name="IceGrid.Registry.Trace.Locator" value="0"/> 
         <property name="IceGrid.Registry.UserAccounts" value="${test.dir}/useraccounts.txt"/>
         <property name="Ice.Admin.Endpoints" value=""/>
+        <property name="Ice.Plugin.DB" value="${db-plugin}"/>
         <property name="IceGrid.SQL.DatabaseType" value="QSQLITE"/>
-        <property name="IceGrid.SQL.DatabaseName" value="${node.datadir}/servers/${server}/dbs/data/Registry.db"/>
       </server>
     </server-template>
 
diff --git a/cpp/test/IceGrid/replication/run.py b/cpp/test/IceGrid/replication/run.py
index 7742c5c9f21..12adf8c0d38 100755
--- a/cpp/test/IceGrid/replication/run.py
+++ b/cpp/test/IceGrid/replication/run.py
@@ -22,7 +22,18 @@ from scripts import *
 
 TestUtil.addLdPath(os.getcwd())
 
-IceGridAdmin.iceGridTest("application.xml", '--IceDir="%s" --TestDir="%s"' % (TestUtil.toplevel, os.getcwd()),
-    "'properties-override=%s'" % TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", ""))
+if TestUtil.sqlType != None and TestUtil.sqlType != "QSQLITE":
+    print "*** This test only supports Freeze or SQLite databases"
+    sys.exit(0)
+
+variables = "'properties-override=%s'" % \
+    TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", "")
 
+if TestUtil.sqlType != None:
+    variables += " db-plugin=IceGridSqlDB:createSqlDB"
+else:
+    variables += " db-plugin=IceGridFreezeDB:createFreezeDB"
+
+IceGridAdmin.iceGridTest("application.xml", '--IceDir="%s" --TestDir="%s"' % (TestUtil.toplevel, os.getcwd()),
+                         variables)
 TestUtil.cleanup()
diff --git a/cpp/test/IceStorm/repgrid/application.xml b/cpp/test/IceStorm/repgrid/application.xml
index 8258adf362a..652214d2a18 100644
--- a/cpp/test/IceStorm/repgrid/application.xml
+++ b/cpp/test/IceStorm/repgrid/application.xml
@@ -50,6 +50,7 @@
            <property name="${service}.InstanceName" value="${instance-name}"/>
            <property name="${service}.NodeId" value="${node-id}"/>
            <property name="${service}.Flush.Timeout" value="${flush-timeout}"/>
+           <property name="Ice.Plugin.DB" value="${db-plugin}"/>
            <property name="${service}.SQL.DatabaseType" value="QSQLITE"/>
            <property name="${service}.SQL.DatabaseName" value="db/${instance-name}${node-id}.db"/>
         </properties>
diff --git a/cpp/test/IceStorm/repgrid/run.py b/cpp/test/IceStorm/repgrid/run.py
index 3802a5d1931..1b0f3dd4a80 100755
--- a/cpp/test/IceStorm/repgrid/run.py
+++ b/cpp/test/IceStorm/repgrid/run.py
@@ -26,9 +26,16 @@ from scripts import *
 for filename in [os.path.join("db", f) for f in os.listdir("db") if f.endswith(".db")]:
     os.remove(filename)
 
+variables = '"icebox.exe=%s"' % TestUtil.getIceBox()
+
+if TestUtil.sqlType != None:
+    variables += " db-plugin=IceStormSqlDB:createSqlDB"
+else:
+    variables += " db-plugin=IceStormFreezeDB:createFreezeDB"
+
 #
 # Test client/server without on demand activation.
 #
-IceGridAdmin.iceGridTest("application.xml", "", '"icebox.exe=%s"' % TestUtil.getIceBox())
+IceGridAdmin.iceGridTest("application.xml", "", variables)
 
 TestUtil.cleanup()