mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

al_xipe
13.20.2007 7a6e223f294ebe71a95850918549b37247c85c77
some code cleaning and a fix for security test suite
91 files modified
1433 ■■■■ changed files
opends/tests/functional-tests/shared/functions/baselib.xml 2 ●●● patch | view | raw | blame | history
opends/tests/functional-tests/shared/functions/dsadm.xml 66 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/shared/functions/environment.xml 22 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/shared/functions/ldap.xml 36 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/shared/functions/security.xml 24 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/shared/functions/stafcmd.xml 26 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/shared/functions/staxcmd.xml 2 ●●● patch | view | raw | blame | history
opends/tests/functional-tests/shared/functions/tools.xml 569 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/shared/functions/topology.xml 2 ●●● patch | view | raw | blame | history
opends/tests/functional-tests/shared/functions/utils.xml 44 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci.xml 36 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_add_entry.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_import.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml 40 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_target.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_targetattr.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_targetscope.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/global_acis.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/backends/backends.xml 16 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/backends/backup-tasks.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/backends/backup.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/backends/export-tasks.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/backends/export.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/backends/import-tasks.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/backends/import.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/backends/restore-tasks.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/backends/restore.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/clu/cluCompare.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/clu/cluDelete.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/clu/cluModify.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/clu/cluSearch.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/clu/commands.xml 8 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/core/core.xml 10 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/core/core_entry_cache.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/core/core_search_timelimit.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/core/core_tf_filters.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/core/core_version_report.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/groups/group_dynamic.xml 6 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/groups/group_static_member.xml 6 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/groups/group_static_uniquemember.xml 6 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/groups/group_virtual_static.xml 6 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/groups/groups.xml 8 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/indexes/indexes.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/privileges/privileges.xml 14 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/privileges/privileges_users.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/replication/basic/replication_basic.xml 6 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/replication/replication.xml 12 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/replication/totalupdate/replication_binarycopy.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/replication/totalupdate/replication_ldifimport.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/replication/totalupdate/replication_resynchronization.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/replication/totalupdate/replication_schema.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/runTestJob.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/sample/sample.xml 6 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/schema/schema.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/schema/schema_dynamic.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml 12 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml 20 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml 10 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/client_auth/client_auth.xml 18 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml 10 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml 16 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/jks/security_jks.xml 10 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml 10 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml 32 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml 6 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml 30 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml 26 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml 16 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/security.xml 24 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml 12 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/shared/functions/baselib.xml
@@ -31,7 +31,7 @@
      This function gets variables associated with the Directory Server
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
opends/tests/functional-tests/shared/functions/dsadm.xml
@@ -33,7 +33,7 @@
      This function sets up a Directory Server using a script
    </function-prolog>    
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -157,7 +157,7 @@
      This function configures a Directory Server using a script
    </function-prolog>    
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -334,7 +334,7 @@
      This function starts a Directory Server
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -438,7 +438,7 @@
      This function starts a Directory Server using the script
    </function-prolog>    
    <function-map-args>    
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -750,7 +750,7 @@
      This function performs an offline import of an ldif file
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -768,7 +768,7 @@
        </function-arg-description>
        <function-arg-property name="type" value="filename"/>
      </function-arg-def>
      <function-arg-def name="backEnd" type="optional" default="'%s' % DIRECTORY_INSTANCE_BE">
      <function-arg-def name="backEnd" type="optional" default="DIRECTORY_INSTANCE_BE">
        <function-arg-description>
          Backend ID for the backend to import
        </function-arg-description>
@@ -815,7 +815,7 @@
      This function performs an offline import of an ldif file using the script
    </function-prolog>  
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -1051,7 +1051,7 @@
        This function performs an on line import task of an ldif file
    </function-prolog>
    <function-map-args>    
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -1099,7 +1099,7 @@
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </function-arg-def>
      <function-arg-def name="backEnd" type="optional" default="'%s' % DIRECTORY_INSTANCE_BE">
      <function-arg-def name="backEnd" type="optional" default="DIRECTORY_INSTANCE_BE">
        <function-arg-description>
          Optional the name of the database backend
        </function-arg-description>
@@ -1295,7 +1295,7 @@
      This function verifies an import of an ldif file 
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -1307,25 +1307,25 @@
        </function-arg-description>
        <function-arg-property name="type" value="pathname"/>
      </function-arg-def>
      <function-arg-def name="dsHost" type="optional" default="'%s' % DIRECTORY_INSTANCE_HOST">
      <function-arg-def name="dsHost" type="optional" default="DIRECTORY_INSTANCE_HOST">
        <function-arg-description>
          Directory server hostname or IP address
        </function-arg-description>
        <function-arg-property name="type" value="hostname"/>
      </function-arg-def>      
      <function-arg-def name="dsPort" type="optional" default="'%s' % DIRECTORY_INSTANCE_PORT">
      <function-arg-def name="dsPort" type="optional" default="DIRECTORY_INSTANCE_PORT">
        <function-arg-description>
          Directory server port number
        </function-arg-description>
        <function-arg-property name="type" value="Port number"/>
      </function-arg-def>
      <function-arg-def name="dsDn" type="optional" default="'%s' % DIRECTORY_INSTANCE_DN">
      <function-arg-def name="dsDn" type="optional" default="DIRECTORY_INSTANCE_DN">
        <function-arg-description>
          Bind DN
        </function-arg-description>
        <function-arg-property name="type" value="DN"/>
      </function-arg-def> 
      <function-arg-def name="dsPswd" type="optional" default="'%s' % DIRECTORY_INSTANCE_PSWD">
      <function-arg-def name="dsPswd" type="optional" default="DIRECTORY_INSTANCE_PSWD">
        <function-arg-description>
          Bind password
        </function-arg-description>
@@ -1355,7 +1355,7 @@
        </function-arg-description>
        <function-arg-property name="type" value="list"/>
      </function-arg-def>
      <function-arg-def name="suffix" type="optional" default="'%s' % DIRECTORY_INSTANCE_SFX">
      <function-arg-def name="suffix" type="optional" default="DIRECTORY_INSTANCE_SFX">
        <function-arg-description>
          Optional main suffix for the import
        </function-arg-description>
@@ -1477,7 +1477,7 @@
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -1495,7 +1495,7 @@
        </function-arg-description>
        <function-arg-property name="type" value="filename"/>
      </function-arg-def>
      <function-arg-def name="backEnd" type="optional" default="'%s' % DIRECTORY_INSTANCE_BE">
      <function-arg-def name="backEnd" type="optional" default="DIRECTORY_INSTANCE_BE">
        <function-arg-description>
          The name of the database backend
        </function-arg-description>
@@ -1543,7 +1543,7 @@
      This function performs an on line export task of an ldif file
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -1591,7 +1591,7 @@
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </function-arg-def>
      <function-arg-def name="backEnd" type="optional" default="'%s' % DIRECTORY_INSTANCE_BE">
      <function-arg-def name="backEnd" type="optional" default="DIRECTORY_INSTANCE_BE">
        <function-arg-description>
          Optional the name of the database backend
        </function-arg-description>
@@ -1761,7 +1761,7 @@
        This function performs an off line backup
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -1773,7 +1773,7 @@
        </function-arg-description>
        <function-arg-property name="type" value="pathname"/>
      </function-arg-def>
      <function-arg-def name="backEnd" type="optional" default="'%s' % DIRECTORY_INSTANCE_BE">
      <function-arg-def name="backEnd" type="optional" default="DIRECTORY_INSTANCE_BE">
        <function-arg-description>
          Optional the name of the database backend
        </function-arg-description>
@@ -1829,7 +1829,7 @@
        This function performs an on line backup task 
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -1876,7 +1876,7 @@
        </function-arg-description>
        <function-arg-property name="type" value="filepath"/>
      </function-arg-def>
      <function-arg-def name="backEnd" type="optional" default="'%s' % DIRECTORY_INSTANCE_BE">
      <function-arg-def name="backEnd" type="optional" default="DIRECTORY_INSTANCE_BE">
        <function-arg-description>
          Optional the name of the database backend
        </function-arg-description>
@@ -2017,7 +2017,7 @@
      This function performs an off line restore
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -2080,7 +2080,7 @@
        This function performs an on line restore task of a backup file
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -2224,7 +2224,7 @@
      This function performs an on line export task for shutdown of the directory
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -2334,7 +2334,7 @@
      This function performs an on line export task for restart of the directory
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -2456,7 +2456,7 @@
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -2592,7 +2592,7 @@
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -2720,7 +2720,7 @@
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -2896,7 +2896,7 @@
      This function starts a task using the ldap task interface
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -2984,7 +2984,7 @@
      </message>
      <!-- Perform Task with ldapmodify -->
      <process name="'%s' % taskLabel">
      <process name="taskLabel">
        <location>'%s' % myLocation</location>
        <command>'%s' % STAFCmd</command>
        <parms>'%s' % STAFCmdParams</parms>
@@ -3018,7 +3018,7 @@
      This function checks a task using the ldap task interface
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
opends/tests/functional-tests/shared/functions/environment.xml
@@ -35,37 +35,37 @@
    <sequence>
        
      <!--- Import all the shared xml libraries -->
      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
      <import machine="STAF_LOCAL_HOSTNAME"
        file="'%s/baselib.xml' % (TESTS_FUNCTIONS_DIR)" />
              
      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
      <import machine="STAF_LOCAL_HOSTNAME"
        file="'%s/utils.xml' % (TESTS_FUNCTIONS_DIR)" />
      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
      <import machine="STAF_LOCAL_HOSTNAME"
        file="'%s/stafcmd.xml' % (TESTS_FUNCTIONS_DIR)" />
      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
      <import machine="STAF_LOCAL_HOSTNAME"
        file="'%s/staxcmd.xml' % (TESTS_FUNCTIONS_DIR)" />
      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
      <import machine="STAF_LOCAL_HOSTNAME"
        file="'%s/dsadm.xml' % (TESTS_FUNCTIONS_DIR)" />
      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
      <import machine="STAF_LOCAL_HOSTNAME"
        file="'%s/dsconfig.xml' % (TESTS_FUNCTIONS_DIR)" />
      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
      <import machine="STAF_LOCAL_HOSTNAME"
        file="'%s/ldap.xml' % (TESTS_FUNCTIONS_DIR)" />
      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
      <import machine="STAF_LOCAL_HOSTNAME"
        file="'%s/security.xml' % (TESTS_FUNCTIONS_DIR)" />
        
      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
      <import machine="STAF_LOCAL_HOSTNAME"
        file="'%s/topology.xml' % (TESTS_FUNCTIONS_DIR)" />
        
      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
      <import machine="STAF_LOCAL_HOSTNAME"
        file="'%s/signals.xml' % (TESTS_FUNCTIONS_DIR)" />
      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
      <import machine="STAF_LOCAL_HOSTNAME"
        file="'%s/tools.xml' % (TESTS_FUNCTIONS_DIR)" />
                
    </sequence>  
