From 4e7101fd2097719f302d0948d855f23fff6059f8 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 26 Oct 2009 15:18:37 +0000
Subject: [PATCH] Frontport of 2.2 tests to the trunk

---
 opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml |   46 ++++++++++++++++++++++------------------------
 1 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml b/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
index 646990c..8edfabd 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
@@ -163,11 +163,11 @@
               }
             </call>
             <call function="'runFunction'">
-              { 'functionName'      : 'CLI_rebuild-index' ,
+              { 'functionName'      : 'rebuildIndexWithScript' ,
                 'functionException' : 'CLI.RebuildIndex'  ,
                 'functionFailureTC' : 'Indexes - Modify'  ,
-                'functionArguments' : { 'baseDN'     : DIRECTORY_INSTANCE_SFX ,
-                                        'attributes' : [ 'uid' ]
+                'functionArguments' : { 'dsBaseDN'    : DIRECTORY_INSTANCE_SFX ,
+                                        'dsIndexList' : [ 'uid' ]
                                       }
               }
             </call>
@@ -248,18 +248,17 @@
               }
             </call>
             <call function="'runFunction'">
-              { 'functionName'      : 'rebuildIndexTask' ,
+              { 'functionName'      : 'rebuildIndexWithScript' ,
                 'functionException' : 'CLI.RebuildIndex'  ,
                 'functionFailureTC' : 'Indexes - Dynamic Modify'  ,
                 'functionArguments' : 
-                  { 'location'       : STAF_REMOTE_HOSTNAME,
-                    'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
-                    'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
-                    'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
-                    'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
-                    'taskID'         : 'rebuild uid index task',
-                    'baseDN'         : DIRECTORY_INSTANCE_SFX ,
-                    'attributes'     : [ 'uid' ]
+                  { 'location'            : STAF_REMOTE_HOSTNAME,
+                    'dsInstanceHost'      : DIRECTORY_INSTANCE_HOST,
+                    'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+                    'dsInstanceDn'        : DIRECTORY_INSTANCE_DN,
+                    'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD,
+                    'dsBaseDN'            : DIRECTORY_INSTANCE_SFX ,
+                    'dsIndexList'         : [ 'uid' ]
                   }
               }
             </call>
@@ -341,11 +340,11 @@
               }
             </call>
             <call function="'runFunction'">
-              { 'functionName'      : 'CLI_rebuild-index' ,
+              { 'functionName'      : 'rebuildIndexWithScript' ,
                 'functionException' : 'CLI.RebuildIndex'  ,
                 'functionFailureTC' : 'Indexes - Modify'  ,
-                'functionArguments' : { 'baseDN'     : DIRECTORY_INSTANCE_SFX ,
-                                        'attributes' : [ 'l' ]  
+                'functionArguments' : { 'dsBaseDN'    : DIRECTORY_INSTANCE_SFX ,
+                                        'dsIndexList' : [ 'l' ]
                                       }
               }
             </call>
@@ -427,18 +426,17 @@
               }
             </call>
             <call function="'runFunction'">
-              { 'functionName'      : 'rebuildIndexTask' ,
+              { 'functionName'      : 'rebuildIndexWithScript' ,
                 'functionException' : 'CLI.RebuildIndex'  ,
                 'functionFailureTC' : 'Indexes - Dynamic Add'  ,
                 'functionArguments' : 
-                  { 'location'       : STAF_REMOTE_HOSTNAME,
-                    'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
-                    'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
-                    'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
-                    'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
-                    'taskID'         : 'rebuild l index task',
-                    'baseDN'         : DIRECTORY_INSTANCE_SFX ,
-                    'attributes'     : [ 'l' ]
+                  { 'location'            : STAF_REMOTE_HOSTNAME,
+                    'dsInstanceHost'      : DIRECTORY_INSTANCE_HOST,
+                    'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+                    'dsInstanceDn'        : DIRECTORY_INSTANCE_DN,
+                    'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD,
+                    'dsBaseDN'            : DIRECTORY_INSTANCE_SFX ,
+                    'dsIndexList'         : [ 'l' ]
                   }
               }
             </call>  

--
Gitblit v1.10.0