opends/tests/functional-tests/shared/functions/ldap.xml
@@ -31,7 +31,7 @@
      This function adds an entry to the Directory Server from an ldif file
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -146,7 +146,7 @@
      This function performs an ldapmodify using the script
    </function-prolog>  
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -504,7 +504,7 @@
      This function modifies an entry in the Directory Server
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -623,7 +623,7 @@
      This function performs an ldapsearch using the script
    </function-prolog>  
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -1117,7 +1117,7 @@
      This function searches the Directory Server with optional arguments possible
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -1274,7 +1274,7 @@
      This function searches the Directory Server with optional arguments possible
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -1357,7 +1357,7 @@
      This function searches the Directory Server anonymously with optional arguments possible
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -1436,7 +1436,7 @@
      This function performs an ldapdelete using the script
    </function-prolog>  
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -1755,7 +1755,7 @@
      This function an entry in the Directory Server
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -1876,7 +1876,7 @@
      This function performs an ldapcompare using the script
    </function-prolog>  
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -2200,7 +2200,7 @@
      This function compares the attribute and value an entry to the Directory Server
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -2346,7 +2346,7 @@
      This function performs an ldappasswordmodify using the script
    </function-prolog>  
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -2613,7 +2613,7 @@
      This function modifies an entry in the Directory Server
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -2627,7 +2627,7 @@
        <function-arg-property name="type" value="filepath"/>
      </function-arg-def>
        
      <function-arg-def name="dsInstanceHost" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="dsInstanceHost" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Directory server hostname or IP address
        </function-arg-description>
@@ -2778,7 +2778,7 @@
      This function modifies an entry in the Directory Server
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -2790,7 +2790,7 @@
        </function-arg-description>
        <function-arg-property name="type" value="filepath"/>
      </function-arg-def>
      <function-arg-def name="dsInstanceHost" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="dsInstanceHost" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Directory server hostname or IP address
        </function-arg-description>
@@ -2887,7 +2887,7 @@
      This function rename the rdn
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -2899,7 +2899,7 @@
        </function-arg-description>
        <function-arg-property name="type" value="filepath"/>
      </function-arg-def>
      <function-arg-def name="dsInstanceHost" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="dsInstanceHost" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Directory server hostname or IP address
        </function-arg-description>
opends/tests/functional-tests/shared/functions/security.xml
@@ -34,7 +34,7 @@
      This function generates a server certificate
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -112,7 +112,7 @@
      This function self-signs a certificate
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -157,7 +157,7 @@
      </script>
            
      <call function="'runCommand'" >
        { 'name'      : 'Generate a Self-Signs Server Certificate',
        { 'name'      : 'Generate a Self-Signed Server Certificate',
          'location'  : location,
          'command'   : '%s/bin/keytool' % JAVA_HOME,
          'arguments' : '-selfcert -alias %s -keystore "%s"  -keypass "%s" -storepass "%s" -storetype "%s" ' % (certAlias,keystore,keypass,storepass,storetype),
@@ -186,7 +186,7 @@
      This function exports a certificate
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -270,7 +270,7 @@
      This function imports a certificate
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -345,7 +345,7 @@
      This function returns the fingerprint MD5 or SHA1
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -413,7 +413,7 @@
      This function makes the configuration changes for SSL
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -554,7 +554,7 @@
      This function makes the configuration changes for startTLS
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
            Location of target host
        </function-arg-description>
@@ -695,7 +695,7 @@
      This function makes the configuration changes for SSL and TLS
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -865,7 +865,7 @@
      This function reverses the configuration changes for SSL
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -984,7 +984,7 @@
      This function reverses the configuration changes for startTLS
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
            Location of target host
        </function-arg-description>
@@ -1104,7 +1104,7 @@
      This function reverses the configuration changes for SSL and TLS
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
            Location of target host
        </function-arg-description>
opends/tests/functional-tests/shared/functions/stafcmd.xml
@@ -31,13 +31,13 @@
      This function copies a source file to destination file to host
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
        <function-arg-property name="type" value="hostname"/>
      </function-arg-def>
      <function-arg-def name="remotehost" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="remotehost" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          The name of remote host (default localhost)
        </function-arg-description>
@@ -79,7 +79,7 @@
      Copies files by extension from a source to destination folder on host
    </function-prolog>
    <function-map-args>
     <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
     <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -134,7 +134,7 @@
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -188,7 +188,7 @@
      This function unzips a compressed zip archive
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -234,7 +234,7 @@
    </function-prolog>
    
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -300,7 +300,7 @@
    </function-prolog>
    
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -368,7 +368,7 @@
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -415,7 +415,7 @@
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -460,7 +460,7 @@
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -501,7 +501,7 @@
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -542,7 +542,7 @@
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
@@ -583,7 +583,7 @@
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
opends/tests/functional-tests/shared/functions/staxcmd.xml
@@ -32,7 +32,7 @@
    <function-prolog>Queries the current testcase</function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
opends/tests/functional-tests/shared/functions/tools.xml
@@ -26,52 +26,59 @@
 !      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 ! -->
<stax>
  <!-- This function uses make ldif to generate LDIF data files -->
  <function name="MakeLdif">
    <function-prolog>
      This function uses make ldif to generate LDIF data files
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location"
                        type="optional"
                        default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
        <function-arg-property name="type" value="hostname"/>
      </function-arg-def>
      <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
      <function-arg-def name="dsPath"
                        type="optional"
                        default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
        <function-arg-description>
          Pathname to installation root
        </function-arg-description>
        <function-arg-property name="type" value="filepath"/>
      </function-arg-def>
      <function-arg-def name="version" type="optional">
        <function-arg-description>
          Display Directory Server version information
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </function-arg-def>
      <function-arg-def name="templateFile" type="optional">
        <function-arg-description>
          Path to the template file
        </function-arg-description>
        <function-arg-property name="type" value="filename"/>
      </function-arg-def>
      <function-arg-def name="ldifFile" type="optional">
        <function-arg-description>
          Path to the LDIF file
        </function-arg-description>
        <function-arg-property name="type" value="filename"/>
      </function-arg-def>
      <function-arg-def name="randomSeed " type="optional">
        <function-arg-description>
          The seed to use to initialize the random number generator
        </function-arg-description>
        <function-arg-property name="type" value="integer"/>
      </function-arg-def>
      <function-arg-def name="Help" type="optional">
        <function-arg-description>
          Help option
@@ -79,52 +86,40 @@
        <function-arg-property name="help" value="option"/>
      </function-arg-def>
    </function-map-args>
    <sequence>
      <!-- Build the Command -->
      <script>
        STAFCmdParamsList=[]
        STAFCmdParams=''
        if dsPath:
          dsBinPath='%s/%s' % (dsPath,fileFolder)
          STAFCmd='%s/make-ldif%s' % (dsBinPath,fileExt)
        if version:
          STAFCmdParamsList.append('-V')
        if templateFile:
          STAFCmdParamsList.append('-t %s' % templateFile)
        if ldifFile:
          STAFCmdParamsList.append('-o "%s"' % ldifFile)
        if randomSeed:
          STAFCmdParamsList.append('-s "%s"' % randomSeed)
        if Help:
          STAFCmdParamsList.append('-H')
        STAFCmdParams=' '.join(STAFCmdParamsList)
      </script>
      <message>
        '%s %s' % (STAFCmd, STAFCmdParams)
      </message>
      <process name="'Make Ldif Script'">
        <location>'%s' % location</location>
        <command>'%s' % STAFCmd</command>
        <parms>'%s' % STAFCmdParams</parms>
        <workdir>'%s' % dsBinPath</workdir>
        <envs>
          ['PATH=/bin:/usr/bin:%s' % dsBinPath, 'JAVA_HOME=%s' % JAVA_HOME]
        </envs>
        <console use="'same'"/>
        <stderr mode="'stdout'"/>
        <returnstdout/>
      </process>
      <call function="'runCommand'">
        { 'name'      : 'Make Ldif Script',
          'location'  : location,
          'command'   : STAFCmd,
          'arguments' : STAFCmdParams,
        }
      </call>
      <script>
        STAXCode, STAXReason=STAXResult
      </script>
@@ -135,133 +130,136 @@
          </message>
        </sequence>
      </if>
      <return>[STAXCode, STAXReason]</return>
    </sequence>
  </function> 
  <!-- This function starts DS using the start-ds script -->
  <function name="LdifDiffWithScript">
    <function-prolog>
      This function  compares two LDIF files and reports the differences in LDIF format
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location"
                        type="optional"
                        default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
        <function-arg-property name="type" value="hostname"/>
      </function-arg-def>
     <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
      <function-arg-def name="dsPath"
                       type="optional"
                       default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
        <function-arg-description>
          Pathname to installation root
        </function-arg-description>
        <function-arg-property name="type" value="filepath"/>
      </function-arg-def>
      <function-arg-def name="version" type="optional">
        <function-arg-description>
          Display Directory Server version information
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </function-arg-def>
      </function-arg-def>
      <function-arg-def name="sourceLdif" type="required">
        <function-arg-description>
          LDIF file to use as the source data
        </function-arg-description>
        <function-arg-property name="type" value="filepath"/>
      </function-arg-def>
      </function-arg-def>
      <function-arg-def name="targetLdif" type="required">
        <function-arg-description>
          LDIF file to use as the target data
        </function-arg-description>
        <function-arg-property name="type" value="filepath"/>
      </function-arg-def>
      <function-arg-def name="outputLdif" type="required">
        <function-arg-description>
          File to which the diffs should be written
        </function-arg-description>
        <function-arg-property name="type" value="filepath"/>
      </function-arg-def>
      <function-arg-def name="overwriteExisting" type="optional" default="True">
        <function-arg-description>
          Overwrite existing output file rather than append to it
        </function-arg-description>
        <function-arg-property name="type" value="option"/>
      </function-arg-def>
      </function-arg-def>
      <function-arg-def name="singleValueChanges" type="optional">
        <function-arg-description>
          Write each attribute-level change as a separate modification 
          per attribute value rather than one modification per entry
        </function-arg-description>
        <function-arg-property name="type" value="option"/>
      </function-arg-def>
      </function-arg-def>
      <function-arg-def name="Help" type="optional">
        <function-arg-description>
          Help option
        </function-arg-description>
        <function-arg-property name="help" value="option"/>
      </function-arg-def>
      </function-arg-def>
    </function-map-args>
    <sequence>
      <!-- Build the Command -->
      <script>
        STAFCmdParamsList=[]
        STAFCmdParams=''
        if dsPath:
          dsBinPath='%s/%s' % (dsPath,fileFolder) 
          STAFCmd='%s/ldif-diff%s' % (dsBinPath,fileExt)
        if version:
          STAFCmdParamsList.append('-V')
          STAFCmdParamsList.append('-V')
        if sourceLdif:
          STAFCmdParamsList.append('-s %s' % sourceLdif)
        
        if targetLdif:
          STAFCmdParamsList.append('-t %s' % targetLdif)
        if outputLdif:
          STAFCmdParamsList.append('-o %s' % outputLdif)
        if overwriteExisting:
          STAFCmdParamsList.append('-O')
          STAFCmdParamsList.append('-O')
        if singleValueChanges:
          STAFCmdParamsList.append('-S')
          STAFCmdParamsList.append('-S')
        if Help:
          STAFCmdParamsList.append('-H')
          STAFCmdParamsList.append('-H')
        STAFCmdParams=' '.join(STAFCmdParamsList)
      </script>
      <message>
        '%s %s' % (STAFCmd, STAFCmdParams)
      </message>
      <process name="'LDIF Diff Script'">
        <location>'%s' % location</location>
        <command>'%s' % STAFCmd</command>
        <parms>'%s' % STAFCmdParams</parms>
        <workdir>'%s' % dsBinPath</workdir>
        <location>location</location>
        <command>STAFCmd</command>
        <parms>STAFCmdParams</parms>
        <workdir>dsBinPath</workdir>
        <envs>
          ['PATH=/bin:/usr/bin:%s' % dsBinPath, 'JAVA_HOME=%s' % JAVA_HOME]
        </envs>
        <console use="'same'"/>
        <stderr mode="'stdout'"/>
        <returnstdout/>          
        <returnfile>outputLdif</returnfile>
        <returnfile>outputLdif</returnfile>
      </process>
      <script>
        STAXCode=RC
        STAXReason=STAXResult
      </script>
      </script>
      <script>
        diffsInfo = STAXReason[1]
        diffs = diffsInfo[1]           
@@ -270,58 +268,55 @@
        else:
          diffRC = 1
      </script>
      <return> diffRC </return>
    </sequence>
  </function>
  <function name="verifyTrees">
    <function-prolog>
      This function verifies that the trees in a group of ldap servers are synchronized.
    </function-prolog>
    <function-list-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
    <function-list-args>
      <function-arg-def name="location"
                        type="optional"
                        default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
        <function-arg-property name="type" value="hostname"/>
      </function-arg-def>
     <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
      <function-arg-def name="dsPath"
                       type="optional"
                       default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
        <function-arg-description>
          Pathname to installation root
        </function-arg-description>
        <function-arg-property name="type" value="filepath"/>
      </function-arg-def>
      </function-arg-def>
      <function-arg-def name="referenceServer" type="required">
        <function-arg-description>
          Server that should be taken as reference.
        </function-arg-description>
        <function-arg-property name="type" value="Server"/>
        <function-arg-property name="type" value="Server"/>
      </function-arg-def>
      <function-arg-def name="serverList" type="required">
        <function-arg-description>
          List of the servers to verify against the referenceServer.
        </function-arg-description>
        <function-arg-property name="type" value="Server-list"/>
      </function-arg-def>
      <function-arg-def name="treeSuffix" type="required">
        <function-arg-description>
          Suffix of the tree to verify.
        </function-arg-description>
        <function-arg-property name="type" value="DN"/>
      </function-arg-def>
    </function-list-args>
    </function-list-args>
    <sequence>
      <script>
        myRC = 0
        failedServers = []
@@ -331,73 +326,65 @@
        sampleTree = 'sampleTree.ldif'
        treeDiffs = 'treeDiffs.ldif'
      </script>
       <message>
        'Verify tree %s taking %s as reference.' % (treeSuffix, referenceServerPath)
      </message>
      <!-- Retrieve the tree from the reference server -->
      <call function="'ldapSearchWithScript'">
        { 'location'         : location,
          'dsPath'           : dsPath,
          'dsInstanceHost'  : referenceServer.getHostname() ,
          'dsInstancePort'  : referenceServer.getPort() ,
          'dsInstanceDn'  : referenceServer.getRootDn() ,
          'dsInstancePswd'  : referenceServer.getRootPwd() ,
          'dsBaseDN'  : treeSuffix,
          'dsFilter'  : 'objectclass=*',
          'outputFile'  : referenceTree }
      </call>
        { 'location'       : location,
          'dsPath'         : dsPath,
          'dsInstanceHost' : referenceServer.getHostname(),
          'dsInstancePort' : referenceServer.getPort(),
          'dsInstanceDn'   : referenceServer.getRootDn(),
          'dsInstancePswd' : referenceServer.getRootPwd(),
          'dsBaseDN'       : treeSuffix,
          'dsFilter'       : 'objectclass=*',
          'outputFile'     : referenceTree
        }
      </call>
      <if expr="RC != 0">
        <!-- If the reference tree could not be retrieved, return an error -->
        <!-- If the reference tree could not be retrieved, return an error -->
        <return> [1, None] </return>
      </if>
      <iterate var="server" in="serverList">
      </if>
      <iterate var="server" in="serverList">
        <sequence>
          <!-- Retrieve the same tree for every other server in the list -->
          <!-- Retrieve the same tree for every other server in the list -->
          <call function="'ldapSearchWithScript'">
            { 'location'         : location,
              'dsPath'           : dsPath,
              'dsInstanceHost'  : server.getHostname() ,
              'dsInstancePort'  : server.getPort() ,
              'dsInstanceDn'  : server.getRootDn() ,
              'dsInstancePswd'  : server.getRootPwd() ,
              'dsBaseDN'  : treeSuffix,
              'dsFilter'  : 'objectclass=*',
              'outputFile'  : sampleTree }
          </call>
            { 'location'       : location,
              'dsPath'         : dsPath,
              'dsInstanceHost' : server.getHostname(),
              'dsInstancePort' : server.getPort(),
              'dsInstanceDn'   : server.getRootDn(),
              'dsInstancePswd' : server.getRootPwd(),
              'dsBaseDN'       : treeSuffix,
              'dsFilter'       : 'objectclass=*',
              'outputFile'     : sampleTree
            }
          </call>
          <if expr="RC == 0">
            <sequence>
              <!-- Compare this tree to the reference one -->
              <!-- Compare this tree to the reference one -->
              <call function="'LdifDiffWithScript'">
                { 'location'  : location,
                  'dsPath'  : dsPath,
                  'sourceLdif'  : '%s/../%s' % (dsPath, sampleTree),
                  'targetLdif'  : '%s/../%s' % (dsPath, referenceTree),
                  'outputLdif' : '%s/../%s' % (dsPath, treeDiffs) }
                { 'location'   : location,
                  'dsPath'     : dsPath,
                  'sourceLdif' : '%s/../%s' % (dsPath, sampleTree),
                  'targetLdif' : '%s/../%s' % (dsPath, referenceTree),
                  'outputLdif' : '%s/../%s' % (dsPath, treeDiffs)
                }
              </call>
              <script>
                if STAXResult != 0 :
                  failedServers.append('%s:%s' % (server.getHostname(), server.getPort()))
              </script>
            </sequence>
          <else>
            <script>
              failedServers.append('%s:%s' % (server.getHostname(), server.getPort()))
            </script>
          </else>
          </if>
        </sequence>
      </iterate>
              </script>
            </sequence>
            <else>
              <script>
                failedServers.append('%s:%s' % (server.getHostname(), server.getPort()))
              </script>
            </else>
          </if>
        </sequence>
      </iterate>
      <if expr="len(failedServers) > 0">
        <!-- If at least one server failed to successfully compare to the reference tree,
           !   return an error, along with the list of the servers that failed to do so -->  
@@ -406,70 +393,68 @@
          comma = ','  
          failingServerList = 'List of non-synchronized servers (tree verify FAILED): %s ' % comma.join(failedServers)
        </script>
      <else>
        <script>
          failingServerList = 'All servers synchronized (tree verify SUCCEEDED).'
        </script>
      </else>
        <else>
          <script>
            failingServerList = 'All servers synchronized (tree verify SUCCEEDED).'
          </script>
        </else>
      </if>
      <call function="'checktestRC'">
        { 'returncode' : myRC,
          'result'     : failingServerList ,
          'expected'   : 0 }
      </call>
      <return> [myRC, failedServers] </return>
          'result'     : failingServerList,
          'expected'   : 0
        }
      </call>
      <return>[myRC, failedServers]</return>
    </sequence>
  </function>
  </function>
  <function name="verifySchemas">
    <function-prolog>
      This function verifies that a schema file is synchronized all over a group of servers.
    </function-prolog>
    <function-list-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
    <function-list-args>
      <function-arg-def name="location"
                        type="optional"
                        default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
        </function-arg-description>
        <function-arg-property name="type" value="hostname"/>
      </function-arg-def>
     <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
      <function-arg-def name="dsPath"
                        type="optional"
                        default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
        <function-arg-description>
          Pathname to installation root
        </function-arg-description>
        <function-arg-property name="type" value="filepath"/>
      </function-arg-def>
      </function-arg-def>
      <function-arg-def name="referenceServer" type="required">
        <function-arg-description>
          Server that should be taken as reference.
        </function-arg-description>
        <function-arg-property name="type" value="Server"/>
        <function-arg-property name="type" value="Server"/>
      </function-arg-def>
      <function-arg-def name="serverList" type="required">
        <function-arg-description>
          List of the servers to verify against the referenceServer.
        </function-arg-description>
        <function-arg-property name="type" value="Server-list"/>
      </function-arg-def>
      <function-arg-def name="schemaFile" type="required">
        <function-arg-description>
          Schema file to verify.
        </function-arg-description>
        <function-arg-property name="type" value="filename"/>
      </function-arg-def>
    </function-list-args>
    </function-list-args>
    <sequence>
      <script>
        myRC = 0
        failedServers = []
@@ -478,41 +463,40 @@
        referenceSchema = '%s/config/schema/%s' % (referenceServerPath, schemaFile)
        schemaDiffs = 'schemaDiffs.ldif'
      </script>
      <message>
        'Verify schema file %s taking %s as reference.' % (schemaFile, referenceServerPath)
      </message>
      <iterate var="server" in="serverList">
      <iterate var="server" in="serverList">
        <sequence>
          <!-- Copy reference schema file to other server -->  
          <call function="'copyFile'">
            { 'location'   :  referenceServer.getHostname(),
              'remotehost'  :  server.getHostname(),
              'srcfile'  :  referenceSchema,
              'destfile' :  '%s/reference_%s' % (server.getDir(), schemaFile) }
          </call>
            { 'location'   : referenceServer.getHostname(),
              'remotehost' : server.getHostname(),
              'srcfile'    : referenceSchema,
              'destfile'   : '%s/reference_%s' % (server.getDir(),schemaFile)
            }
          </call>
          <script>
            serverPath = '%s/%s' % (server.getDir(), OPENDSNAME)
          </script>
          </script>
          <!-- Compare this schema to the reference one -->  
          <call function="'LdifDiffWithScript'">
            { 'location'  : location,
              'dsPath'  : dsPath,
              'sourceLdif'  : '%s/config/schema/%s' % (serverPath, schemaFile),
              'targetLdif'  : '%s/reference_%s' % (server.getDir(), schemaFile),
              'outputLdif' : '%s/%s' % (server.getDir(), schemaDiffs) }
            { 'location'   : location,
              'dsPath'     : dsPath,
              'sourceLdif' : '%s/config/schema/%s' % (serverPath, schemaFile),
              'targetLdif' : '%s/reference_%s' % (server.getDir(), schemaFile),
              'outputLdif' : '%s/%s' % (server.getDir(), schemaDiffs)
            }
          </call>
          <script>
            if STAXResult != 0 :
              failedServers.append('%s:%s' % (server.getHostname(), server.getPort()))
          </script>                                                                                                                                                                                             
        </sequence>
      </iterate>
        </sequence>
      </iterate>
      <if expr="len(failedServers) > 0">
        <!-- If at least one server failed to successfully compare to the reference tree,
           !   return an error, along with the list of the servers that failed to do so -->  
@@ -521,97 +505,89 @@
          comma = ','  
          failingServerList = 'List of non-synchronized servers (schema verify FAILED): %s ' % comma.join(failedServers)
        </script>
      <else>
        <script>
          failingServerList = 'All servers synchronized (schema verify SUCCEEDED).'
        </script>
      </else>
        <else>
          <script>
            failingServerList = 'All servers synchronized (schema verify SUCCEEDED).'
          </script>
        </else>
      </if>
      <call function="'checktestRC'">
        { 'returncode' : myRC,
          'result'     : failingServerList ,
          'expected'   : 0 }
      </call>
      <return> [myRC, failedServers] </return>
          'expected'   : 0
        }
      </call>
      <return>[myRC, failedServers]</return>
    </sequence>
  </function>
  </function>
  <function name="deleteTrees">
    <function-prolog>
      This function deletes a (sub)tree from a list of servers.
    </function-prolog>
    <function-list-args>
    <function-list-args>
      <function-arg-def name="serverList" type="required">
        <function-arg-description>
          List of the servers (instances of "Server" class) where the tree will be deleted.
        </function-arg-description>
        <function-arg-property name="type" value="Server-list"/>
      </function-arg-def>
      </function-arg-def>
      <function-arg-def name="treeSuffix" type="required">
        <function-arg-description>
          Suffix of the tree to delete.
        </function-arg-description>
        <function-arg-property name="type" value="DN"/>
      </function-arg-def>
      </function-arg-def>
      <function-arg-def name="startDS" type="optional" default="True">
        <function-arg-description>
          Need to start the Directory Servers before deleting.
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </function-arg-def>
      </function-arg-def>
    </function-list-args>
    <sequence>
      <if expr="startDS">
        <!-- Start the servers in the list -->
        <!-- Start the servers in the list -->
        <call function="'startServers'">
          [serverList]
        </call>
      </if>
      <!-- Delete the tree in every server in the list -->
        </call>
      </if>
      <!-- Delete the tree in every server in the list -->
      <paralleliterate var="server" in="serverList">
        <sequence>
        <sequence>
          <message>
            'Delete suffix %s on server running on host %s on port %s' % (treeSuffix, server.getHostname(), server.getPort())
          </message>
          <!-- Delete suffix and subtree -->
          <call function="'ldapDeleteWithScript'">
            { 'location'  :  server.getHostname(),
              'dsPath'  :  '%s/%s' % (server.getDir(),OPENDSNAME),
              'dsInstanceHost'  :  server.getHostname(),
              'dsInstancePort'  :  server.getPort(),
              'dsInstanceDn'  : server.getRootDn(),
              'dsInstancePswd' :  server.getRootPwd(),
              'dsDn'  :  [treeSuffix],
              'dsDeleteSubtree'  :  True }
          </call>
        </sequence>
            { 'location'        : server.getHostname(),
              'dsPath'          : '%s/%s' % (server.getDir(),OPENDSNAME),
              'dsInstanceHost'  : server.getHostname(),
              'dsInstancePort'  : server.getPort(),
              'dsInstanceDn'    : server.getRootDn(),
              'dsInstancePswd'  : server.getRootPwd(),
              'dsDn'            : [treeSuffix],
              'dsDeleteSubtree' : True
            }
          </call>
        </sequence>
      </paralleliterate>
      <if expr="startDS">
        <!-- Stop the servers in the list -->   
        <call function="'stopServers'">
          [serverList]
        </call>
      </if>
        </call>
      </if>
    </sequence>
  </function>
  <function name="startServers">
    <function-prolog>
      This function starts a list of servers.
@@ -628,75 +604,73 @@
    <sequence>
      <!-- Start the servers in the list -->        
      <paralleliterate var="server" in="serverList">
        <sequence>
        <sequence>
          <message>
            'Start DS on host  %s to run on port %s' % (server.getHostname(),server.getPort())
          </message>
          <!--- Start DS -->                         
          <call function="'StartDsWithScript'">
            { 'location'  : server.getHostname(),
              'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME) }
          </call>
            { 'location' : server.getHostname(),
              'dsPath'   : '%s/%s' % (server.getDir(),OPENDSNAME)
            }
          </call>
          <!--- Check that DS started -->
          <call function="'isAlive'">
            { 'location' : server.getHostname(),
              'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME),
              'dsInstanceHost' : server.getHostname(),
              'dsInstancePort' : server.getPort(),
              'dsInstanceDn' : server.getRootDn(),
              'dsInstancePswd' : server.getRootPwd(),
              'noOfLoops' : 5 ,
              'noOfMilliSeconds' : 2000 }
          </call>
        </sequence>
            { 'location'         : server.getHostname(),
              'dsPath'           : '%s/%s' % (server.getDir(),OPENDSNAME),
              'dsInstanceHost'   : server.getHostname(),
              'dsInstancePort'   : server.getPort(),
              'dsInstanceDn'     : server.getRootDn(),
              'dsInstancePswd'   : server.getRootPwd(),
              'noOfLoops'        : 5 ,
              'noOfMilliSeconds' : 2000
            }
          </call>
        </sequence>
      </paralleliterate>
    </sequence>
  </function>
  <function name="stopServers">
    <function-prolog>
      This function stops a list of servers.
    </function-prolog>
    <function-list-args>
    <function-list-args>
      <function-arg-def name="serverList" type="required">
        <function-arg-description>
          List of the servers (instances of "Server" class) to be stopped.
        </function-arg-description>
        <function-arg-property name="type" value="Server-list"/>
      </function-arg-def>
      </function-arg-def>
    </function-list-args>
    <sequence>
      <!-- Stop the servers in the list -->     
      <paralleliterate var="server" in="serverList">
        <sequence>
        <sequence>
          <message>
            'Stop DS on host  %s running on port %s' % (server.getHostname(),server.getPort())
          </message>
          <!--- Stop DS -->
          <!--- Stop DS -->
          <call function="'StopDsWithScript'">
            { 'location'  : server.getHostname(),
              'dsHost' : server.getHostname(),
              'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME),
              'dsHost'    : server.getHostname(),
              'dsPath'    : '%s/%s' % (server.getDir(),OPENDSNAME),
              'dsPort'    : server.getPort(),
              'dsBindDN'  : server.getRootDn(),
              'dsBindPwd' : server.getRootPwd() }
          </call>
        </sequence>
              'dsBindPwd' : server.getRootPwd()
            }
          </call>
        </sequence>
      </paralleliterate>
    </sequence>
  </function>
  <function name="CLI_rebuild-index">
    <function-prolog>
      This wraps the rebuild-index tool to make it easy to use from STAX
@@ -716,29 +690,19 @@
        </function-arg-description>
      </function-arg-def>
    </function-map-args>
    <sequence>
      <script>
        _cmd='%s/rebuild-index%s' % (dsBinPath,fileExt)
        _args=' -b %s -i %s' % ( baseDN, ' -i '.join(attributes) )
      </script>
      <message log="1" level="'info'">
        '%s %s' % (_cmd,_args)
      </message>
      <process name="'rebuild-index'">
        <location>'%s' % location</location>
        <command>'%s' % _cmd</command>
        <parms>'%s' % _args</parms>
        <workdir>'%s' % dsBinPath</workdir>
        <envs>
          ['PATH=/bin:/usr/bin:%s' % dsBinPath, 'JAVA_HOME=%s' % JAVA_HOME]
        </envs>
        <console use="'same'"/>
        <stderr mode="'stdout'"/>
        <returnstdout/>
      </process>
      <call function="'runCommand'">
        { 'name'      : 'rebuild index',
          'location'  : location,
          'command'   : cmd,
          'arguments' : _args
        }
      </call>
      <return>STAXResult</return>
    </sequence>
  </function>
@@ -773,25 +737,14 @@
        _cmd='%s/verify-index%s' % (dsBinPath,fileExt)
        _args=' -b %s -i %s' % ( baseDN, ' -i '.join(attributes) )
      </script>
      <message log="1" level="'info'">
        '%s %s' % (_cmd,_args)
      </message>
      <process name="'verify-index'">
        <location>'%s' % location</location>
        <command>'%s' % _cmd</command>
        <parms>'%s' % _args</parms>
        <workdir>'%s' % dsBinPath</workdir>
        <envs>
          ['PATH=/bin:/usr/bin:%s' % dsBinPath, 'JAVA_HOME=%s' % JAVA_HOME]
        </envs>
        <console use="'same'"/>
        <stderr mode="'stdout'"/>
        <returnstdout/>
      </process>
      <call function="'runCommand'">
        { 'name'      : 'verify index',
          'location'  : location,
          'command'   : cmd,
          'arguments' : _args
        }
      </call>
      <return>STAXResult</return>
    </sequence>
  </function>
</stax>
opends/tests/functional-tests/shared/functions/topology.xml
@@ -71,7 +71,7 @@
            <if expr="RC == 0 and initialiseInstance == True">
              <sequence>
              <!-- Load the server with default data -->
              <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
              <import machine="STAF_LOCAL_HOSTNAME"
                file="'%s/testcases/quickstart/quickstart.xml' % (TESTS_DIR)" />
              <call function="'main_quickstart'"/>
            </sequence>
opends/tests/functional-tests/shared/functions/utils.xml
@@ -274,7 +274,7 @@
      Checks that the ldap server is running
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAF_REMOTE_HOSTNAME">
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
      </function-arg-description>
@@ -298,25 +298,25 @@
        </function-arg-description>
        <function-arg-property name="type" value="seconds"/>
      </function-arg-def>
      <function-arg-def name="dsInstanceHost" type="optional" default="'%s' % DIRECTORY_INSTANCE_HOST">
      <function-arg-def name="dsInstanceHost" type="optional" default="DIRECTORY_INSTANCE_HOST">
        <function-arg-description>
          Directory server hostname or IP address
        </function-arg-description>
        <function-arg-property name="type" value="hostname"/>
      </function-arg-def>      
      <function-arg-def name="dsInstancePort" type="optional" default="'%s' % DIRECTORY_INSTANCE_PORT">
      <function-arg-def name="dsInstancePort" type="optional" default="DIRECTORY_INSTANCE_PORT">
        <function-arg-description>
          Directory server port number
        </function-arg-description>
        <function-arg-property name="type" value="Port number"/>
      </function-arg-def>
      <function-arg-def name="dsInstanceDn" type="optional" default="'%s' % DIRECTORY_INSTANCE_DN">
      <function-arg-def name="dsInstanceDn" type="optional" default="DIRECTORY_INSTANCE_DN">
        <function-arg-description>
          Bind DN
        </function-arg-description>
        <function-arg-property name="type" value="DN"/>
      </function-arg-def> 
      <function-arg-def name="dsInstancePswd" type="optional" default="'%s' % DIRECTORY_INSTANCE_PSWD">
      <function-arg-def name="dsInstancePswd" type="optional" default="DIRECTORY_INSTANCE_PSWD">
        <function-arg-description>
          Bind password
        </function-arg-description>
@@ -371,7 +371,7 @@
      Sleep for number of milliseconds
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="'%s' % STAXServiceMachine">
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
      </function-arg-description>
@@ -1079,7 +1079,7 @@
      </script>
      <message log="1" level="'info'" if="_displayMessage == True">'%s' % functionMessage</message>
      <message log="1" level="'debug'">'runFunction: %s: called with parameters [%s]' % (functionName,functionArguments)</message>
      <call function="'%s' % functionName">functionArguments</call>
      <call function="functionName">functionArguments</call>
      <script>
        _functionRC = RC
      </script>
@@ -1136,7 +1136,7 @@
          the command to run
        </function-arg-description>
      </function-arg-def>
      <function-arg-def name="path" type="optional" default="'%s' % dsBinPath">
      <function-arg-def name="path" type="optional" default="dsBinPath">
        <function-arg-description>
          the path where the command is to be run from
        </function-arg-description>
@@ -1156,13 +1156,13 @@
      </function-arg-def>
      <function-arg-def name="location" 
                        type="optional" 
                        default="'%s' % STAXServiceMachine">
                        default="STAXServiceMachine">
        <function-arg-description>
          Which machine should the command be executed on
        </function-arg-description>
      </function-arg-def>
      <function-arg-def name="name" 
                        default="'Run a system command'"
                        default="'Running %s' % command"
                        type="optional">
        <function-arg-description>
          The name to give the process (only matters in the STAX Monitor really)
@@ -1188,17 +1188,19 @@
      <message>
        'Running command:\n %s %s\nenv: %s\nworkdir: %s' % (command,arguments,env,path)
      </message>
      <process name="name">
        <location>location</location>
        <command>command</command>
        <parms>arguments</parms>
        <workdir>path</workdir>
        <envs>env</envs>
        <console use="'same'"/>
        <stderr mode="'stdout'"/>
        <returnstdout/>
      </process>
      <block name="'runCommand wrapper'">
        <process name="name">
          <location>location</location>
          <command>command</command>
          <parms>arguments</parms>
          <workdir>path</workdir>
          <envs>env</envs>
          <console use="'same'"/>
          <stderr mode="'stdout'"/>
          <returnstdout/>
        </process>
      </block>
      <message level="'info'">
        'Command returned:\n%s' % STAXResult[0][1]
      </message>
opends/tests/functional-tests/testcases/aci/aci.xml
@@ -45,75 +45,75 @@
          <call function="'testGroup_Preamble'"/>
                                                                
   
<!--          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
<!--          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/global_acis.xml' % (TESTS_DIR)"/>
          <call function="'global_acis'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_target.xml' % (TESTS_DIR)"/>
          <call function="'aci_target'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_targetattr.xml' % (TESTS_DIR)"/>
          <call function="'aci_targetattr'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_targetfilter.xml' % (TESTS_DIR)"/>
          <call function="'aci_targetfilter'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_targattrfilter.xml' % (TESTS_DIR)"/>
          <call function="'aci_targattrfilter'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_targetscope.xml' % (TESTS_DIR)"/>
          <call function="'aci_targetscope'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_delete_entry.xml' % (TESTS_DIR)"/>
          <call function="'aci_delete_entry'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_add_entry.xml' % (TESTS_DIR)"/>
          <call function="'aci_add_entry'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_entry.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_entry'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_compare_tests.xml' % (TESTS_DIR)"/>
          <call function="'aci_compare_tests'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/multiple_aci_tests.xml' % (TESTS_DIR)"/>
          <call function="'multiple_aci_tests'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_rdn.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_rdn'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_rdn_wildcards.xml' % (TESTS_DIR)"/>
          <call function="'aci_rdn_wildcards'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_bindtypes.xml' % (TESTS_DIR)"/>
          <call function="'aci_bindtypes'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_proxy_auth.xml' % (TESTS_DIR)"/>
          <call function="'aci_proxy_auth'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_effective_rights.xml' % (TESTS_DIR)"/>
          <call function="'aci_effective_rights'" />
  -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_import.xml' % (TESTS_DIR)"/>
          <call function="'aci_import'" />
  
opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
                                        
@@ -1916,7 +1916,7 @@
            </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
                                              
opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
@@ -5619,7 +5619,7 @@
          </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
@@ -1834,7 +1834,7 @@
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
                                        
@@ -2318,7 +2318,7 @@
            </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
            
opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml
@@ -53,7 +53,7 @@
                #@TestScript                aci_effective_rights.xml
          -->
    
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
@@ -3073,7 +3073,7 @@
              </sequence>
            </testcase>
    
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
  
opends/tests/functional-tests/testcases/aci/aci_import.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
@@ -280,7 +280,7 @@
          </testcase>
        
                
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
                                        
@@ -3377,7 +3377,7 @@
          </testcase>
            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />                     
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml
@@ -53,7 +53,7 @@
                #@TestScript                aci_modify_filter_test.xml
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
                                        
@@ -79,7 +79,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci1.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci1'" />
  
@@ -105,7 +105,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci2.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci2'" />
  
@@ -131,7 +131,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci3.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci3'" />
@@ -157,7 +157,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci4.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci4'" />
  
@@ -183,7 +183,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci5.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci5'" />
  
@@ -209,7 +209,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci6.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci6'" />
  
@@ -235,7 +235,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci11.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci11'" />
  
@@ -261,7 +261,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci12.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci12'" />
  
@@ -287,7 +287,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci13.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci13'" />
@@ -313,7 +313,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci14.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci14'" />
  
@@ -339,7 +339,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci15.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci15'" />
  
@@ -365,7 +365,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci16.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci16'" />
  
@@ -391,7 +391,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci21.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci21'" />
  
@@ -417,7 +417,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci22.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci22'" />
  
@@ -443,7 +443,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci23.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci23'" />
@@ -469,7 +469,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci24.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci24'" />
  
@@ -495,7 +495,7 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci25.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci25'" />
  
@@ -521,11 +521,11 @@
                #@TestResult                Success if OpenDS returns 0 or 50
                                            where appropriate
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests_aci26.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests_aci26'" />
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
            
opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
@@ -2147,7 +2147,7 @@
          </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml
@@ -53,7 +53,7 @@
              #@TestScript                aci_proxy_auth.xml
          -->
          
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
@@ -2682,7 +2682,7 @@
            </sequence>
          </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
          
opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
@@ -2077,7 +2077,7 @@
          </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
                                        
@@ -1697,7 +1697,7 @@
          </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
                                        
opends/tests/functional-tests/testcases/aci/aci_target.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
@@ -4052,7 +4052,7 @@
          </testcase>
            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
@@ -54,7 +54,7 @@
          -->
            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
                          
@@ -1600,7 +1600,7 @@
          </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
                                              
opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
                                          
@@ -3248,7 +3248,7 @@
          </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
            
opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
@@ -1166,7 +1166,7 @@
          </testcase>
            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
opends/tests/functional-tests/testcases/aci/global_acis.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
@@ -974,7 +974,7 @@
            </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
            
@@ -4342,7 +4342,7 @@
          </testcase>
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />         
opends/tests/functional-tests/testcases/backends/backends.xml
@@ -44,35 +44,35 @@
          <call function="'testGroup_Preamble'"/>
            
                            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/import.xml' % (TESTS_DIR)"/>
          <call function="'main_import'" />
 
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/import-tasks.xml' % (TESTS_DIR)"/>
          <call function="'main_import-tasks'" />
               
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backup-tasks.xml' % (TESTS_DIR)"/>
          <call function="'main_backup-tasks'" />
          
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backup.xml' % (TESTS_DIR)"/>
          <call function="'main_backup'" />
   
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/restore-tasks.xml' % (TESTS_DIR)"/>
          <call function="'main_restore-tasks'" />
        
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/restore.xml' % (TESTS_DIR)"/>
          <call function="'main_restore'" />
                
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/export-tasks.xml' % (TESTS_DIR)"/>
          <call function="'main_export-tasks'" />
         
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/export.xml' % (TESTS_DIR)"/>
          <call function="'main_export'" />
                    
opends/tests/functional-tests/testcases/backends/backup-tasks.xml
@@ -47,7 +47,7 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
          <call function="'backend_setup'"> { 'loadBackend' : True } </call>
@@ -84,7 +84,7 @@
            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'backend_cleanup'"/>
opends/tests/functional-tests/testcases/backends/backup.xml
@@ -57,7 +57,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
          <call function="'backend_setup'"> 
            { 'startDS' : False,
@@ -255,7 +255,7 @@
          </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'backend_cleanup'"> { 'stopDS' : False } </call>
opends/tests/functional-tests/testcases/backends/export-tasks.xml
@@ -56,7 +56,7 @@
            #@TestHTMLLink        http://opends.dev.java.net/
          -->           
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
          <call function="'backend_setup'"> { 'loadBackend' : True } </call>
@@ -386,7 +386,7 @@
             </sequence>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'backend_cleanup'"/>
opends/tests/functional-tests/testcases/backends/export.xml
@@ -57,7 +57,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
          <call function="'backend_setup'"> 
            { 'startDS' : False,
@@ -2045,7 +2045,7 @@
                 <!-- Need to know what the error codes are -->                                 
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'backend_cleanup'"> { 'stopDS' : False } </call>
opends/tests/functional-tests/testcases/backends/import-tasks.xml
@@ -57,7 +57,7 @@
          -->
        
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
          <call function="'backend_setup'" />           
            
@@ -1346,7 +1346,7 @@
            <!-- Need to know what the error codes are -->
                
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'backend_cleanup'" />
                                    
opends/tests/functional-tests/testcases/backends/import.xml
@@ -57,7 +57,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
          <call function="'backend_setup'"> { 'startDS' : False } </call>
                
@@ -1297,7 +1297,7 @@
            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'backend_cleanup'"> { 'stopDS' : False } </call>              
            
opends/tests/functional-tests/testcases/backends/restore-tasks.xml
@@ -57,7 +57,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
          <call function="'backend_setup'"> { 'loadBackend' : True } </call>      
@@ -106,7 +106,7 @@
            </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'backend_cleanup'"/>
opends/tests/functional-tests/testcases/backends/restore.xml
@@ -57,7 +57,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
          <call function="'backend_setup'"> 
            { 'startDS' : True,
@@ -226,7 +226,7 @@
            </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'backend_cleanup'"> { 'stopDS' : True } </call>
opends/tests/functional-tests/testcases/clu/cluCompare.xml
@@ -57,7 +57,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/clu/clu_setup.xml' % (TESTS_DIR)"/>
          <call function="'clu_setup'"> 
            { 'startDS' : True,
@@ -106,7 +106,7 @@
                                            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/clu/clu_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'clu_cleanup'"> { 'stopDS' : True } </call>
opends/tests/functional-tests/testcases/clu/cluDelete.xml
@@ -57,7 +57,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/clu/clu_setup.xml' % (TESTS_DIR)"/>
          <call function="'clu_setup'"> 
            { 'startDS' : True,
@@ -106,7 +106,7 @@
                                            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/clu/clu_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'clu_cleanup'"> { 'stopDS' : True } </call>
opends/tests/functional-tests/testcases/clu/cluModify.xml
@@ -57,7 +57,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/clu/clu_setup.xml' % (TESTS_DIR)"/>
          <call function="'clu_setup'"> 
            { 'startDS' : True,
@@ -845,7 +845,7 @@
                
                 
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/clu/clu_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'clu_cleanup'"> { 'stopDS' : True } </call>
opends/tests/functional-tests/testcases/clu/cluSearch.xml
@@ -57,7 +57,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/clu/clu_setup.xml' % (TESTS_DIR)"/>
          <call function="'clu_setup'"> 
            { 'startDS' : True,
@@ -1125,7 +1125,7 @@
                 </testcase>
                 
                 
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/clu/clu_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'clu_cleanup'"> { 'stopDS' : True } </call>
opends/tests/functional-tests/testcases/clu/commands.xml
@@ -43,19 +43,19 @@
      
          <call function="'testGroup_Preamble'"/>
                                
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/clu/cluSearch.xml' % (TESTS_DIR)"/>
          <call function="'main_cluSearch'" />
                            
       <!--   <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
       <!--   <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/clu/cluModify.xml' % (TESTS_DIR)"/>
          <call function="'main_cluModify'" /> -->
                                                
          <!-- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <!-- <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/clu/cluCompare.xml' % (TESTS_DIR)"/>
          <call function="'main_cluCompare'" />
                                    
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/clu/cluDelete.xml' % (TESTS_DIR)"/>
          <call function="'main_cluDelete'" /> -->
                      
opends/tests/functional-tests/testcases/core/core.xml
@@ -45,23 +45,23 @@
            
            
                      
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/core/core_entry_cache.xml' % (TESTS_DIR)"/>
          <call function="'core_entry_cache'" />
             
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/core/core_search_sizelimit.xml' % (TESTS_DIR)"/>
          <call function="'core_search_sizelimit'" />
          
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/core/core_search_timelimit.xml' % (TESTS_DIR)"/>
          <call function="'core_search_timelimit'" />
          
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/core/core_tf_filters.xml' % (TESTS_DIR)"/>
          <call function="'core_tf_filters'" />
          
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/core/core_version_report.xml' % (TESTS_DIR)"/>
          <call function="'core_version_report'" />
          
opends/tests/functional-tests/testcases/core/core_entry_cache.xml
@@ -46,7 +46,7 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)"/>
          <call function="'core_setup'"/>
@@ -223,7 +223,7 @@
          </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/core/core_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'core_cleanup'"/>
opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
@@ -46,7 +46,7 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)"/>
          <call function="'core_setup'"/>
@@ -323,7 +323,7 @@
          </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/core/core_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'core_cleanup'"/>
opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
@@ -46,7 +46,7 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)"/>
          <call function="'core_setup'"/>
@@ -336,7 +336,7 @@
          </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/core/core_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'core_cleanup'"/>
opends/tests/functional-tests/testcases/core/core_tf_filters.xml
@@ -46,7 +46,7 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)"/>
          <call function="'core_setup'"/>
@@ -149,7 +149,7 @@
          </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/core/core_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'core_cleanup'"/>
opends/tests/functional-tests/testcases/core/core_version_report.xml
@@ -46,7 +46,7 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)"/>
          <call function="'core_setup'"/>
                                                            
@@ -77,7 +77,7 @@
          </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/core/core_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'core_cleanup'"/>
opends/tests/functional-tests/testcases/groups/group_dynamic.xml
@@ -79,9 +79,9 @@
          #@TestHTMLLink        http://opends.dev.java.net/
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_setup.xml' % (TESTS_DIR)"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_lib.xml' % (TESTS_DIR)"/>
                    
          <call function="'group_setup'"> { 'startDS' : True } </call>
@@ -472,7 +472,7 @@
          
          
          <!-- *********************************************** -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
              file="'%s/testcases/groups/group_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'group_cleanup'"> { 'stopDS' : True } </call>
          
opends/tests/functional-tests/testcases/groups/group_static_member.xml
@@ -75,9 +75,9 @@
          #@TestHTMLLink        http://opends.dev.java.net/
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_setup.xml' % (TESTS_DIR)"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_lib.xml' % (TESTS_DIR)"/>
          
          <call function="'group_setup'"> { 'startDS' : True } </call>
@@ -753,7 +753,7 @@
          
          
          <!-- *********************************************** -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
              file="'%s/testcases/groups/group_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'group_cleanup'"> { 'stopDS' : True } </call>
          
opends/tests/functional-tests/testcases/groups/group_static_uniquemember.xml
@@ -75,9 +75,9 @@
          #@TestHTMLLink        http://opends.dev.java.net/
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_setup.xml' % (TESTS_DIR)"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_lib.xml' % (TESTS_DIR)"/>
          
          <call function="'group_setup'"> { 'startDS' : True } </call>
@@ -750,7 +750,7 @@
          
          
          <!-- *********************************************** -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
              file="'%s/testcases/groups/group_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'group_cleanup'"> { 'stopDS' : True } </call>
          
opends/tests/functional-tests/testcases/groups/group_virtual_static.xml
@@ -71,9 +71,9 @@
          #@TestHTMLLink        http://opends.dev.java.net/
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_setup.xml' % (TESTS_DIR)"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_lib.xml' % (TESTS_DIR)"/>
                    
          <call function="'group_setup'"> { 'startDS' : True } </call>
@@ -726,7 +726,7 @@
                             
          
          <!-- *********************************************** -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
              file="'%s/testcases/groups/group_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'group_cleanup'"> { 'stopDS' : True } </call>
          
opends/tests/functional-tests/testcases/groups/groups.xml
@@ -45,19 +45,19 @@
      
          <call function="'testGroup_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_static_uniquemember.xml' % (TESTS_DIR)"/>
          <call function="'main_staticgroup_uniquemember'" />
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_static_member.xml' % (TESTS_DIR)"/>
          <call function="'main_staticgroup_member'" />
          
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_dynamic.xml' % (TESTS_DIR)"/>
          <call function="'main_dynamicgroup'" />
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_virtual_static.xml' % (TESTS_DIR)"/>
          <call function="'main_virtualStaticGroup'" />
          
opends/tests/functional-tests/testcases/indexes/indexes.xml
@@ -62,7 +62,7 @@
          </catch>
          <finally>
            <iterate in="_cleanupSteps" var="_cleanupStep">
              <call function="'%s' % _cleanupStep" />
              <call function="_cleanupStep" />
            </iterate>
          </finally>
        </try>
@@ -478,7 +478,7 @@
                    
              </script>
              <message level="'trace'">'%s searchReturnCode=[%s] srt=[%s] searchResultString=[%s] string looked for=[%s]' % (test.desc(), searchReturnCode, srt, searchResultString, test.getSearchString())</message>
              <tcstatus result="'%s' % test.getStatus()" />
              <tcstatus result="test.getStatus()" />
              <call function="'testCase_Postamble'" />
              <script>
                testNumber=testNumber+1
opends/tests/functional-tests/testcases/privileges/privileges.xml
@@ -45,31 +45,31 @@
          <call function="'testGroup_Preamble'"/>
                                                                
   
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_users.xml' % (TESTS_DIR)"/>
          <call function="'privileges_users'" />
  
         <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
         <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_directory_manager.xml' % (TESTS_DIR)"/>
          <call function="'privileges_directory_manager'" />
  
         <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
         <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_new_root_user.xml' % (TESTS_DIR)"/>
          <call function="'privileges_new_root_user'" />
  
         <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
         <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_import_task.xml' % (TESTS_DIR)"/>
          <call function="'privileges_import_task'" />
  
         <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
         <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_export_task.xml' % (TESTS_DIR)"/>
          <call function="'privileges_export_task'" />
  
         <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
         <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_backup_task.xml' % (TESTS_DIR)"/>
          <call function="'privileges_backup_task'" />
  
         <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
         <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_restore_task.xml' % (TESTS_DIR)"/>
          <call function="'privileges_restore_task'" />
  
opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_setup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_setup'" />
@@ -468,7 +468,7 @@
            </sequence>
          </testcase>
        
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_cleanup'" />
opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_setup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_setup'" />
@@ -1995,7 +1995,7 @@
           
         
            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_cleanup'" />
opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_setup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_setup'" />
@@ -470,7 +470,7 @@
            </sequence>
          </testcase>
        
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_cleanup'" />
opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_setup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_setup'" />
@@ -469,7 +469,7 @@
            </sequence>
          </testcase>
        
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_cleanup'" />
opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_setup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_setup'" />
@@ -1979,7 +1979,7 @@
          </testcase>
         
            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_cleanup'" />
opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_setup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_setup'" />
@@ -650,7 +650,7 @@
            </sequence>
          </testcase>
        
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_cleanup'" />
opends/tests/functional-tests/testcases/privileges/privileges_users.xml
@@ -54,7 +54,7 @@
          -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_setup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_setup'" />
@@ -3078,7 +3078,7 @@
          </testcase>
            
           
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_cleanup'" />
opends/tests/functional-tests/testcases/replication/basic/replication_basic.xml
@@ -56,11 +56,11 @@
          -->
            
                                                                        
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/replication_setup.xml' % (TESTS_DIR)"/>
          <call function="'replication_setup'" />
    
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/basic/replication_basic_setup.xml' % (TESTS_DIR)"/>
          <call function="'replication_basic_setup'" />
                                    
@@ -1562,7 +1562,7 @@
                                                
                            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/replication_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'replication_cleanup'" />
                          
opends/tests/functional-tests/testcases/replication/replication.xml
@@ -45,27 +45,27 @@
      
          <call function="'testGroup_Preamble'"/>
            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/totalupdate/totalupdate.xml' % (TESTS_DIR)"/>
          <call function="'main_totalupdate'" />
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/binarycopy/replication_binarycopy.xml' % (TESTS_DIR)"/>
          <call function="'replication_binarycopy'" />          
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/ldifimport/replication_ldifimport.xml' % (TESTS_DIR)"/>
          <call function="'replication_ldifimport'" />          
                        
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/resynchronization/replication_resynchronization.xml' % (TESTS_DIR)"/>
          <call function="'replication_resynchronization'" />          
            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/basic/replication_basic.xml' % (TESTS_DIR)"/>
          <call function="'replication_basic'" />          
                                          
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/schema/replication_schema.xml' % (TESTS_DIR)"/>
          <call function="'replication_schema'" />          
            
opends/tests/functional-tests/testcases/replication/totalupdate/replication_binarycopy.xml
@@ -56,7 +56,7 @@
          -->
            
                                                                                    
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/replication_setup.xml' % (TESTS_DIR)"/>
          <call function="'replication_setup'" />
                                    
@@ -285,7 +285,7 @@
            
                        
 
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/replication_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'replication_cleanup'" />
                                          
opends/tests/functional-tests/testcases/replication/totalupdate/replication_ldifimport.xml
@@ -56,7 +56,7 @@
          -->
            
                                                                                    
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/replication_setup.xml' % (TESTS_DIR)"/>
          <call function="'replication_setup'" />
                                    
@@ -283,7 +283,7 @@
                                                            
          
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/replication_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'replication_cleanup'" />
                                          
opends/tests/functional-tests/testcases/replication/totalupdate/replication_resynchronization.xml
@@ -56,7 +56,7 @@
          -->
            
                                                                                    
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/replication_setup.xml' % (TESTS_DIR)"/>
          <call function="'replication_setup'" />
                                    
@@ -299,7 +299,7 @@
                                                                      
                      
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/replication_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'replication_cleanup'" />
                                          
opends/tests/functional-tests/testcases/replication/totalupdate/replication_schema.xml
@@ -56,7 +56,7 @@
          -->
            
                                                                                    
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/replication_setup.xml' % (TESTS_DIR)"/>
          <call function="'replication_setup'" />
                                    
@@ -296,7 +296,7 @@
          </testcase>         
-->                                                            
 
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/replication_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'replication_cleanup'" />
                                          
opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
@@ -45,7 +45,7 @@
          <call function="'testSuite_Preamble'"/>
                                                            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/replication_setup.xml' % (TESTS_DIR)"/>
          <call function="'replication_setup'" />
@@ -155,7 +155,7 @@
            
          </testcase>          
          
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/replication_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'replication_cleanup'" />
                                          
opends/tests/functional-tests/testcases/runTestJob.xml
@@ -36,7 +36,7 @@
      
      <job name="'Job: %s %s' % (STAF_REMOTE_HOSTNAME,TEST_OS_STRING) " monitor="1" clearlogs="'Enabled'" logtcstartstop="'Enabled'">
        <job-file>'%s/testcases/runFuncTests.xml' % TESTS_DIR</job-file>
        <job-scriptfiles machine="'%s' % STAF_LOCAL_HOSTNAME">['%s/config/config.py' % TESTS_DIR ]</job-scriptfiles>
        <job-scriptfiles machine="STAF_LOCAL_HOSTNAME">['%s/config/config.py' % TESTS_DIR ]</job-scriptfiles>
        <job-action>
          <log>'Started sub-job %s on %s' % (STAXSubJobID,STAF_REMOTE_HOSTNAME)</log>
        </job-action>
@@ -67,7 +67,7 @@
      <script>
        NO_CHECK = 'noCheck'
      </script>
      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
      <import machine="STAF_LOCAL_HOSTNAME"
        file="'%s/utils.xml' % (TESTS_FUNCTIONS_DIR)" />
      
      <!-- Get Directory Server Variables -->
opends/tests/functional-tests/testcases/sample/sample.xml
@@ -53,13 +53,13 @@
            <!-- the sequence tag is superfluous here since there is only a 
                 single instruction to execute within the iterate block 
             -->
            <call function="'%s' % setupStep" />
            <call function="setupStep" />
          </iterate>
          <iterate in="['passing_test']" var="testStep">
            <!-- the sequence tag is superfluous here since there is only a 
                 single instruction to execute within the iterate block 
             -->
            <call function="'%s' % testStep" />
            <call function="testStep" />
          </iterate>
        </sequence>
        <catch exception="'STAFException.Topology.CreationException'">
@@ -83,7 +83,7 @@
        </catch>
        <finally>
          <iterate in="['sample_cleanup','testSuite_Postamble','testGroup_Postamble']" var="testStep">
            <call function="'%s' % testStep" />
            <call function="testStep" />
          </iterate>
        </finally>
      </try>
opends/tests/functional-tests/testcases/schema/schema.xml
@@ -46,11 +46,11 @@
            
          <!-- Call the test suites -->
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/schema/schema_rfc_tests.xml' % TESTS_DIR" />
          <call function="'schema_rfc_tests'" />
          
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/schema/schema_dynamic.xml' % TESTS_DIR" />
          <call function="'schema-dynamic'" />
opends/tests/functional-tests/testcases/schema/schema_dynamic.xml
@@ -58,7 +58,7 @@
        -->
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/schema/schema_setup.xml' % (TESTS_DIR)"/>
          <call function="'schema_setup'"/>
@@ -354,7 +354,7 @@
        </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/schema/schema_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'schema_cleanup'"/>
opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
@@ -46,7 +46,7 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/schema/schema_setup.xml' % (TESTS_DIR)"/>
          <call function="'schema_setup'"/>
                                          
@@ -1018,7 +1018,7 @@
        </testcase>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/schema/schema_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'schema_cleanup'"/>
opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
@@ -46,31 +46,31 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>
                                                          
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/account_activation/security_setup_account_activation.xml' % (TESTS_DIR)"/>
          <call function="'setup_account_activation'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/account_activation/security_test_account.xml' % (TESTS_DIR)"/>
          <call function="'test_account'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/account_activation/security_account_expiration.xml' % (TESTS_DIR)"/>
          <call function="'account_expiration'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/account_activation/security_teardown_account_activation.xml' % (TESTS_DIR)"/>
          <call function="'teardown_account_activation'" />
            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>
opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
@@ -46,45 +46,45 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>
                                                          
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml' % (TESTS_DIR)"/>
          <call function="'setup_auth_pwd_syntax'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml' % (TESTS_DIR)"/>
          <call function="'auth_pwd_syntax_MD5_policy'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml' % (TESTS_DIR)"/>
          <call function="'auth_pwd_syntax_SHA256_policy'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml' % (TESTS_DIR)"/>
          <call function="'auth_pwd_syntax_SHA384_policy'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml' % (TESTS_DIR)"/>
          <call function="'auth_pwd_syntax_SHA512_policy'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml' % (TESTS_DIR)"/>
          <call function="'auth_pwd_syntax_SHA1_policy'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml' % (TESTS_DIR)"/>
          <call function="'auth_pwd_syntax_def_policy'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml' % (TESTS_DIR)"/>
          <call function="'teardown_auth_pwd_syntax'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>
opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
@@ -46,26 +46,26 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>
              
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml' % (TESTS_DIR)"/>
          <call function="'setup_bind_no_pwd'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/bind_no_pwd/security_pwd_null.xml' % (TESTS_DIR)"/>
          <call function="'pwd_null'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml' % (TESTS_DIR)"/>
          <call function="'teardown_bind_no_pwd'" />
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>
opends/tests/functional-tests/testcases/security/client_auth/client_auth.xml
@@ -44,49 +44,49 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
           file="'%s/testcases/security/client_auth/client_auth_lib.xml' % (TESTS_DIR)" />
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>         
  
            <!--  client authentication setup -->
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/client_auth/client_auth_setup.xml' % (TESTS_DIR)"/>
          <call function="'client_auth_setup'" />
                
            <!-- fingerprint certificates mapper -->
            
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/client_auth/fingerprint_mapper.xml' % (TESTS_DIR)"/>
          <call function="'fingerprint_mapper'" />
  
          <!-- subject DN to user attribut certificate mapper -->
    
             <import machine="'%s' % STAF_LOCAL_HOSTNAME"
             <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/client_auth/subject_dn_mapper.xml' % (TESTS_DIR)"/>
          <call function="'subject_dn_mapper'" />
            
            <!-- subject attribute  to user attribut certificate mapper -->
        
             <import machine="'%s' % STAF_LOCAL_HOSTNAME"
             <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/client_auth/subject_attribute_mapper.xml' % (TESTS_DIR)"/>
          <call function="'subject_attribute_mapper'" />
        
            <!-- subject equals dn certificate mapper -->       
             <import machine="'%s' % STAF_LOCAL_HOSTNAME"
             <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/client_auth/equal_dn_mapper.xml' % (TESTS_DIR)"/>
          <call function="'equal_dn_mapper'" />
            
          <!--  client authentication teardown -->
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/client_auth/client_auth_teardown.xml' % (TESTS_DIR)"/>
          <call function="'client_auth_teardown'" />    
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>                                         
opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
@@ -82,8 +82,8 @@
            'Create folder %s' % (CERT_TMP)
          </message>  
          <call function="'createFolder'">
              { 'location' : '%s' % (DIRECTORY_INSTANCE_HOST),
                 'foldername' : '%s' % (CERT_TMP) }
              { 'location' : DIRECTORY_INSTANCE_HOST,
                 'foldername' : CERT_TMP }
          </call>       
          <call function="'checktestRC'">
             { 'returncode' : RC ,
@@ -378,8 +378,7 @@
            for line in cert_file.readlines():
              index_cert = line.find("CERTIFICATE")
              if index_cert == -1:
                line=line.strip()
              ret_str = ret_str + line
                ret_str+=line.strip()
              
            listAttr = []
            listAttr.append('dn: %s' % USER_1_DN)
@@ -453,8 +452,7 @@
            for line in cert_file.readlines():
              index_cert = line.find("CERTIFICATE")
              if index_cert == -1:
                line=line.strip()
              ret_str = ret_str + line
                ret_str+=line.strip()
          </script>
          
          <!-- Modify the user Entry to store the certificates -->    
opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
@@ -84,8 +84,8 @@
            </message>  
            
            <call function="'deleteFolder'">
            { 'location' : '%s' % (DIRECTORY_INSTANCE_HOST),
              'foldername' : '%s' % (CERT_TMP) }
            { 'location' : DIRECTORY_INSTANCE_HOST,
              'foldername' : CERT_TMP }
            </call> 
              
            <!--- Remove JKS Keystore -->
opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
@@ -102,8 +102,8 @@
      <!-- get the fingerprint for USER_1_CERT -->                   
      <call function="'getFingerprint'">
           { 'certAlias'        : '%s' % USER_1_CERT,  
            'storepass'       : '%s' % (CLIENT_STOREPASS),
            'keystore'        : '%s' % (CLIENT_KEYSTORE) }
            'storepass'       : CLIENT_STOREPASS,
            'keystore'        : CLIENT_KEYSTORE }
      </call> 
    
      <script>
@@ -125,8 +125,8 @@
      <!-- get the fingerprint for USER_2_CERT -->                   
      <call function="'getFingerprint'">
           { 'certAlias'        : '%s' % USER_2_CERT,  
            'storepass'       : '%s' % (CLIENT_STOREPASS),
            'keystore'        : '%s' % (CLIENT_KEYSTORE) }
            'storepass'       : CLIENT_STOREPASS,
            'keystore'        : CLIENT_KEYSTORE }
      </call> 
    
      <script>
@@ -480,8 +480,8 @@
      <!-- get the fingerprint for USER_1_CERT -->                   
      <call function="'getFingerprint'">
           { 'certAlias'        : '%s' % USER_1_CERT,  
            'storepass'       : '%s' % (CLIENT_STOREPASS),
            'keystore'        : '%s' % (CLIENT_KEYSTORE) }
            'storepass'       : CLIENT_STOREPASS,
            'keystore'        : CLIENT_KEYSTORE }
      </call> 
    
      <script>
@@ -505,8 +505,8 @@
      <!-- get the fingerprint for USER_2_CERT -->                   
      <call function="'getFingerprint'">
           { 'certAlias'        : '%s' % USER_2_CERT,  
            'storepass'       : '%s' % (CLIENT_STOREPASS),
            'keystore'        : '%s' % (CLIENT_KEYSTORE) }
            'storepass'       : CLIENT_STOREPASS,
            'keystore'        : CLIENT_KEYSTORE }
      </call> 
    
      <script>
opends/tests/functional-tests/testcases/security/jks/security_jks.xml
@@ -46,27 +46,27 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>
                                                            
     
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/jks/security_setup_jks.xml' % (TESTS_DIR)"/>
          <call function="'setup_jks'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/jks/security_bob_jks.xml' % (TESTS_DIR)"/>
          <call function="'bob_jks'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/jks/security_teardown_jks.xml' % (TESTS_DIR)"/>
          <call function="'teardown_jks'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>
opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
@@ -46,27 +46,27 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>
                                                 
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pkcs12/security_setup_pkcs12.xml' % (TESTS_DIR)"/>
          <call function="'setup_pkcs12'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pkcs12/security_bob_pkcs12.xml' % (TESTS_DIR)"/>
          <call function="'bob_pkcs12'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pkcs12/security_teardown_pkcs12.xml' % (TESTS_DIR)"/>
          <call function="'teardown_pkcs12'" />
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>
opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
@@ -46,70 +46,70 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>
                                                              
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_setup_pwd_policy.xml' % (TESTS_DIR)"/>
          <call function="'setup_pwd_policy'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_user_pwd_policy.xml' % (TESTS_DIR)"/>
          <call function="'user_pwd_policy'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_force_pwd_change.xml' % (TESTS_DIR)"/>
          <call function="'force_pwd_change'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml' % (TESTS_DIR)"/>
          <call function="'force_pwd_change_all_users'" />
          <!--
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_enable_max_pwd_age.xml' % (TESTS_DIR)"/>
          <call function="'enable_max_pwd_age'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_disable_max_pwd_age.xml' % (TESTS_DIR)"/>
          <call function="'disable_max_pwd_age'" />
          -->
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_min_pwd_age.xml' % (TESTS_DIR)"/>
          <call function="'min_pwd_age'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_lockout_fail_cnt.xml' % (TESTS_DIR)"/>
          <call function="'lockout_fail_cnt'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_grace_login.xml' % (TESTS_DIR)"/>
          <call function="'grace_login'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_mult_pwd_policies.xml' % (TESTS_DIR)"/>
          <call function="'mult_pwd_policies'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_preencoded_pwds.xml' % (TESTS_DIR)"/>
          <call function="'preencoded_pwds'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_lockout_duration.xml' % (TESTS_DIR)"/>
          <call function="'lockout_duration'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_last_login.xml' % (TESTS_DIR)"/>
          <call function="'last_login'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_teardown_pwd_policy.xml' % (TESTS_DIR)"/>
          <call function="'teardown_pwd_policy'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>
opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml
@@ -46,19 +46,19 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy_root/security_root_user_tests.xml' % (TESTS_DIR)"/>
          <call function="'root_user_tests'" />
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
@@ -46,65 +46,65 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>
                                            
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_setup_pwd_storage.xml' % (TESTS_DIR)"/>
          <call function="'setup_pwd_storage'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_SSHA.xml' % (TESTS_DIR)"/>
          <call function="'pwd_SSHA'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_SHA.xml' % (TESTS_DIR)"/>
          <call function="'pwd_SHA'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_SSHA256.xml' % (TESTS_DIR)"/>
          <call function="'pwd_SSHA256'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_SSHA384.xml' % (TESTS_DIR)"/>
          <call function="'pwd_SSHA384'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_SSHA512.xml' % (TESTS_DIR)"/>
          <call function="'pwd_SSHA512'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_MD5.xml' % (TESTS_DIR)"/>
          <call function="'pwd_MD5'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_SMD5.xml' % (TESTS_DIR)"/>
          <call function="'pwd_SMD5'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_BASE64.xml' % (TESTS_DIR)"/>
          <call function="'pwd_BASE64'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_CLEAR.xml' % (TESTS_DIR)"/>
          <call function="'pwd_CLEAR'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_multiple_schemes.xml' % (TESTS_DIR)"/>
          <call function="'multiple_schemes'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_deprecated_schemes.xml' % (TESTS_DIR)"/>
          <call function="'deprecated_schemes'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_teardown_pwd_storage.xml' % (TESTS_DIR)"/>
          <call function="'teardown_pwd_storage'" />
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>
                                      
opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
@@ -46,59 +46,59 @@
        <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>
                                                          
        <import machine="'%s' % STAF_LOCAL_HOSTNAME"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_validator/security_setup_pwd_validator.xml' % (TESTS_DIR)"/>
        <call function="'setup_pwd_validator'" />
        <import machine="'%s' % STAF_LOCAL_HOSTNAME"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_validator/security_pwd_length.xml' % (TESTS_DIR)"/>
        <call function="'pwd_length'" />
        <import machine="'%s' % STAF_LOCAL_HOSTNAME"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_validator/security_attribute_value.xml' % (TESTS_DIR)"/>
        <call function="'attribute_value'" />
        <import machine="'%s' % STAF_LOCAL_HOSTNAME"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_validator/security_character_set.xml' % (TESTS_DIR)"/>
        <call function="'character_set'" />
        <import machine="'%s' % STAF_LOCAL_HOSTNAME"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_validator/security_history_based.xml' % (TESTS_DIR)"/>
        <call function="'history_based'" />
        <!--
        <import machine="'%s' % STAF_LOCAL_HOSTNAME"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_validator/security_similarity_based.xml' % (TESTS_DIR)"/>
        <call function="'similarity_based'" />
        -->
        <import machine="'%s' % STAF_LOCAL_HOSTNAME"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_validator/security_dictionary.xml' % (TESTS_DIR)"/>
        <call function="'dictionary'" />
        <import machine="'%s' % STAF_LOCAL_HOSTNAME"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_validator/security_unique_chars.xml' % (TESTS_DIR)"/>
        <call function="'unique_chars'" />
        <import machine="'%s' % STAF_LOCAL_HOSTNAME"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_validator/security_repeat_chars.xml' % (TESTS_DIR)"/>
        <call function="'repeat_chars'" />
        <import machine="'%s' % STAF_LOCAL_HOSTNAME"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_validator/security_skip_val_for_admins.xml' % (TESTS_DIR)"/>
        <call function="'skip_val_for_admins'" />
        <import machine="'%s' % STAF_LOCAL_HOSTNAME"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_validator/security_teardown_pwd_validator.xml' % (TESTS_DIR)"/>
        <call function="'teardown_pwd_validator'" />
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>
opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml
@@ -46,39 +46,39 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>
                                                            
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/sasl/security_setup_sasl.xml' % (TESTS_DIR)"/>
          <call function="'setup_sasl'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/sasl/security_sasl_anon.xml' % (TESTS_DIR)"/>
          <call function="'sasl_anon'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/sasl/security_sasl_plain.xml' % (TESTS_DIR)"/>
          <call function="'sasl_plain'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/sasl/security_sasl_cram-md5.xml' % (TESTS_DIR)"/>
          <call function="'sasl_cram-md5'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/sasl/security_sasl_digest-md5.xml' % (TESTS_DIR)"/>
          <call function="'sasl_digest-md5'" />
  
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/sasl/security_teardown_sasl.xml' % (TESTS_DIR)"/>
          <call function="'teardown_sasl'" />
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>
opends/tests/functional-tests/testcases/security/security.xml
@@ -36,51 +36,51 @@
        
        <call function="'testGroup_Preamble'"/>
        
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/client_auth/client_auth.xml' % (TESTS_DIR)"/>
        <call function="'client_auth'" />
        
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/jks/security_jks.xml' % (TESTS_DIR)"/>
        <call function="'security_jks'" />
        
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pkcs12/security_pkcs12.xml' % (TESTS_DIR)"/>
        <call function="'security_pkcs12'" />
        
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/startTLS/security_startTLS.xml' % (TESTS_DIR)"/>
        <call function="'security_startTLS'" />
        
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/sasl/security_sasl.xml' % (TESTS_DIR)"/>
        <call function="'security_sasl'" />
        
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_policy/security_pwd_policy.xml' % (TESTS_DIR)"/>
        <call function="'security_pwd_policy'" />
        
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_policy_root/security_pwd_policy_root.xml' % (TESTS_DIR)"/>
        <call function="'security_pwd_policy_root'" />
        
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml' % (TESTS_DIR)"/>
        <call function="'security_auth_pwd_syntax'" />
        
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_validator/security_pwd_validator.xml' % (TESTS_DIR)"/>
        <call function="'security_pwd_validator'" />
        
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_storage/security_pwd_storage.xml' % (TESTS_DIR)"/>
        <call function="'security_pwd_storage'" />
        
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/bind_no_pwd/security_bind_no_pwd.xml' % (TESTS_DIR)"/>
        <call function="'security_bind_no_pwd'" />
        
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
        <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/account_activation/security_account_activation.xml' % (TESTS_DIR)"/>
        <call function="'security_account_activation'" />
        
opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
@@ -46,32 +46,32 @@
          <call function="'testSuite_Preamble'"/>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>
                                        
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/startTLS/security_setup_startTLS.xml' % (TESTS_DIR)"/>
          <call function="'setup_startTLS'" />
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/startTLS/security_bob_startTLS.xml' % (TESTS_DIR)"/>
          <call function="'bob_startTLS'" />
    
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/startTLS/security_force_pwd_change_startTLS.xml' % (TESTS_DIR)"/>
          <call function="'force_pwd_change_startTLS'" />
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/startTLS/security_teardown_startTLS.xml' % (TESTS_DIR)"/>
          <call function="'teardown_startTLS'" />
 
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>