From a0dc13bd7370bae5f5e297801ee542dd2c18f936 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Wed, 03 Sep 2008 09:46:18 +0000
Subject: [PATCH] make each test group a job
---
opendj-sdk/opends/tests/functional-tests/testcases/backends/backends.xml | 29
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml | 6
opendj-sdk/opends/tests/functional-tests/testcases/backends/export-tasks.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig.xml | 12
opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml | 36
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml | 220 +-
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/replication/replication_setup.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/backends/backup.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml | 56
opendj-sdk/opends/tests/functional-tests/testcases/sample/sample.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/tasks/tasks.xml | 9
opendj-sdk/opends/tests/functional-tests/testcases/backends/export.xml | 96
opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml | 58
opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml | 2
opendj-sdk/opends/tests/functional-tests/config/config.py | 1
opendj-sdk/opends/tests/shared/functions/snmp.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/plugins/plugins.xml | 9
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/logging/logging.xml | 15
opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/setup/directory_manager.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/groups/group_setup.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml | 12
opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml | 106
opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml | 14
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/client_auth_lib.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/tasks/restore_db.xml | 6
opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n.xml | 12
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml | 364 ++--
opendj-sdk/opends/tests/functional-tests/testcases/backends/backup-tasks.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_setup.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml | 52
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml | 2
opendj-sdk/opends/tests/shared/functions/utils.xml | 56
opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml | 11
opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/setup/incompatible_options.xml | 6
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/dsml/dsml_setup.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml | 14
opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml | 32
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetcontrol.xml | 24
opendj-sdk/opends/tests/functional-tests/testcases/replication/basic/basic.xml | 32
opendj-sdk/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml | 12
opendj-sdk/opends/tests/functional-tests/testcases/runTestJob.xml | 84
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml | 38
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml | 22
opendj-sdk/opends/tests/functional-tests/testcases/backends/restore-tasks.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml | 150
opendj-sdk/opends/tests/shared/functions/ldap.xml | 12
opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/dsml/dsml.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/backends/backendsetup.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/monitoring/monitoring.xml | 9
opendj-sdk/opends/tests/shared/functions/environment.xml | 215 +
opendj-sdk/opends/tests/functional-tests/testcases/core/controls/core_ctrls_assertion.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp_v3_customconf.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml | 178 +-
opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/setup/import.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml | 78
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml | 218 +-
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml | 188 +-
opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml | 9
opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml | 237 +-
opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/backends/backend_setup.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml | 22
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml | 96
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_users.xml | 8
opendj-sdk/opends/tests/functional-tests/testcases/tasks/allowed-tasks.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/security/security.xml | 12
opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp_v3_defaultconf.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/core/controls/core_ctrls_matched_values.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/replication/changelog/changelog.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/tasks/backup_db.xml | 12
opendj-sdk/opends/tests/functional-tests/testcases/tasks/import-ldif.xml | 6
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml | 150
opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml | 14
opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml | 16
opendj-sdk/opends/tests/functional-tests/testcases/replication/conflict/conflict.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/clu/clu.xml | 11
opendj-sdk/opends/tests/functional-tests/testcases/tasks/export-ldif.xml | 12
opendj-sdk/opends/tests/functional-tests/testcases/replication/encryption/encryption.xml | 28
opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml | 6
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_setup.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml | 8
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml | 102
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml | 26
opendj-sdk/opends/tests/shared/functions/dsadm.xml | 44
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp.xml | 16
opendj-sdk/opends/tests/shared/functions/topology.xml | 125
opendj-sdk/opends/tests/functional-tests/testcases/setup/security.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml | 6
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges.xml | 11
opendj-sdk/opends/tests/functional-tests/testcases/replication/basic/replication_basic_setup.xml | 16
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml | 194 +-
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml | 92
opendj-sdk/opends/tests/functional-tests/testcases/groups/groups.xml | 14
opendj-sdk/opends/tests/functional-tests/testcases/setup/setup.xml | 11
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/aci/global_acis.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml | 8
opendj-sdk/opends/tests/functional-tests/testcases/dsml/dsml_test.xml | 5
opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml | 9
opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml | 10
opendj-sdk/opends/tests/shared/python/common.py | 109 +
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_import.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/replication/replication.xml | 32
opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml | 8
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml | 8
opendj-sdk/opends/tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml | 8
opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp_setup.xml | 5
opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_setup.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml | 14
opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/backends/restore.xml | 6
opendj-sdk/opends/tests/shared/functions/stafcmd.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml | 70
opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_setup.xml | 2
168 files changed, 2,605 insertions(+), 2,239 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/config/config.py b/opendj-sdk/opends/tests/functional-tests/config/config.py
index 4f380b3..6158864 100644
--- a/opendj-sdk/opends/tests/functional-tests/config/config.py
+++ b/opendj-sdk/opends/tests/functional-tests/config/config.py
@@ -48,6 +48,7 @@
DIRECTORY_INSTANCE_SFX = 'dc=com'
DIRECTORY_INSTANCE_BE = 'userRoot'
JAVA_HOME = '/path/to/jdk'
+LOCAL_JAVA_HOME = JAVA_HOME
LOGS_ROOT = '%s' % TMPDIR
LOGS_URI = ''
SEND_MAIL_AFTER_TEST_RUN = 'false'
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml
index ab8017c..0fb3c77 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml
@@ -28,11 +28,21 @@
<stax>
<defaultcall function="main_aci"/>
<function name="main_aci">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'aci'">
<sequence>
+
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
<script>
CurrentTestPath['group']='aci'
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
index dfb8b18..b6afade 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
@@ -86,7 +86,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/aci_startup_add_entry_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/aci_startup_add_entry_tests.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -127,7 +127,7 @@
<script>
curr_aci_ldif_file = 'add_allow-add_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -139,7 +139,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -155,7 +155,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -188,7 +188,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry1a.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry1a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -202,7 +202,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -218,7 +218,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -256,7 +256,7 @@
<script>
curr_aci_ldif_file = 'add_allow-add_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -268,7 +268,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -284,7 +284,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -317,7 +317,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -331,7 +331,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry2a.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry2a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -345,7 +345,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -361,7 +361,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -400,7 +400,7 @@
<script>
curr_aci_ldif_file = 'add_allow-add_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -412,7 +412,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -428,7 +428,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry3.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -461,7 +461,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -475,7 +475,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry3a.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry3a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -489,7 +489,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -505,7 +505,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -539,7 +539,7 @@
<script>
curr_aci_ldif_file = 'add_allow-delete_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -551,7 +551,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -567,7 +567,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-delete_entry1.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-delete_entry1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -581,7 +581,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -597,7 +597,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -635,7 +635,7 @@
<script>
curr_aci_ldif_file = 'add_targetfilter_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -647,7 +647,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -663,7 +663,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetfilter_entry1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetfilter_entry1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -696,7 +696,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetfilter_entry1a.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetfilter_entry1a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -710,7 +710,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -726,7 +726,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -761,7 +761,7 @@
<script>
curr_aci_ldif_file = 'add_targetfilter_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -773,7 +773,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -789,7 +789,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetfilter_entry2.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetfilter_entry2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -803,7 +803,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetfilter_entry2a.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetfilter_entry2a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -817,7 +817,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -833,7 +833,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -872,7 +872,7 @@
<script>
curr_aci_ldif_file = 'add_targetattr_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -884,7 +884,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -900,7 +900,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetattr_entry1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetattr_entry1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -933,7 +933,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetattr_entry1a.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetattr_entry1a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -947,7 +947,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -963,7 +963,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1001,7 +1001,7 @@
<script>
curr_aci_ldif_file = 'add_targattrfilter_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1013,7 +1013,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1029,7 +1029,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1062,7 +1062,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry1a.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry1a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1076,7 +1076,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1092,7 +1092,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1129,7 +1129,7 @@
<script>
curr_aci_ldif_file = 'add_targattrfilter_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1141,7 +1141,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1157,7 +1157,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1190,7 +1190,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry2a.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry2a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1204,7 +1204,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1220,7 +1220,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1255,7 +1255,7 @@
<script>
curr_aci_ldif_file = 'add_targattrfilter_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1267,7 +1267,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1283,7 +1283,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry3.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry3.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1297,7 +1297,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry3a.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry3a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1311,7 +1311,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1327,7 +1327,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1363,7 +1363,7 @@
<script>
curr_aci_ldif_file = 'add_multi_acis1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1375,7 +1375,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1391,7 +1391,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry1.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1405,7 +1405,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry1a.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry1a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1419,7 +1419,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/del_multi_acis.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/del_multi_acis.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1435,7 +1435,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1471,7 +1471,7 @@
<script>
curr_aci_ldif_file = 'add_multi_acis2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1483,7 +1483,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1499,7 +1499,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1515,7 +1515,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry2a.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry2a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1529,7 +1529,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/del_multi_acis.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/del_multi_acis.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1545,7 +1545,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1582,7 +1582,7 @@
<script>
curr_aci_ldif_file = 'add_multi_acis3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1594,7 +1594,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1610,7 +1610,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry3.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1626,7 +1626,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1640,7 +1640,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry3a.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry3a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1654,7 +1654,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/del_multi_acis.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/del_multi_acis.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1670,7 +1670,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1706,7 +1706,7 @@
<script>
curr_aci_ldif_file = 'add_multi_acis4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1718,7 +1718,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1734,7 +1734,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry4.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry4.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1750,7 +1750,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry4a.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry4a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1764,7 +1764,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/del_multi_acis2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/del_multi_acis2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1780,7 +1780,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1817,7 +1817,7 @@
<script>
curr_aci_ldif_file = 'add_multi_acis5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1829,7 +1829,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1845,7 +1845,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry5.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1861,7 +1861,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1875,7 +1875,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry5a.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry5a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1889,7 +1889,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_add_entry/del_multi_acis.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/del_multi_acis.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1905,7 +1905,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
index 6b658ce..9a873be 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
@@ -106,7 +106,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_bindtypes/aci_startup_bindtypes.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_bindtypes/aci_startup_bindtypes.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -146,7 +146,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_bindtypes/add_static_groups.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_bindtypes/add_static_groups.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -162,7 +162,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_bindtypes/add_dynamic_groups.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_bindtypes/add_dynamic_groups.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -259,7 +259,7 @@
<script>
curr_aci_ldif_file = 'add_groupdn_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -271,7 +271,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -389,7 +389,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -449,7 +449,7 @@
<script>
curr_aci_ldif_file = 'add_groupdn_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -461,7 +461,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -585,7 +585,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -645,7 +645,7 @@
<script>
curr_aci_ldif_file = 'add_groupdn_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -657,7 +657,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -781,7 +781,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -841,7 +841,7 @@
<script>
curr_aci_ldif_file = 'add_groupdn_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -853,7 +853,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -971,7 +971,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1031,7 +1031,7 @@
<script>
curr_aci_ldif_file = 'add_groupdn_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1043,7 +1043,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1161,7 +1161,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1221,7 +1221,7 @@
<script>
curr_aci_ldif_file = 'add_groupdn_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1233,7 +1233,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1357,7 +1357,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1417,7 +1417,7 @@
<script>
curr_aci_ldif_file = 'add_groupdn_aci7.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1429,7 +1429,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1553,7 +1553,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1613,7 +1613,7 @@
<script>
curr_aci_ldif_file = 'add_groupdn_aci8.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1625,7 +1625,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1743,7 +1743,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1803,7 +1803,7 @@
<script>
curr_aci_ldif_file = 'add_groupdn_aci9.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1815,7 +1815,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1927,7 +1927,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1987,7 +1987,7 @@
<script>
curr_aci_ldif_file = 'add_groupdn_aci10.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1999,7 +1999,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2123,7 +2123,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2184,7 +2184,7 @@
<script>
curr_aci_ldif_file = 'add_groupdn_selfwrite.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2196,7 +2196,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2205,7 +2205,7 @@
<script>
curr_aci_ldif_file = 'add_static_selfwrite.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2217,7 +2217,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2233,7 +2233,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=zuser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/add_new_member_static1.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/add_new_member_static1.ldif' % (remote.data) }
</call>
<if expr="RC != 0">
@@ -2303,7 +2303,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_static_selfwrite.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_static_selfwrite.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2319,7 +2319,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2379,7 +2379,7 @@
<script>
curr_aci_ldif_file = 'add_groupdn_selfwrite.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2391,7 +2391,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2400,7 +2400,7 @@
<script>
curr_aci_ldif_file = 'add_static_selfwrite.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2412,7 +2412,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2428,7 +2428,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=zyuser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_old_member_static2.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_old_member_static2.ldif' % (remote.data) }
</call>
<if expr="RC != 0">
@@ -2444,7 +2444,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_static_selfwrite.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_static_selfwrite.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2490,7 +2490,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2550,7 +2550,7 @@
<script>
curr_aci_ldif_file = 'add_groupdn_selfwrite.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2562,7 +2562,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2571,7 +2571,7 @@
<script>
curr_aci_ldif_file = 'add_static_selfwrite.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2583,7 +2583,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2599,7 +2599,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=zuser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/replace_member_static3.ldif' % (logsRemoteDataDir) ,
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/replace_member_static3.ldif' % (remote.data) ,
'expectedRC' : 50
}
</call>
@@ -2613,7 +2613,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_static_selfwrite.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_static_selfwrite.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2659,7 +2659,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2719,7 +2719,7 @@
<script>
curr_aci_ldif_file = 'add_groupdn_selfwrite.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2731,7 +2731,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2740,7 +2740,7 @@
<script>
curr_aci_ldif_file = 'add_static_selfwrite2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2752,7 +2752,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2768,7 +2768,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=zuser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/add_new_description_static4.ldif' % (logsRemoteDataDir) ,
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/add_new_description_static4.ldif' % (remote.data) ,
'expectedRC' : 50
}
</call>
@@ -2782,7 +2782,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_static_selfwrite2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_static_selfwrite2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2828,7 +2828,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2891,7 +2891,7 @@
<script>
curr_aci_ldif_file = 'add_userattr_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2903,7 +2903,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3068,7 +3068,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3131,7 +3131,7 @@
<script>
curr_aci_ldif_file = 'add_userattr_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3143,7 +3143,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3331,7 +3331,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3390,7 +3390,7 @@
<script>
curr_aci_ldif_file = 'add_userattr_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3402,7 +3402,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3502,7 +3502,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3562,7 +3562,7 @@
<script>
curr_aci_ldif_file = 'add_userattr_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3574,7 +3574,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3698,7 +3698,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3912,7 +3912,7 @@
<script>
curr_aci_ldif_file = 'add_userattr_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3924,7 +3924,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -4045,7 +4045,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -4106,7 +4106,7 @@
<script>
curr_aci_ldif_file = 'add_userattr_aci7.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -4118,7 +4118,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -4239,7 +4239,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -4299,7 +4299,7 @@
<script>
curr_aci_ldif_file = 'add_userattr_aci8.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -4311,7 +4311,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -4432,7 +4432,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -4639,7 +4639,7 @@
<script>
curr_aci_ldif_file = 'add_syntax_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -4651,7 +4651,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -4679,7 +4679,7 @@
<script>
curr_aci_ldif_file = 'add_syntax_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -4691,7 +4691,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -4719,7 +4719,7 @@
<script>
curr_aci_ldif_file = 'add_syntax_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -4731,7 +4731,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -4759,7 +4759,7 @@
<script>
curr_aci_ldif_file = 'add_syntax_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -4771,7 +4771,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -4799,7 +4799,7 @@
<script>
curr_aci_ldif_file = 'add_syntax_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -4811,7 +4811,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -4839,7 +4839,7 @@
<script>
curr_aci_ldif_file = 'add_syntax_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -4851,7 +4851,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -4885,7 +4885,7 @@
<script>
curr_aci_ldif_file = 'add_userdn_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -4897,7 +4897,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -4973,7 +4973,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
index 8434992..5430ed4 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
@@ -122,7 +122,7 @@
<script>
curr_aci_ldif_file = 'add_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -134,7 +134,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -188,7 +188,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -243,7 +243,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -255,7 +255,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -324,7 +324,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -377,7 +377,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -389,7 +389,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -450,7 +450,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -505,7 +505,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -517,7 +517,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -594,7 +594,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -649,7 +649,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -661,7 +661,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -738,7 +738,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -791,7 +791,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -803,7 +803,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -864,7 +864,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -915,7 +915,7 @@
<script>
curr_aci_ldif_file = 'add_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -927,7 +927,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -973,7 +973,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1028,7 +1028,7 @@
<script>
curr_aci_ldif_file = 'add_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1040,7 +1040,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1109,7 +1109,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1164,7 +1164,7 @@
<script>
curr_aci_ldif_file = 'add_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1176,7 +1176,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1245,7 +1245,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1300,7 +1300,7 @@
<script>
curr_aci_ldif_file = 'add_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1312,7 +1312,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1389,7 +1389,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1444,7 +1444,7 @@
<script>
curr_aci_ldif_file = 'add_aci7.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1456,7 +1456,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1533,7 +1533,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1584,7 +1584,7 @@
<script>
curr_aci_ldif_file = 'add_multi_acis8.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1596,7 +1596,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1627,7 +1627,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/del_multi_acis.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/del_multi_acis.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1680,7 +1680,7 @@
<script>
curr_aci_ldif_file = 'add_multi_acis9.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_compare_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1692,7 +1692,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1731,7 +1731,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_compare_tests/del_multi_acis.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_compare_tests/del_multi_acis.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
index 1f7970e..f6b37a7 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
@@ -88,7 +88,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -166,7 +166,7 @@
<script>
curr_aci_ldif_file = 'add_allow-delete_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -178,7 +178,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -194,7 +194,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -225,7 +225,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry1a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry1a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -239,7 +239,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -255,7 +255,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -294,7 +294,7 @@
<script>
curr_aci_ldif_file = 'add_allow-delete_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -306,7 +306,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -322,7 +322,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -353,7 +353,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -367,7 +367,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry2a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry2a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -381,7 +381,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -397,7 +397,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -436,7 +436,7 @@
<script>
curr_aci_ldif_file = 'add_allow-delete_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -448,7 +448,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -464,7 +464,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -495,7 +495,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry3.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry3.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -509,7 +509,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry3a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry3a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -523,7 +523,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -539,7 +539,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -574,7 +574,7 @@
<script>
curr_aci_ldif_file = 'add_allow-write_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -586,7 +586,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -602,7 +602,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-write_entry1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-write_entry1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -616,7 +616,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -632,7 +632,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -670,7 +670,7 @@
<script>
curr_aci_ldif_file = 'add_targetfilter_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -682,7 +682,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -698,7 +698,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -729,7 +729,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry1a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry1a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -743,7 +743,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -759,7 +759,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -794,7 +794,7 @@
<script>
curr_aci_ldif_file = 'add_targetfilter_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -806,7 +806,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -822,7 +822,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -836,7 +836,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry2a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry2a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -850,7 +850,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -866,7 +866,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -902,7 +902,7 @@
<script>
curr_aci_ldif_file = 'add_targetfilter_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -914,7 +914,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -930,7 +930,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -946,7 +946,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry3a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry3a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -960,7 +960,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -976,7 +976,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1012,7 +1012,7 @@
<script>
curr_aci_ldif_file = 'add_targetfilter_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1024,7 +1024,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1040,7 +1040,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry4.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1056,7 +1056,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry4a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry4a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1070,7 +1070,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1086,7 +1086,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1122,7 +1122,7 @@
<script>
curr_aci_ldif_file = 'add_targetfilter_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1134,7 +1134,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1150,7 +1150,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry5.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry5.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1164,7 +1164,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry5a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry5a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1178,7 +1178,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1194,7 +1194,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1232,7 +1232,7 @@
<script>
curr_aci_ldif_file = 'add_targetattr_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1244,7 +1244,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1260,7 +1260,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetattr_entry1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetattr_entry1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1276,7 +1276,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetattr_entry1a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetattr_entry1a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1290,7 +1290,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1306,7 +1306,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1342,7 +1342,7 @@
<script>
curr_aci_ldif_file = 'add_targetattr_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1354,7 +1354,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1370,7 +1370,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetattr_entry2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetattr_entry2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1386,7 +1386,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetattr_entry2a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetattr_entry2a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1400,7 +1400,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1416,7 +1416,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1453,7 +1453,7 @@
<script>
curr_aci_ldif_file = 'add_targattrfilter_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1465,7 +1465,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1481,7 +1481,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targattrfilter_entry1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targattrfilter_entry1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1497,7 +1497,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targattrfilter_entry1a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targattrfilter_entry1a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1511,7 +1511,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1527,7 +1527,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1578,7 +1578,7 @@
<script>
curr_aci_ldif_file = 'add_allow-delete_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1590,7 +1590,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1664,7 +1664,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -1703,7 +1703,7 @@
<script>
curr_aci_ldif_file = 'add_multi_acis1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1715,7 +1715,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1731,7 +1731,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1745,7 +1745,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry1a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry1a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1759,7 +1759,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1775,7 +1775,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1811,7 +1811,7 @@
<script>
curr_aci_ldif_file = 'add_multi_acis2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1823,7 +1823,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1839,7 +1839,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1855,7 +1855,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry2a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry2a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1869,7 +1869,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1885,7 +1885,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1922,7 +1922,7 @@
<script>
curr_aci_ldif_file = 'add_multi_acis3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1934,7 +1934,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1950,7 +1950,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1964,7 +1964,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1980,7 +1980,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry3a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry3a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1994,7 +1994,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2010,7 +2010,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2046,7 +2046,7 @@
<script>
curr_aci_ldif_file = 'add_multi_acis4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2058,7 +2058,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2074,7 +2074,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry4.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2090,7 +2090,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry4a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry4a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2104,7 +2104,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2120,7 +2120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2157,7 +2157,7 @@
<script>
curr_aci_ldif_file = 'add_multi_acis5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2169,7 +2169,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2185,7 +2185,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2199,7 +2199,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2215,7 +2215,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry5a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry5a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2229,7 +2229,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2245,7 +2245,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml
index ea3c4f6..744eb8a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml
@@ -105,7 +105,7 @@
<script>
curr_aci_ldif_file = 'add_effrights_aci.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -117,7 +117,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<call function="'checktestRC'">
@@ -219,7 +219,7 @@
<script>
curr_aci_ldif_file = 'add_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -231,7 +231,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -309,7 +309,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -371,7 +371,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -383,7 +383,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -461,7 +461,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -525,7 +525,7 @@
<script>
curr_aci_ldif_file = 'add_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -537,7 +537,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -671,7 +671,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -732,7 +732,7 @@
<script>
curr_aci_ldif_file = 'add_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -744,7 +744,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -822,7 +822,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -883,7 +883,7 @@
<script>
curr_aci_ldif_file = 'add_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -895,7 +895,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -973,7 +973,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1034,7 +1034,7 @@
<script>
curr_aci_ldif_file = 'add_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1046,7 +1046,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1130,7 +1130,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1191,7 +1191,7 @@
<script>
curr_aci_ldif_file = 'add_aci7.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1203,7 +1203,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1287,7 +1287,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1348,7 +1348,7 @@
<script>
curr_aci_ldif_file = 'add_aci8.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1360,7 +1360,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1444,7 +1444,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1505,7 +1505,7 @@
<script>
curr_aci_ldif_file = 'add_aci9.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1517,7 +1517,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1601,7 +1601,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1662,7 +1662,7 @@
<script>
curr_aci_ldif_file = 'add_aci10.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1674,7 +1674,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1758,7 +1758,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1821,7 +1821,7 @@
<script>
curr_aci_ldif_file = 'add_aci11.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1833,7 +1833,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1917,7 +1917,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1978,7 +1978,7 @@
<script>
curr_aci_ldif_file = 'add_aci12.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1990,7 +1990,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2068,7 +2068,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2129,7 +2129,7 @@
<script>
curr_aci_ldif_file = 'add_aci13.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2141,7 +2141,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2219,7 +2219,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2281,7 +2281,7 @@
<script>
curr_aci_ldif_file = 'add_aci21.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2293,7 +2293,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2371,7 +2371,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2433,7 +2433,7 @@
<script>
curr_aci_ldif_file = 'add_aci22.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_effective_rights/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2445,7 +2445,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2523,7 +2523,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2586,7 +2586,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_effective_rights/del_effrights_aci.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/aci/aci_effective_rights/del_effrights_aci.ldif' % (remote.data) }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_import.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_import.xml
index 9736ec1..34f586a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_import.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_import.xml
@@ -151,7 +151,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'taskID' : STAXCurrentTestcase ,
- 'ldifFile' : '%s/aci/aci_import/import_task.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/aci/aci_import/import_task.ldif' % remote.data
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml
index 226bb22..817f71f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml
@@ -86,7 +86,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_entry/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_entry/aci_startup_modify_tests.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -127,7 +127,7 @@
<script>
curr_aci_ldif_file = 'add_modify_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -139,7 +139,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -155,7 +155,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -171,7 +171,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry1a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry1a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -185,7 +185,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -201,7 +201,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -239,7 +239,7 @@
<script>
curr_aci_ldif_file = 'add_modify_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -251,7 +251,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -267,7 +267,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -283,7 +283,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry2.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry2.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -297,7 +297,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry2a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry2a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -311,7 +311,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -327,7 +327,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -365,7 +365,7 @@
<script>
curr_aci_ldif_file = 'add_modify_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -377,7 +377,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -393,7 +393,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -409,7 +409,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry3.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry3.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -423,7 +423,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry3a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry3a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -437,7 +437,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -453,7 +453,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -489,7 +489,7 @@
<script>
curr_aci_ldif_file = 'add_modify_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -501,7 +501,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -517,7 +517,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_entry4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_entry4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -531,7 +531,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_entry4.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_entry4.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -545,7 +545,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_entry4a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_entry4a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -559,7 +559,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -575,7 +575,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -615,7 +615,7 @@
<script>
curr_aci_ldif_file = 'add_modify_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -627,7 +627,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -643,7 +643,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -659,7 +659,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -673,7 +673,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5.2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5.2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -687,7 +687,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5.3.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5.3.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -701,7 +701,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -715,7 +715,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -731,7 +731,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -768,7 +768,7 @@
<script>
curr_aci_ldif_file = 'add_modify_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -780,7 +780,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -796,7 +796,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry6.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -812,7 +812,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry6.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry6.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -826,7 +826,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry6a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry6a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -840,7 +840,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -856,7 +856,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -893,7 +893,7 @@
<script>
curr_aci_ldif_file = 'add_modify_aci7.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -905,7 +905,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -921,7 +921,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry7.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry7.1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -937,7 +937,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry7.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry7.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -951,7 +951,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry7a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry7a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -965,7 +965,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -981,7 +981,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1017,7 +1017,7 @@
<script>
curr_aci_ldif_file = 'add_modify_multi_acis8.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1029,7 +1029,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1045,7 +1045,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry8.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry8.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1059,7 +1059,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry8a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry8a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1073,7 +1073,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_multi_acis.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_multi_acis.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1089,7 +1089,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1125,7 +1125,7 @@
<script>
curr_aci_ldif_file = 'add_modify_multi_acis9.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1137,7 +1137,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1153,7 +1153,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry9.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1169,7 +1169,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry9a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry9a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1183,7 +1183,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_multi_acis.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_multi_acis.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1199,7 +1199,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1236,7 +1236,7 @@
<script>
curr_aci_ldif_file = 'add_modify_multi_acis10.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1248,7 +1248,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1264,7 +1264,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry10.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry10.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1278,7 +1278,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry10.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry10.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1294,7 +1294,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry10a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry10a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1308,7 +1308,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_multi_acis.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_multi_acis.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1324,7 +1324,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1360,7 +1360,7 @@
<script>
curr_aci_ldif_file = 'add_modify_multi_acis11.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1372,7 +1372,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1388,7 +1388,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry11.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry11.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1404,7 +1404,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry11a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry11a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1418,7 +1418,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_multi_acis2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_multi_acis2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1434,7 +1434,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1471,7 +1471,7 @@
<script>
curr_aci_ldif_file = 'add_modify_multi_acis12.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1483,7 +1483,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1499,7 +1499,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1513,7 +1513,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry12.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry12.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1529,7 +1529,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry12a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry12a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1543,7 +1543,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_multi_acis2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_multi_acis2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1559,7 +1559,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1597,7 +1597,7 @@
<script>
curr_aci_ldif_file = 'add_delete_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1609,7 +1609,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1625,7 +1625,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1639,7 +1639,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1655,7 +1655,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete1a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete1a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1669,7 +1669,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1685,7 +1685,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1723,7 +1723,7 @@
<script>
curr_aci_ldif_file = 'add_delete_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1735,7 +1735,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1751,7 +1751,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1767,7 +1767,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete2.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete2.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1781,7 +1781,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete2a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete2a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1795,7 +1795,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1811,7 +1811,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1849,7 +1849,7 @@
<script>
curr_aci_ldif_file = 'add_delete_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1861,7 +1861,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1877,7 +1877,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1893,7 +1893,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete3.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete3.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1907,7 +1907,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete2a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete2a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1921,7 +1921,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1937,7 +1937,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1973,7 +1973,7 @@
<script>
curr_aci_ldif_file = 'add_delete_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1985,7 +1985,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2001,7 +2001,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_delete4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_delete4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2015,7 +2015,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_delete4.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_delete4.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2029,7 +2029,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_delete4a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_delete4a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2043,7 +2043,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2059,7 +2059,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2098,7 +2098,7 @@
<script>
curr_aci_ldif_file = 'add_delete_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2110,7 +2110,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2126,7 +2126,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2142,7 +2142,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5.1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2158,7 +2158,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5.2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5.2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2174,7 +2174,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5.3.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5.3.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2188,7 +2188,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2202,7 +2202,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2218,7 +2218,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2253,7 +2253,7 @@
<script>
curr_aci_ldif_file = 'add_delete_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2265,7 +2265,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2281,7 +2281,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete6.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete6.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2295,7 +2295,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2309,7 +2309,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2325,7 +2325,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2360,7 +2360,7 @@
<script>
curr_aci_ldif_file = 'add_delete_aci7.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2372,7 +2372,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2388,7 +2388,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete7.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete7.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2402,7 +2402,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete7a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete7a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2416,7 +2416,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2432,7 +2432,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2470,7 +2470,7 @@
<script>
curr_aci_ldif_file = 'add_add_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2482,7 +2482,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2498,7 +2498,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2512,7 +2512,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2528,7 +2528,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add1a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add1a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2542,7 +2542,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2558,7 +2558,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2596,7 +2596,7 @@
<script>
curr_aci_ldif_file = 'add_add_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2608,7 +2608,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2624,7 +2624,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2640,7 +2640,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add2.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add2.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2654,7 +2654,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add2a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add2a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2668,7 +2668,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2684,7 +2684,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2723,7 +2723,7 @@
<script>
curr_aci_ldif_file = 'add_add_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2735,7 +2735,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2751,7 +2751,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2767,7 +2767,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add3.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add3.1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2783,7 +2783,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add3.2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add3.2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2797,7 +2797,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add3a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add3a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2811,7 +2811,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2827,7 +2827,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2863,7 +2863,7 @@
<script>
curr_aci_ldif_file = 'add_add_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2875,7 +2875,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2891,7 +2891,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_add4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_add4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2905,7 +2905,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_add4.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_add4.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2919,7 +2919,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_add4a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_add4a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2933,7 +2933,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2949,7 +2949,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2988,7 +2988,7 @@
<script>
curr_aci_ldif_file = 'add_add_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3000,7 +3000,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3016,7 +3016,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_add5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_add5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3032,7 +3032,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_add5.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_add5.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3046,7 +3046,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_add5.2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_add5.2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3062,7 +3062,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_add5.3.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_add5.3.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3076,7 +3076,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3090,7 +3090,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3106,7 +3106,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3141,7 +3141,7 @@
<script>
curr_aci_ldif_file = 'add_add_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3153,7 +3153,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3169,7 +3169,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_add6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_add6.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3185,7 +3185,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3199,7 +3199,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3215,7 +3215,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3250,7 +3250,7 @@
<script>
curr_aci_ldif_file = 'add_add_aci7.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_entry/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3262,7 +3262,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3278,7 +3278,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_add7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_add7.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3294,7 +3294,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_add7a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_add7a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3308,7 +3308,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3324,7 +3324,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
index 31ca58d..42d598f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
@@ -57,7 +57,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -66,7 +66,7 @@
<script>
curr_aci_ldif_file = 'add_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -78,7 +78,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -94,7 +94,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -110,7 +110,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -126,7 +126,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -140,7 +140,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -156,7 +156,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -172,7 +172,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -186,7 +186,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -202,7 +202,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -218,7 +218,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -234,7 +234,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
index b68e828..174a420 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci11.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -108,7 +108,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -124,7 +124,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -138,7 +138,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -152,7 +152,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -168,7 +168,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -182,7 +182,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -196,7 +196,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -212,7 +212,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -228,7 +228,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
index 21253dd..3c10f26 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci12.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -106,7 +106,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -120,7 +120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -134,7 +134,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -148,7 +148,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -162,7 +162,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -178,7 +178,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -192,7 +192,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -206,7 +206,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -220,7 +220,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
index 80a4b7b..f808aca 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci13.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -108,7 +108,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -124,7 +124,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -140,7 +140,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -154,7 +154,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -170,7 +170,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -186,7 +186,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -200,7 +200,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -216,7 +216,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -232,7 +232,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
index d948cfd..6560251 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci14.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -106,7 +106,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -120,7 +120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -134,7 +134,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -148,7 +148,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -162,7 +162,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -176,7 +176,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -190,7 +190,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -204,7 +204,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -218,7 +218,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
index bf3d874..259e499 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci15.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -108,7 +108,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -122,7 +122,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -138,7 +138,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -152,7 +152,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -166,7 +166,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -182,7 +182,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -196,7 +196,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -212,7 +212,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -228,7 +228,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
index 8b4c6d9..5581902 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci16.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -106,7 +106,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -120,7 +120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -134,7 +134,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -148,7 +148,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -164,7 +164,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -178,7 +178,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -192,7 +192,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -206,7 +206,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -220,7 +220,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
index dc4b82a..5d03d0f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -106,7 +106,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -120,7 +120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -134,7 +134,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -150,7 +150,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -164,7 +164,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -180,7 +180,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -196,7 +196,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -210,7 +210,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -224,7 +224,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
index 14725b1..12bb3e7 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci21.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -108,7 +108,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -124,7 +124,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -138,7 +138,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -154,7 +154,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -170,7 +170,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -184,7 +184,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -200,7 +200,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -216,7 +216,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -232,7 +232,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
index 1dabc30..0ae687a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci22.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -106,7 +106,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -120,7 +120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -134,7 +134,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -150,7 +150,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -164,7 +164,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -180,7 +180,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -196,7 +196,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -210,7 +210,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -224,7 +224,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml
index 23ef271..c3af439 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci23.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -108,7 +108,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -124,7 +124,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -140,7 +140,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -156,7 +156,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -172,7 +172,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -188,7 +188,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -204,7 +204,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -220,7 +220,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -236,7 +236,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
index 4d19426..39a5b38 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci24.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -106,7 +106,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -120,7 +120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -134,7 +134,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -150,7 +150,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -164,7 +164,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -178,7 +178,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -194,7 +194,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -208,7 +208,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -222,7 +222,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
index a5db638..63a6e57 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci25.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -108,7 +108,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -122,7 +122,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -138,7 +138,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -154,7 +154,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -168,7 +168,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -184,7 +184,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -200,7 +200,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -216,7 +216,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -232,7 +232,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
index c774124..8e2617a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci26.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -106,7 +106,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -120,7 +120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -134,7 +134,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -150,7 +150,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -166,7 +166,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -180,7 +180,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -196,7 +196,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -210,7 +210,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -224,7 +224,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml
index 7b33e41..3f6a0b3 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -108,7 +108,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -124,7 +124,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -140,7 +140,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -156,7 +156,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -172,7 +172,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -188,7 +188,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -204,7 +204,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -220,7 +220,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -236,7 +236,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
index 7f9dcb1..85fe1e8 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -106,7 +106,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -120,7 +120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -134,7 +134,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -150,7 +150,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -164,7 +164,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -178,7 +178,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -194,7 +194,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -208,7 +208,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -222,7 +222,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
index 7446bf2..8a4c96e 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -108,7 +108,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -122,7 +122,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -138,7 +138,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -154,7 +154,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -168,7 +168,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -184,7 +184,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -200,7 +200,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -216,7 +216,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -232,7 +232,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
index 53ef24d..b7a4ab8 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
@@ -55,7 +55,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -64,7 +64,7 @@
<script>
curr_aci_ldif_file = 'add_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -106,7 +106,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -120,7 +120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -134,7 +134,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -150,7 +150,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -166,7 +166,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -180,7 +180,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -196,7 +196,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -210,7 +210,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -224,7 +224,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml
index 58ca3eb..da3764b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml
@@ -87,7 +87,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_modify_rdn/aci_startup_modrdn_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_modify_rdn/aci_startup_modrdn_tests.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -129,7 +129,7 @@
<script>
curr_aci_ldif_file = 'add_modrdn_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -141,7 +141,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -157,7 +157,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -216,7 +216,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry1a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry1a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -230,7 +230,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -246,7 +246,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -286,7 +286,7 @@
<script>
curr_aci_ldif_file = 'add_modrdn_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -298,7 +298,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -314,7 +314,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -373,7 +373,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry2a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry2a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -387,7 +387,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -403,7 +403,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -419,7 +419,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -458,7 +458,7 @@
<script>
curr_aci_ldif_file = 'add_modrdn_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -470,7 +470,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -486,7 +486,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -545,7 +545,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry3a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry3a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -559,7 +559,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -575,7 +575,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -612,7 +612,7 @@
<script>
curr_aci_ldif_file = 'add_modrdn_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -624,7 +624,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -640,7 +640,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -654,7 +654,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry4a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry4a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -668,7 +668,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -684,7 +684,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -724,7 +724,7 @@
<script>
curr_aci_ldif_file = 'add_modrdn_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -736,7 +736,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -752,7 +752,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -811,7 +811,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry5a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry5a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -825,7 +825,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -841,7 +841,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -857,7 +857,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -893,7 +893,7 @@
<script>
curr_aci_ldif_file = 'add_modrdn_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -905,7 +905,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -921,7 +921,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry6.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry6.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -935,7 +935,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry6a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry6a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -949,7 +949,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -965,7 +965,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1005,7 +1005,7 @@
<script>
curr_aci_ldif_file = 'add_modrdn_aci7.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1017,7 +1017,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1033,7 +1033,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry7.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1092,7 +1092,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry7.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry7.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1106,7 +1106,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry7a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry7a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1120,7 +1120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1136,7 +1136,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1178,7 +1178,7 @@
<script>
curr_aci_ldif_file = 'add_modrdn_aci8.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1190,7 +1190,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1206,7 +1206,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry8.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1265,7 +1265,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry8a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry8a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1279,7 +1279,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore3.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore3.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1293,7 +1293,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/replace_modrdn_aci8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/replace_modrdn_aci8.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1309,7 +1309,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1325,7 +1325,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1341,7 +1341,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1378,7 +1378,7 @@
<script>
curr_aci_ldif_file = 'add_modrdn_aci9.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1390,7 +1390,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1406,7 +1406,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry9.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry9.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1420,7 +1420,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry9a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry9a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1434,7 +1434,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1450,7 +1450,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1490,7 +1490,7 @@
<script>
curr_aci_ldif_file = 'add_modrdn_aci10.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1502,7 +1502,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1518,7 +1518,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry10.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry10.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1577,7 +1577,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry10a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry10a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1591,7 +1591,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1607,7 +1607,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1646,7 +1646,7 @@
<script>
curr_aci_ldif_file = 'add_modrdn_aci11.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1658,7 +1658,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1674,7 +1674,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry11.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry11.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1688,7 +1688,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry11a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry11a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1702,7 +1702,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1718,7 +1718,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1758,7 +1758,7 @@
<script>
curr_aci_ldif_file = 'add_modrdn_aci21.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1770,7 +1770,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1786,7 +1786,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry21.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry21.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1845,7 +1845,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry21a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry21a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1859,7 +1859,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1875,7 +1875,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1891,7 +1891,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1933,7 +1933,7 @@
<script>
curr_aci_ldif_file = 'add_modrdn_aci22.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_modify_rdn/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1945,7 +1945,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1961,7 +1961,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry22.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry22.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2020,7 +2020,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry22a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry22a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2034,7 +2034,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2048,7 +2048,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/replace_modrdn_aci22.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/replace_modrdn_aci22.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2064,7 +2064,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore4.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2080,7 +2080,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2096,7 +2096,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml
index 5d8c1c0..f62b970 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml
@@ -255,7 +255,7 @@
<script>
curr_aci_ldif_file = 'add_proxy_aci.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -267,7 +267,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -308,7 +308,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -371,7 +371,7 @@
<script>
curr_aci_ldif_file = 'add_user_aci_all.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -383,7 +383,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -470,7 +470,7 @@
<script>
curr_aci_ldif_file = 'add_proxy_aci.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -482,7 +482,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -554,7 +554,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -616,7 +616,7 @@
<script>
curr_aci_ldif_file = 'add_user_aci_add.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -628,7 +628,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -709,7 +709,7 @@
<script>
curr_aci_ldif_file = 'add_proxy_aci.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -721,7 +721,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -787,7 +787,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -850,7 +850,7 @@
<script>
curr_aci_ldif_file = 'add_user_aci_search.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -862,7 +862,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -949,7 +949,7 @@
<script>
curr_aci_ldif_file = 'add_proxy_aci.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -961,7 +961,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1033,7 +1033,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1097,7 +1097,7 @@
<script>
curr_aci_ldif_file = 'add_user_aci_search_sep.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1109,7 +1109,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1196,7 +1196,7 @@
<script>
curr_aci_ldif_file = 'add_proxy_aci.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1208,7 +1208,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1280,7 +1280,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1296,7 +1296,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1360,7 +1360,7 @@
<script>
curr_aci_ldif_file = 'add_user_aci_all_wildcard.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1372,7 +1372,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1465,7 +1465,7 @@
<script>
curr_aci_ldif_file = 'add_proxy_aci.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1477,7 +1477,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1555,7 +1555,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1619,7 +1619,7 @@
<script>
curr_aci_ldif_file = 'add_user_aci_all.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1631,7 +1631,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1718,7 +1718,7 @@
<script>
curr_aci_ldif_file = 'add_proxy_aci_wildcard.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1730,7 +1730,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1802,7 +1802,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1866,7 +1866,7 @@
<script>
curr_aci_ldif_file = 'add_user_aci_all.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1878,7 +1878,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1991,7 +1991,7 @@
<script>
curr_aci_ldif_file = 'add_proxy_aci.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2003,7 +2003,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2071,7 +2071,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2136,7 +2136,7 @@
<script>
curr_aci_ldif_file = 'add_user_aci_all.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2148,7 +2148,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2243,7 +2243,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/add_proxy_auth_dm.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/add_proxy_auth_dm.ldif' % (remote.data) }
</call>
<if expr="RC != 0">
@@ -2252,7 +2252,7 @@
<script>
curr_aci_ldif_file = 'add_proxy_aci_dm.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2264,7 +2264,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2342,7 +2342,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_proxy_auth_dm.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_proxy_auth_dm.ldif' % (remote.data) }
</call>
<if expr="RC != 0">
@@ -2358,7 +2358,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
index 79b3ae6..9f4838f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
@@ -90,7 +90,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_rdn_wildcards/aci_startup_rdn_wildcard_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_rdn_wildcards/aci_startup_rdn_wildcard_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -198,7 +198,7 @@
<script>
curr_aci_ldif_file = 'add_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -210,7 +210,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -251,7 +251,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -311,7 +311,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -323,7 +323,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -376,7 +376,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -436,7 +436,7 @@
<script>
curr_aci_ldif_file = 'add_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -448,7 +448,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -501,7 +501,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -560,7 +560,7 @@
<script>
curr_aci_ldif_file = 'add_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -572,7 +572,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -613,7 +613,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -672,7 +672,7 @@
<script>
curr_aci_ldif_file = 'add_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -684,7 +684,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -725,7 +725,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -784,7 +784,7 @@
<script>
curr_aci_ldif_file = 'add_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -796,7 +796,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -837,7 +837,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -896,7 +896,7 @@
<script>
curr_aci_ldif_file = 'add_aci7.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -908,7 +908,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -949,7 +949,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1008,7 +1008,7 @@
<script>
curr_aci_ldif_file = 'add_aci8.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1020,7 +1020,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1061,7 +1061,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1120,7 +1120,7 @@
<script>
curr_aci_ldif_file = 'add_aci9.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1132,7 +1132,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1173,7 +1173,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1232,7 +1232,7 @@
<script>
curr_aci_ldif_file = 'add_aci10.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1244,7 +1244,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1297,7 +1297,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1356,7 +1356,7 @@
<script>
curr_aci_ldif_file = 'add_aci11.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1368,7 +1368,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1409,7 +1409,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1468,7 +1468,7 @@
<script>
curr_aci_ldif_file = 'add_aci12.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1480,7 +1480,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1521,7 +1521,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1580,7 +1580,7 @@
<script>
curr_aci_ldif_file = 'add_aci21.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1592,7 +1592,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1633,7 +1633,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1687,7 +1687,7 @@
<script>
curr_aci_ldif_file = 'add_aci22.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1699,7 +1699,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1727,7 +1727,7 @@
<script>
curr_aci_ldif_file = 'add_aci23.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1739,7 +1739,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1767,7 +1767,7 @@
<script>
curr_aci_ldif_file = 'add_aci24.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1779,7 +1779,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1807,7 +1807,7 @@
<script>
curr_aci_ldif_file = 'add_aci25.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1819,7 +1819,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1853,7 +1853,7 @@
<script>
curr_aci_ldif_file = 'add_aci26.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_rdn_wildcards/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1865,7 +1865,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="returnCode != '0'">
@@ -1931,7 +1931,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_setup.xml
index c499723..17041f2 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_setup.xml
@@ -107,7 +107,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_startup.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_startup.ldif' % remote.data }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
index 333cf7b..181d22e 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
@@ -173,7 +173,7 @@
<script>
curr_aci_ldif_file = 'add_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -185,7 +185,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -201,7 +201,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_title1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_title1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -217,7 +217,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_title1a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_title1a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -231,7 +231,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_telephonenumber1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_telephonenumber1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -247,7 +247,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_title1b.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_title1b.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -261,7 +261,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -277,7 +277,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_carlicense1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_carlicense1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -317,7 +317,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -329,7 +329,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -345,7 +345,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_telephonenumber2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_telephonenumber2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -361,7 +361,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_title2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_title2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -375,7 +375,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_roomnumber2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_roomnumber2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -391,7 +391,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_roomnumber2a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_roomnumber2a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -405,7 +405,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -421,7 +421,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_faxnumber2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_faxnumber2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -459,7 +459,7 @@
<script>
curr_aci_ldif_file = 'add_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -471,7 +471,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -487,7 +487,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -503,7 +503,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_mail3.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_mail3.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -517,7 +517,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l3a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l3a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -531,7 +531,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -547,7 +547,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l3.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l3.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -585,7 +585,7 @@
<script>
curr_aci_ldif_file = 'add_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -597,7 +597,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -613,7 +613,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_st4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_st4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -627,7 +627,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_mail4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_mail4.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -643,7 +643,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_st4a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_st4a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -657,7 +657,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -673,7 +673,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_st4.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_st4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -711,7 +711,7 @@
<script>
curr_aci_ldif_file = 'add_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -723,7 +723,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -739,7 +739,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -755,7 +755,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_mail5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_mail5.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -771,7 +771,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l5a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l5a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -785,7 +785,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -801,7 +801,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l5.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l5.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -838,7 +838,7 @@
<script>
curr_aci_ldif_file = 'add_aci17.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -850,7 +850,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -866,7 +866,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_street17.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_street17.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -882,7 +882,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_mail17.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_mail17.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -896,7 +896,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_street17a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_street17a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -910,7 +910,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -926,7 +926,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_street17.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_street17.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -963,7 +963,7 @@
<script>
curr_aci_ldif_file = 'add_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -975,7 +975,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -991,7 +991,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_title6.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_title6.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1005,7 +1005,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_title6a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_title6a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1019,7 +1019,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1035,7 +1035,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_title6.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_title6.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1065,7 +1065,7 @@
<script>
curr_aci_ldif_file = 'add_aci7.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1077,7 +1077,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1107,7 +1107,7 @@
<script>
curr_aci_ldif_file = 'add_aci8.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1119,7 +1119,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1149,7 +1149,7 @@
<script>
curr_aci_ldif_file = 'add_aci9.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1161,7 +1161,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1191,7 +1191,7 @@
<script>
curr_aci_ldif_file = 'add_aci10.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1203,7 +1203,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1238,7 +1238,7 @@
<script>
curr_aci_ldif_file = 'add_aci11.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1250,7 +1250,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1280,7 +1280,7 @@
<script>
curr_aci_ldif_file = 'add_aci12.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1292,7 +1292,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1327,7 +1327,7 @@
<script>
curr_aci_ldif_file = 'add_aci13.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1339,7 +1339,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1369,7 +1369,7 @@
<script>
curr_aci_ldif_file = 'add_aci14.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1381,7 +1381,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1411,7 +1411,7 @@
<script>
curr_aci_ldif_file = 'add_aci15.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1423,7 +1423,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1453,7 +1453,7 @@
<script>
curr_aci_ldif_file = 'add_aci16.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1465,7 +1465,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1503,7 +1503,7 @@
<script>
curr_aci_ldif_file = 'add_aci18.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1515,7 +1515,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1531,7 +1531,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_title18.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_title18.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1547,7 +1547,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1563,7 +1563,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_carlicense18.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_carlicense18.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml
index 9427007..1f86ed8 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml
@@ -170,7 +170,7 @@
<script>
curr_aci_ldif_file = 'add_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -182,7 +182,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -246,7 +246,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -307,7 +307,7 @@
<script>
curr_aci_ldif_file = 'add_entries1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -319,7 +319,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeAdded' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -381,7 +381,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci_from_entries.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci_from_entries.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -459,7 +459,7 @@
<script>
curr_aci_ldif_file = 'add_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -471,7 +471,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -535,7 +535,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -595,7 +595,7 @@
<script>
curr_aci_ldif_file = 'add_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -607,7 +607,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -671,7 +671,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -731,7 +731,7 @@
<script>
curr_aci_ldif_file = 'add_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -743,7 +743,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -807,7 +807,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -867,7 +867,7 @@
<script>
curr_aci_ldif_file = 'add_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -879,7 +879,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -943,7 +943,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1000,7 +1000,7 @@
<script>
curr_aci_ldif_file = 'add_aci8.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1012,7 +1012,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1068,7 +1068,7 @@
<script>
curr_aci_ldif_file = 'add_aci9.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1080,7 +1080,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 50
}
</call>
@@ -1137,7 +1137,7 @@
<script>
curr_aci_ldif_file = 'add_aci9a.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1149,7 +1149,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1213,7 +1213,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1272,7 +1272,7 @@
<script>
curr_aci_ldif_file = 'add_aci10.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1284,7 +1284,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1341,7 +1341,7 @@
<script>
curr_aci_ldif_file = 'add_aci11.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1353,7 +1353,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1410,7 +1410,7 @@
<script>
curr_aci_ldif_file = 'add_aci12.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1422,7 +1422,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1478,7 +1478,7 @@
<script>
curr_aci_ldif_file = 'add_aci13.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1490,7 +1490,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -2046,7 +2046,7 @@
<script>
curr_aci_ldif_file = 'add_aci21.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2058,7 +2058,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2120,7 +2120,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2180,7 +2180,7 @@
<script>
curr_aci_ldif_file = 'add_aci22.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2192,7 +2192,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2254,7 +2254,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2314,7 +2314,7 @@
<script>
curr_aci_ldif_file = 'add_aci23.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2326,7 +2326,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2388,7 +2388,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2448,7 +2448,7 @@
<script>
curr_aci_ldif_file = 'add_aci24.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2460,7 +2460,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2524,7 +2524,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2584,7 +2584,7 @@
<script>
curr_aci_ldif_file = 'add_aci25.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2596,7 +2596,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2660,7 +2660,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2720,7 +2720,7 @@
<script>
curr_aci_ldif_file = 'add_aci26.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2732,7 +2732,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2796,7 +2796,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2856,7 +2856,7 @@
<script>
curr_aci_ldif_file = 'add_aci27.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2868,7 +2868,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2932,7 +2932,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2988,7 +2988,7 @@
<script>
curr_aci_ldif_file = 'add_aci28.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3000,7 +3000,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3064,7 +3064,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3124,7 +3124,7 @@
<script>
curr_aci_ldif_file = 'add_aci31.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3136,7 +3136,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3152,7 +3152,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=People,ou=aci branch,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'sprain' ,
- 'entryToBeModified' : '%s/aci/aci_target/mod_entry31.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/aci/aci_target/mod_entry31.ldif' % (remote.data) }
</call>
<if expr="RC != 0">
@@ -3168,7 +3168,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=People,ou=aci branch,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'sprain' ,
- 'entryToBeModified' : '%s/aci/aci_target/mod_entry31a.ldif' % (logsRemoteDataDir) ,
+ 'entryToBeModified' : '%s/aci/aci_target/mod_entry31a.ldif' % (remote.data) ,
'expectedRC' : 53
}
</call>
@@ -3182,7 +3182,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=People,ou=aci branch,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'sprain' ,
- 'entryToBeModified' : '%s/aci/aci_target/mod_entry31b.ldif' % (logsRemoteDataDir) ,
+ 'entryToBeModified' : '%s/aci/aci_target/mod_entry31b.ldif' % (remote.data) ,
'expectedRC' : 53
}
</call>
@@ -3196,7 +3196,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=People,ou=aci branch,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'sprain' ,
- 'entryToBeModified' : '%s/aci/aci_target/mod_entry31c.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/aci/aci_target/mod_entry31c.ldif' % (remote.data) }
</call>
<if expr="RC != 0">
@@ -3212,7 +3212,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -3254,7 +3254,7 @@
<script>
curr_aci_ldif_file = 'add_aci32.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3266,7 +3266,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3282,7 +3282,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/mod_entry32.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/aci/aci_target/mod_entry32.ldif' % (remote.data) }
</call>
<if expr="RC != 0">
@@ -3457,7 +3457,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/mod_entry32c.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/aci/aci_target/mod_entry32c.ldif' % (remote.data) }
</call>
<if expr="RC != 0">
@@ -3473,7 +3473,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -3511,7 +3511,7 @@
<script>
curr_aci_ldif_file = 'add_aci33.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3523,7 +3523,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3599,7 +3599,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3659,7 +3659,7 @@
<script>
curr_aci_ldif_file = 'add_aci34.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3671,7 +3671,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3735,7 +3735,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
index 1e70ad0..23e9203 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
@@ -167,7 +167,7 @@
<script>
curr_aci_ldif_file = 'add_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -179,7 +179,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -255,7 +255,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -316,7 +316,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -328,7 +328,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -404,7 +404,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -465,7 +465,7 @@
<script>
curr_aci_ldif_file = 'add_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -477,7 +477,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -565,7 +565,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -627,7 +627,7 @@
<script>
curr_aci_ldif_file = 'add_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -639,7 +639,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -727,7 +727,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -784,7 +784,7 @@
<script>
curr_aci_ldif_file = 'add_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -796,7 +796,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -866,7 +866,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -921,7 +921,7 @@
<script>
curr_aci_ldif_file = 'add_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -933,7 +933,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -985,7 +985,7 @@
<script>
curr_aci_ldif_file = 'add_aci7.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -997,7 +997,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1049,7 +1049,7 @@
<script>
curr_aci_ldif_file = 'add_aci8.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1061,7 +1061,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -1118,7 +1118,7 @@
<script>
curr_aci_ldif_file = 'add_aci9.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1130,7 +1130,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1206,7 +1206,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1266,7 +1266,7 @@
<script>
curr_aci_ldif_file = 'add_aci10.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1278,7 +1278,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 0
}
</call>
@@ -1340,7 +1340,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1396,7 +1396,7 @@
<script>
curr_aci_ldif_file = 'add_aci11.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1408,7 +1408,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetcontrol.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetcontrol.xml
index 2ba7607..0263646 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetcontrol.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetcontrol.xml
@@ -106,7 +106,7 @@
<script>
curr_aci_ldif_file = 'add_effrights_aci.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetcontrol/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetcontrol/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -118,7 +118,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetcontrol/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetcontrol/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<call function="'checktestRC'">
@@ -156,7 +156,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetcontrol/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetcontrol/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -168,7 +168,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetcontrol/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetcontrol/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -246,7 +246,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetcontrol/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetcontrol/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -325,7 +325,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetcontrol/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetcontrol/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -337,7 +337,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetcontrol/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetcontrol/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -417,7 +417,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetcontrol/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetcontrol/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -498,7 +498,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetcontrol/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetcontrol/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -510,7 +510,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetcontrol/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetcontrol/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -588,7 +588,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetcontrol/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetcontrol/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -652,7 +652,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetcontrol/del_effrights_aci.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/aci/aci_targetcontrol/del_effrights_aci.ldif' % (remote.data) }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
index 8034336..abc24bf 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
@@ -168,7 +168,7 @@
<script>
curr_aci_ldif_file = 'add_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -180,7 +180,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -286,7 +286,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -349,7 +349,7 @@
<script>
curr_aci_ldif_file = 'add_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -361,7 +361,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -467,7 +467,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -528,7 +528,7 @@
<script>
curr_aci_ldif_file = 'add_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -540,7 +540,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -620,7 +620,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -681,7 +681,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -693,7 +693,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -799,7 +799,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -861,7 +861,7 @@
<script>
curr_aci_ldif_file = 'add_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -873,7 +873,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -979,7 +979,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1041,7 +1041,7 @@
<script>
curr_aci_ldif_file = 'add_aci3a.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1053,7 +1053,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1159,7 +1159,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1219,7 +1219,7 @@
<script>
curr_aci_ldif_file = 'add_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1231,7 +1231,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1295,7 +1295,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1356,7 +1356,7 @@
<script>
curr_aci_ldif_file = 'add_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1368,7 +1368,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1432,7 +1432,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1494,7 +1494,7 @@
<script>
curr_aci_ldif_file = 'add_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1506,7 +1506,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1612,7 +1612,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1674,7 +1674,7 @@
<script>
curr_aci_ldif_file = 'add_aci6a.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1686,7 +1686,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1792,7 +1792,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1854,7 +1854,7 @@
<script>
curr_aci_ldif_file = 'add_aci10.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1866,7 +1866,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1972,7 +1972,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2034,7 +2034,7 @@
<script>
curr_aci_ldif_file = 'add_aci11.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2046,7 +2046,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2152,7 +2152,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2214,7 +2214,7 @@
<script>
curr_aci_ldif_file = 'add_aci12.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2226,7 +2226,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2332,7 +2332,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2394,7 +2394,7 @@
<script>
curr_aci_ldif_file = 'add_aci13.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2406,7 +2406,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2512,7 +2512,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2571,7 +2571,7 @@
<script>
curr_aci_ldif_file = 'add_aci7.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2583,7 +2583,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2623,7 +2623,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2680,7 +2680,7 @@
<script>
curr_aci_ldif_file = 'add_aci8.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2692,7 +2692,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -2747,7 +2747,7 @@
<script>
curr_aci_ldif_file = 'add_aci9.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2759,7 +2759,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -2814,7 +2814,7 @@
<script>
curr_aci_ldif_file = 'add_aci14.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2826,7 +2826,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -2881,7 +2881,7 @@
<script>
curr_aci_ldif_file = 'add_aci15.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2893,7 +2893,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
index b0a460f..aedffbd 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
@@ -101,7 +101,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_targetscope/aci_startup_targetscope.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_targetscope/aci_startup_targetscope.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -138,7 +138,7 @@
<script>
curr_aci_ldif_file = 'add_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -150,7 +150,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -265,7 +265,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetscope/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetscope/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -325,7 +325,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -337,7 +337,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -458,7 +458,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetscope/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetscope/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -518,7 +518,7 @@
<script>
curr_aci_ldif_file = 'add_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -530,7 +530,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -657,7 +657,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetscope/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetscope/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -717,7 +717,7 @@
<script>
curr_aci_ldif_file = 'add_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -729,7 +729,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -856,7 +856,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetscope/del_aci.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targetscope/del_aci.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -910,7 +910,7 @@
<script>
curr_aci_ldif_file = 'add_syntax_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -922,7 +922,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -950,7 +950,7 @@
<script>
curr_aci_ldif_file = 'add_syntax_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -962,7 +962,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
@@ -990,7 +990,7 @@
<script>
curr_aci_ldif_file = 'add_syntax_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1002,7 +1002,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (remote.data,curr_aci_ldif_file) ,
'expectedRC' : 21
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/global_acis.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/global_acis.xml
index 2a27f27..f45e664 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/global_acis.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/global_acis.xml
@@ -197,7 +197,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/global_acis/mod_modifier_entry1.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/aci/global_acis/mod_modifier_entry1.ldif' % (remote.data) }
</call>
<if expr="RC != 0">
@@ -773,7 +773,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/global_acis/mod_entry1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/global_acis/mod_entry1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -808,7 +808,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/global_acis/del_entry1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/global_acis/del_entry1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -843,7 +843,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/global_acis/modrdn_entry1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/global_acis/modrdn_entry1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -878,7 +878,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/global_acis/mod_entry2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/global_acis/mod_entry2.ldif' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
index 44ce7d5..4369b35 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
@@ -88,7 +88,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/multiple_aci_tests/aci_startup_mult_aci_tests.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/multiple_aci_tests/aci_startup_mult_aci_tests.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -188,7 +188,7 @@
<script>
curr_aci_ldif_file = 'add_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -200,7 +200,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -306,7 +306,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -368,7 +368,7 @@
<script>
curr_aci_ldif_file = 'add_aci2.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -380,7 +380,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -504,7 +504,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -566,7 +566,7 @@
<script>
curr_aci_ldif_file = 'add_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -578,7 +578,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -702,7 +702,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -764,7 +764,7 @@
<script>
curr_aci_ldif_file = 'add_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -776,7 +776,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -900,7 +900,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -961,7 +961,7 @@
<script>
curr_aci_ldif_file = 'add_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -973,7 +973,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1061,7 +1061,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1122,7 +1122,7 @@
<script>
curr_aci_ldif_file = 'add_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1134,7 +1134,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1222,7 +1222,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1283,7 +1283,7 @@
<script>
curr_aci_ldif_file = 'add_aci7.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1295,7 +1295,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1383,7 +1383,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1445,7 +1445,7 @@
<script>
curr_aci_ldif_file = 'add_aci8.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1457,7 +1457,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1563,7 +1563,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1625,7 +1625,7 @@
<script>
curr_aci_ldif_file = 'add_aci9.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1637,7 +1637,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1761,7 +1761,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -1823,7 +1823,7 @@
<script>
curr_aci_ldif_file = 'add_aci10.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -1835,7 +1835,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1959,7 +1959,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2021,7 +2021,7 @@
<script>
curr_aci_ldif_file = 'add_aci11.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2033,7 +2033,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2161,7 +2161,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2223,7 +2223,7 @@
<script>
curr_aci_ldif_file = 'add_aci12.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2235,7 +2235,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2347,7 +2347,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2409,7 +2409,7 @@
<script>
curr_aci_ldif_file = 'add_aci13.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2421,7 +2421,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2545,7 +2545,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2607,7 +2607,7 @@
<script>
curr_aci_ldif_file = 'add_aci14.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2619,7 +2619,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2725,7 +2725,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2787,7 +2787,7 @@
<script>
curr_aci_ldif_file = 'add_aci31.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2799,7 +2799,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2815,7 +2815,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l31.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l31.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2831,7 +2831,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_mail31.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_mail31.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2845,7 +2845,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l31a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l31a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2859,7 +2859,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2875,7 +2875,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l31.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l31.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2911,7 +2911,7 @@
<script>
curr_aci_ldif_file = 'add_aci32.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -2923,7 +2923,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2939,7 +2939,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l32.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l32.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2953,7 +2953,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_mail32.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_mail32.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2967,7 +2967,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l32a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l32a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2981,7 +2981,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -2997,7 +2997,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l32.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l32.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3033,7 +3033,7 @@
<script>
curr_aci_ldif_file = 'add_aci33.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3045,7 +3045,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3061,7 +3061,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l33.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l33.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3075,7 +3075,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_mail33.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_mail33.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3089,7 +3089,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l33a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l33a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3103,7 +3103,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3119,7 +3119,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l33.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l33.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3153,7 +3153,7 @@
<script>
curr_aci_ldif_file = 'add_aci34.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3165,7 +3165,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3181,7 +3181,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l34.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l34.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3197,7 +3197,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title34.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title34.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3211,7 +3211,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l34a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l34a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3225,7 +3225,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3241,7 +3241,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3276,7 +3276,7 @@
<script>
curr_aci_ldif_file = 'add_aci35.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3288,7 +3288,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3304,7 +3304,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l35.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l35.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3320,7 +3320,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title35.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title35.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3336,7 +3336,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l35a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l35a.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3352,7 +3352,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3368,7 +3368,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3404,7 +3404,7 @@
<script>
curr_aci_ldif_file = 'add_aci36.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3416,7 +3416,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3432,7 +3432,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l36.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l36.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3448,7 +3448,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title36.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title36.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3462,7 +3462,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title36.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title36.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3476,7 +3476,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l36a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l36a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3490,7 +3490,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3506,7 +3506,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3542,7 +3542,7 @@
<script>
curr_aci_ldif_file = 'add_aci37.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3554,7 +3554,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3570,7 +3570,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l37.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l37.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3586,7 +3586,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title37.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title37.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3600,7 +3600,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title37.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title37.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3614,7 +3614,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l37a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l37a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3628,7 +3628,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3644,7 +3644,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3679,7 +3679,7 @@
<script>
curr_aci_ldif_file = 'add_aci38.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3691,7 +3691,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3707,7 +3707,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l38.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l38.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3723,7 +3723,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title38.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title38.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3737,7 +3737,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title38.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title38.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3751,7 +3751,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l38a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l38a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3765,7 +3765,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3781,7 +3781,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3816,7 +3816,7 @@
<script>
curr_aci_ldif_file = 'add_aci39.ldif'
- curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (logsLocalDataDir,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/multiple_aci_tests/%s' % (local.data,curr_aci_ldif_file));
</script>
<message>
@@ -3828,7 +3828,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3844,7 +3844,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l39.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l39.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3858,7 +3858,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title39.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title39.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3872,7 +3872,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title39.1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title39.1.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3886,7 +3886,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l37a.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l37a.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -3900,7 +3900,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -3916,7 +3916,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backend_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backend_setup.xml
index 7d0eab6..9be3f0a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backend_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backend_setup.xml
@@ -84,7 +84,7 @@
'Backend: Backend Setup for Export, Backup, and Restore Tests'
</message>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/backend_start.ldif' % logsRemoteDataDir }
+ { 'ldifFile' : '%s/backends/backend_start.ldif' % remote.data }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backends.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backends.xml
index 1a4a156..f379858 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backends.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backends.xml
@@ -27,15 +27,40 @@
! -->
<stax>
<defaultcall function="main_backends"/>
- <function name="main_backends">
+ <function name="main_backends" scope="local">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'backends'">
<sequence>
+
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
+
<script>
CurrentTestPath['group']='backends'
</script>
<call function="'testGroup_Preamble'"/>
- <iterate var="_test" in="['import','import-tasks','backup-tasks','backup','restore-tasks','restore','export-tasks','export']" >
+
+ <!-- List of backends test suites to run -->
+ <script>
+ testList = []
+ testList.append('import')
+ testList.append('import-tasks')
+ testList.append('backup')
+ testList.append('backup-tasks')
+ testList.append('restore')
+ testList.append('restore-tasks')
+ testList.append('export')
+ testList.append('export-tasks')
+ </script>
+
+ <iterate var="_test" in="testList" >
<sequence>
<import machine="STAF_LOCAL_HOSTNAME"
file="'%s/testcases/backends/%s.xml' % (TESTS_DIR,_test)"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backendsetup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backendsetup.xml
index 37b2a15..04e533e 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backendsetup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backendsetup.xml
@@ -75,7 +75,7 @@
'Backend: Backend Setup for Export, Backup, and Restore Tests'
</message>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/backend_start.ldif' % logsRemoteDataDir }
+ { 'ldifFile' : '%s/backends/backend_start.ldif' % remote.data }
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup-tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
index e1a804d..5e31de4 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
@@ -53,7 +53,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : '3',
- 'backupDir' : '%s/backends/' % logsRemoteDataDir
+ 'backupDir' : '%s/backends/' % remote.data
}
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup.xml
index 8d4a3b0..310f3b8 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup.xml
@@ -71,7 +71,7 @@
'Backend Backup1: Create a backup of the data in OpenDS'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup1' % logsRemoteDataDir
+ { 'backupDir' : '%s/backends/backup1' % remote.data
}
</call>
@@ -103,7 +103,7 @@
'Backend Backup2: Create an incremental backup of the data in OpenDS'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup1' % logsRemoteDataDir,
+ { 'backupDir' : '%s/backends/backup1' % remote.data,
'extraParams' : '-i'
}
</call>
@@ -135,7 +135,7 @@
'Backend Backup3: Create a backup of the data in OpenDS with a backup id'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup2' % logsRemoteDataDir,
+ { 'backupDir' : '%s/backends/backup2' % remote.data,
'extraParams' : '-I 20070714142807Z'
}
</call>
@@ -166,7 +166,7 @@
'Backend Backup4: Create an incremental backup of the data in OpenDS with a backup id'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup2' % logsRemoteDataDir,
+ { 'backupDir' : '%s/backends/backup2' % remote.data,
'extraParams' : '-B 20070714142807Z -i'
}
</call>
@@ -197,7 +197,7 @@
'Backend Backup5: Create a compressed backup of the data in OpenDS'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup1' % logsRemoteDataDir,
+ { 'backupDir' : '%s/backends/backup1' % remote.data,
'extraParams' : '-c'
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/export-tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/export-tasks.xml
index 7e760c6..0357f27 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/export-tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/export-tasks.xml
@@ -74,7 +74,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : '1',
- 'ldifFile' : '%s/backends/ExportTasks1.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/backends/ExportTasks1.ldif' % remote.data
}
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/export.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/export.xml
index 08cedcc..d098fae 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/export.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/export.xml
@@ -102,7 +102,7 @@
</message>
<call function="'exportLdif'">
{
- 'ldifFile' : '%s/backends/Export_default.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Export_default.ldif' % remote.data,
'backEnd' : '%s' % DIRECTORY_INSTANCE_BE
}
</call>
@@ -114,7 +114,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_default.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_default.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
@@ -182,7 +182,7 @@
'Backend: Export: Export non-default backend'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_schema.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_schema.ldif' % remote.data,
'backEnd' : 'schema'
}
</call>
@@ -194,7 +194,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_schema.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_schema.ldif' % remote.data,
'backEnd' : 'schema',
'dsPath' : '%s/server2/%s' % (DIRECTORY_INSTANCE_DIR, OPENDSNAME)
}
@@ -230,7 +230,7 @@
'Backend: Export: Export Fractional Include Branch'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_IncludeBranch.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_IncludeBranch.ldif' % remote.data,
'extraParams' : '-b "dc=com"'
}
</call>
@@ -242,7 +242,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_IncludeBranch.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_IncludeBranch.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
@@ -313,7 +313,7 @@
</message>
<call function="'exportLdif'">
{
- 'ldifFile' : '%s/backends/Export_IncludeBranches.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Export_IncludeBranches.ldif' % remote.data,
'extraParams' : '-b "dc=com" -b "dc=example,dc=com"'
}
</call>
@@ -324,7 +324,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_IncludeBranches.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_IncludeBranches.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)}
</call>
@@ -392,7 +392,7 @@
'Backend: Export: Export Fractional Exclude Branch'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_ExcludeBranch.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_ExcludeBranch.ldif' % remote.data,
'extraParams' : '-B "dc=example,dc=com"'
}
</call>
@@ -404,7 +404,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_ExcludeBranch.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_ExcludeBranch.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
@@ -474,7 +474,7 @@
'Backend: Export: Export Fractional Exclude Branches'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_ExcludeBranches.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_ExcludeBranches.ldif' % remote.data,
'extraParams' : '-B "ou=People,dc=example,dc=com" -B "dc=example,dc=com"'
}
</call>
@@ -486,7 +486,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_ExcludeBranches.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_ExcludeBranches.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
@@ -556,7 +556,7 @@
'Backend: Export: Export Fractional Branches Mix'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_MixBranches.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_MixBranches.ldif' % remote.data,
'extraParams' : '-b "dc=com" -B "ou=People,dc=example,dc=com"'
}
</call>
@@ -568,7 +568,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_MixBranches.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_MixBranches.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
@@ -634,7 +634,7 @@
'Backend: Export: Export Fractional Include Attribute'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_IncludeAttr.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_IncludeAttr.ldif' % remote.data,
'extraParams' : '-i dc'
}
</call>
@@ -646,7 +646,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_IncludeAttr.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_IncludeAttr.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
@@ -715,7 +715,7 @@
'Backend: Export: Export Fractional Include Attributes'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_IncludeAttrs.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_IncludeAttrs.ldif' % remote.data,
'extraParams' : '-i dc -i cn -i ou -i sn -i uid'
}
</call>
@@ -727,7 +727,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_IncludeAttrs.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_IncludeAttrs.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)}
</call>
@@ -797,7 +797,7 @@
'Backend: Export: Export Fractional Exclude Attribute'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_ExcludeAttr.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_ExcludeAttr.ldif' % remote.data,
'extraParams' : '-e userpassword'
}
</call>
@@ -809,7 +809,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_ExcludeAttr.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_ExcludeAttr.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
@@ -878,7 +878,7 @@
'Backend: Export: Export Fractional Exclude Attributes'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_ExcludeAttrs.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_ExcludeAttrs.ldif' % remote.data,
'extraParams' : '-e userpassword -e mail -e roomnumber'
}
</call>
@@ -890,7 +890,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_ExcludeAttrs.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_ExcludeAttrs.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
@@ -961,7 +961,7 @@
'Backend: Export: Export Fractional Mix'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_FractionalMix.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FractionalMix.ldif' % remote.data,
'extraParams' : '-i dc -i cn -i ou -i sn -i uid -b "dc=com" -b "dc=example,dc=com" -b "ou=People,dc=example,dc=com" -B "ou=Departed,ou=People,dc=example,dc=com"'
}
</call>
@@ -973,7 +973,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_FractionalMix.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FractionalMix.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
@@ -1044,7 +1044,7 @@
'Backend: Export: Export Filtered Include'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredInclude.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredInclude.ldif' % remote.data,
'extraParams' : '-I "objectclass=*"'
}
</call>
@@ -1056,7 +1056,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredInclude.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredInclude.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
@@ -1126,7 +1126,7 @@
'Backend: Export: Export Filtered Includes'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.data,
'extraParams' : '-I "objectclass=domain" -I "objectclass=organizationalunit"'
}
</call>
@@ -1138,7 +1138,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
@@ -1208,7 +1208,7 @@
'Backend: Export: Export Filtered Exclude'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredExclude.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredExclude.ldif' % remote.data,
'extraParams' : '-E "objectclass=person"'
}
</call>
@@ -1220,7 +1220,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredExclude.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredExclude.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
@@ -1292,7 +1292,7 @@
'Backend: Export: Export Filtered Excludes'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredExcludes.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredExcludes.ldif' % remote.data,
'extraParams' : '-E "objectclass=person" -E "objectclass=organizationalunit"'
}
</call>
@@ -1304,7 +1304,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredExcludes.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredExcludes.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)}
</call>
@@ -1376,7 +1376,7 @@
</message>
<call function="'exportLdif'">
{
- 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.data,
'extraParams' : '-I "objectclass=domain" -I "objectclass=organizationalunit"'
}
</call>
@@ -1387,7 +1387,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)}
</call>
@@ -1453,7 +1453,7 @@
'Backend: Export: Export Filtered Includes Complex'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredComplexIncludes.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredComplexIncludes.ldif' % remote.data,
'extraParams' : '-I "|(objectclass=person)(objectclass=domain)(objectclass=organizationalunit)"'
}
</call>
@@ -1464,7 +1464,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredComplexIncludes.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredComplexIncludes.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)}
</call>
@@ -1532,7 +1532,7 @@
'Backend: Export: Export Filtered Excludes Complex'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredComplexExcludes.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredComplexExcludes.ldif' % remote.data,
'extraParams' : '-E "&(objectclass=person)(ou=Departed)"'
}
</call>
@@ -1544,7 +1544,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredComplexExcludes.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredComplexExcludes.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
@@ -1614,7 +1614,7 @@
'Backend: Export: Export Fractional Filtered Mix'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % remote.data,
'extraParams' : '-E "&(objectclass=person)(ou=Departed)" -b "dc=com" -e userpassword'
}
</call>
@@ -1626,7 +1626,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
@@ -1696,7 +1696,7 @@
'Backend: Export: Export Append To LDIF'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % remote.data,
'extraParams' : '-a'
}
</call>
@@ -1708,7 +1708,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
@@ -1779,7 +1779,7 @@
'Backend: Export: Export Compress LDIF'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/ExportCompressed.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/ExportCompressed.ldif' % remote.data,
'extraParams' : '-c'
}
</call>
@@ -1791,7 +1791,7 @@
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/ExportCompressed.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/ExportCompressed.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'extraParams' : '-c'}
</call>
@@ -1860,7 +1860,7 @@
'Backend: Export: Export Encrypt LDIF'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/ExportEncrypted.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/ExportEncrypted.ldif' % remote.data,
'extraParams' : '-y'
}
</call>
@@ -1870,7 +1870,7 @@
}
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/ExportEncrypted.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/ExportEncrypted.ldif' % remote.data,
'extraParams' : '-y',
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -1947,7 +1947,7 @@
'Backend: Export: Export Wrap Column'
</message>
<call function="'exportLdif'">
- { 'ldifFile' : '%s/backends/ExportWrapCol.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/ExportWrapCol.ldif' % remote.data,
'extraParams' : '--wrapColumn 25'
}
</call>
@@ -1957,7 +1957,7 @@
}
</call>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/ExportWrapCol.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/ExportWrapCol.ldif' % remote.data,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml
index 3f343c2..49a4920 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml
@@ -70,7 +70,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Example.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/backends/Example.ldif' % remote.data
}
</call>
<call function="'checktestRC'">
@@ -108,7 +108,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Include.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Include.ldif' % remote.data,
'includeBranches' : ['dc=com'],
}
</call>
@@ -147,7 +147,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Include.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Include.ldif' % remote.data,
'includeBranches' : ['dc=com','dc=example,dc=com']
}
</call>
@@ -186,7 +186,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % remote.data,
'excludeBranches' : ['ou=Departed,ou=People,dc=example,dc=com'],
}
</call>
@@ -227,7 +227,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % remote.data,
'excludeBranches' : ['ou=Departed,ou=People,dc=example,dc=com',
'cn=QA Managers,ou=groups,dc=example,dc=com']
}
@@ -270,7 +270,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % remote.data,
'includeBranches' : ['dc=com'],
'excludeBranches' : ['ou=Departed,ou=People,dc=example,dc=com'],
}
@@ -314,7 +314,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Include.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Include.ldif' % remote.data,
'includeAttributes' : ['dc'],
}
</call>
@@ -352,7 +352,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Include.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Include.ldif' % remote.data,
'includeAttributes' : ['dc','cn','ou','sn']
}
</call>
@@ -391,7 +391,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % remote.data,
'excludeAttributes' : ['userpassword']
}
</call>
@@ -428,7 +428,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % remote.data,
'excludeAttributes' : ['userpassword','mail','roomnumber']
}
</call>
@@ -466,7 +466,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % remote.data,
'includeBranches' : ['dc=com','dc=example,dc=com','ou=People,dc=example,dc=com'],
'excludeBranches' : ['ou=Departed,ou=People,dc=example,dc=com'],
'includeAttributes' : ['dc','cn','ou','sn'],
@@ -509,7 +509,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Include.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Include.ldif' % remote.data,
'includeFilters' : ['objectclass=*'],
}
</call>
@@ -547,7 +547,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % remote.data,
'excludeFilters' : ['objectclass=person'],
}
</call>
@@ -588,7 +588,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Include.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Include.ldif' % remote.data,
'includeFilters' : ['objectclass=domain*','objectclass=organizationalunit']
}
</call>
@@ -629,7 +629,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % remote.data,
'excludeFilters' : ['objectclass=person','objectclass=organizationalunit'],
}
</call>
@@ -667,7 +667,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Include.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Include.ldif' % remote.data,
'includeFilters' : ['|(objectclass=person)(objectclass=domain)(objectclass=organizationalunit)'],
}
</call>
@@ -705,7 +705,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % remote.data,
'excludeFilters' : ['&(objectclass=person)(ou=Departed)'],
}
</call>
@@ -743,7 +743,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % remote.data,
'excludeFilters' : ['&(objectclass=person)(ou=Departed)'],
'includeBranches' : ['dc=com'],
'excludeAttributes' : ['userpassword']
@@ -783,7 +783,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Append.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Append.ldif' % remote.data,
'append' : 'TRUE'
}
</call>
@@ -821,7 +821,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Append.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Append.ldif' % remote.data,
'append' : 'TRUE',
'replaceExisting' : 'TRUE'
}
@@ -860,7 +860,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Example.ldif.gz' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Example.ldif.gz' % remote.data,
'isCompressed' : 'TRUE'
}
</call>
@@ -900,7 +900,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Example.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Example.ldif' % remote.data,
'isEncrypted' : 'TRUE'
}
</call>
@@ -959,7 +959,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Example.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Example.ldif' % remote.data,
'rejectsFile' : './rejects'
}
</call>
@@ -999,7 +999,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Example.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Example.ldif' % remote.data,
'rejectsFile' : './rejects',
'overwriteRejectsFile' : 'TRUE'
}
@@ -1040,7 +1040,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Schema.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Schema.ldif' % remote.data,
'skipSchemaValidation' : 'TRUE'
}
</call>
@@ -1079,7 +1079,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Schema.ldif' % logsRemoteDataDir,
+ 'ldifFile' : '%s/backends/Schema.ldif' % remote.data,
'skipSchemaValidation' : 'FALSE'
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml
index db2d4a5..3d9ece8 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml
@@ -81,7 +81,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsLdifFile' : '%s/backends/Example.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Example.ldif' % remote.data,
'dsBackEnd' : 'userRoot'}
</call>
@@ -121,7 +121,7 @@
<call function="'testCase_Preamble'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Example.ldif' % logsRemoteDataDir,
+ { 'ldifFile' : '%s/backends/Example.ldif' % remote.data,
'backEnd' : 'nonDefault' }
</call>
@@ -160,7 +160,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Include.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeBranch' : ['dc=com'] }
</call>
@@ -202,7 +202,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Include.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeBranch' : ['dc=com'],
'dsBackEnd' : 'userRoot'
}
@@ -244,7 +244,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Include.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeBranch' : ['dc=com','dc=example,dc=com']
}
</call>
@@ -285,7 +285,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeBranch' : ['ou=Departed,ou=People,dc=example,dc=com'],
'dsBackEnd' : 'userRoot'
}
@@ -330,7 +330,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeBranch' : ['ou=Departed,ou=People,dc=example,dc=com'],
'dsBackEnd' : 'userRoot'
}
@@ -375,7 +375,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsIncludeBranch' : ['dc=com'],
'dsExcludeBranch' : ['ou=Departed,ou=People,dc=example,dc=com']
}
@@ -420,7 +420,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Include.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeAttribute' : ['dc'],
'dsBackEnd' : 'userRoot'
}
@@ -462,7 +462,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Include.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeAttribute' : ['dc','cn','ou','sn'],
'dsBackEnd' : 'userRoot'
}
@@ -505,7 +505,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeAttribute' : ['userpassword'],
'dsBackEnd' : 'userRoot'
}
@@ -547,7 +547,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeAttribute' : ['userpassword','mail','roomnumber'],
'dsBackEnd' : 'userRoot'
}
@@ -589,7 +589,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Example.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Example.ldif' % remote.data,
'dsIncludeAttribute' : ['dc','cn','ou','sn'],
'dsIncludeBranch' : ['dc=com','dc=example,dc=com','ou=People,dc=example,dc=com'],
'dsExcludeBranch' : ['ou=Departed,ou=People,dc=example,dc=com']
@@ -635,7 +635,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Include.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeFilter' : ['objectclass=*'],
'dsBackEnd' : 'userRoot'
}
@@ -678,7 +678,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeFilter' : ['objectclass=person'],
'dsBackEnd' : 'userRoot'
}
@@ -723,7 +723,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Include.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeFilter' : ['objectclass=domain','objectclass=organizationalunit'],
'dsBackEnd' : 'userRoot'
}
@@ -768,7 +768,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeFilter' : ['objectclass=person','objectclass=organizationalunit'],
'dsBackEnd' : 'userRoot'
}
@@ -810,7 +810,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Include.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeFilter' : ['|(objectclass=person)(objectclass=domain)(objectclass=organizationalunit)'],
'dsBackEnd' : 'userRoot'
}
@@ -853,7 +853,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeFilter' : ['&(objectclass=person)(ou=Departed)'],
'dsBackEnd' : 'userRoot'
}
@@ -895,7 +895,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Exclude.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeFilter' : ['&(objectclass=person)(ou=Departed)'],
'dsIncludeBranch' : ['dc=com'],
'dsExcludeAttribute' : ['userpassword']
@@ -938,7 +938,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Append.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Append.ldif' % remote.data,
'dsAppend' : 'TRUE',
'dsBackEnd' : 'userRoot'
}
@@ -981,7 +981,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Append.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Append.ldif' % remote.data,
'dsAppend' : 'TRUE',
'dsReplaceExisting' : 'TRUE',
'dsBackEnd' : 'userRoot'
@@ -1025,7 +1025,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Example.ldif.gz' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Example.ldif.gz' % remote.data,
'dsIsCompressed' : 'TRUE',
'dsBackEnd' : 'userRoot'
}
@@ -1067,7 +1067,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Example.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Example.ldif' % remote.data,
'dsIsEncrypted' : 'TRUE',
'dsBackEnd' : 'userRoot'
}
@@ -1132,7 +1132,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Example.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Example.ldif' % remote.data,
'dsRejectFile' : '%s/rejects.txt' % TMPDIR,
'dsBackEnd' : 'userRoot'
}
@@ -1175,7 +1175,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Example.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Example.ldif' % remote.data,
'dsRejectFile' : '%s/rejects.txt' % TMPDIR,
'dsBackEnd' : 'userRoot'
}
@@ -1218,7 +1218,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Schema.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Schema.ldif' % remote.data,
'dsSkipSchemaValidation' : 'TRUE',
'dsBackEnd' : 'userRoot'
}
@@ -1261,7 +1261,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsLdifFile' : '%s/backends/Schema.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/backends/Schema.ldif' % remote.data,
'dsBackEnd' : 'userRoot'
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore-tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
index 73d5f58..7157075 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
@@ -74,7 +74,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : '4',
- 'backupDir' : '%s/backends/' % logsRemoteDataDir
+ 'backupDir' : '%s/backends/' % remote.data
}
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore.xml
index 6560947..1a68f93 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore.xml
@@ -59,7 +59,7 @@
'Create a backup of the data in OpenDS to be used in the restore testcase'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup1' % logsRemoteDataDir
+ { 'backupDir' : '%s/backends/backup1' % remote.data
}
</call>
<call function="'checktestRC'">
@@ -103,7 +103,7 @@
</call>
<call function="'restore'">
- { 'backupDir' : '%s/backends/backup1' % logsRemoteDataDir
+ { 'backupDir' : '%s/backends/backup1' % remote.data
}
</call>
@@ -173,7 +173,7 @@
</call>
<call function="'backup'">
- { 'backupDir' : '%s/restore.compressed' % logsRemoteDataDir
+ { 'backupDir' : '%s/restore.compressed' % remote.data
}
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu.xml
index c063f8d..b5607b6 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu.xml
@@ -30,12 +30,21 @@
<defaultcall function="main_clu"/>
<function name="main_clu">
-
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'clu'">
<sequence>
+
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
<!--- Test Group information
#@TestGroupName Clu tests
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml
index 0be4078..31944b9 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml
@@ -54,8 +54,8 @@
<!--- Define default value for clearFile and encodedFile -->
<script>
- clearFile = '%s/clu/clear_password.ref' % logsRemoteDataDir
- encodedFile = '%s/clu/encoded_password.ref' % logsRemoteDataDir
+ clearFile = '%s/clu/clear_password.ref' % remote.data
+ encodedFile = '%s/clu/encoded_password.ref' % remote.data
</script>
<!--- Test Case information
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml
index 67fc7de..a89bea0 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml
@@ -56,7 +56,7 @@
<script>
basedn = 'ou=ldapmodify,o=clu tests,dc=example,dc=com'
dsfilename = '%s/clu/ldapmodify_checkbehavior.ldif' \
- % logsRemoteDataDir
+ % remote.data
</script>
<!--- Test Case information
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml
index c69c040..08d24a6 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml
@@ -56,7 +56,7 @@
<!--- Define default value for dsfilename -->
<script>
dsfilename = '%s/clu/ldapmodify_checkoptions.ldif' \
- % logsRemoteDataDir
+ % remote.data
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
index 1c56a11..bc6bff6 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
@@ -56,9 +56,9 @@
<script>
basedn = 'ou=ldapsearch,o=clu tests,dc=example,dc=com'
ldifFile = '%s/clu/ldapsearch_checkbehavior.ldif' \
- % logsRemoteDataDir
- filterfile = '%s/clu/filters.ldif' % logsRemoteDataDir
- mfilterfile = '%s/clu/multiple_filters.ldif' % logsRemoteDataDir
+ % remote.data
+ filterfile = '%s/clu/filters.ldif' % remote.data
+ mfilterfile = '%s/clu/multiple_filters.ldif' % remote.data
</script>
<!--- Test Case information
@@ -519,7 +519,7 @@
'sourceLdif' : '%s/ldapsearch_simplepagesize_30.out' \
% DIRECTORY_INSTANCE_DIR ,
'targetLdif' : '%s/clu/ldapsearch_simplepagesize_30.ref' \
- % logsRemoteDataDir ,
+ % remote.data ,
'outputLdif' : '%s/ldapsearch_simplepagesize_30.diff' \
% DIRECTORY_INSTANCE_DIR
}
@@ -556,7 +556,7 @@
'sourceLdif' : '%s/ldapsearch_simplepagesize_1.out' \
% DIRECTORY_INSTANCE_DIR ,
'targetLdif' : '%s/clu/ldapsearch_simplepagesize_1.ref' \
- % logsRemoteDataDir ,
+ % remote.data ,
'outputLdif' : '%s/ldapsearch_simplepagesize_1.diff' \
% DIRECTORY_INSTANCE_DIR
}
@@ -634,7 +634,7 @@
'sourceLdif' : '%s/ldapsearch_filterfile_and_attribute.out' \
% DIRECTORY_INSTANCE_DIR ,
'targetLdif' : '%s/clu/ldapsearch_filterfile_and_attribute.ref'\
- % logsRemoteDataDir ,
+ % remote.data ,
'outputLdif' : '%s/ldapsearch_filterfile_and_attribute.diff' \
% DIRECTORY_INSTANCE_DIR
}
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml
index c0e5d66..1ec0a98 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml
@@ -54,9 +54,9 @@
<!--- Define default value for sourceldif -->
<script>
- sourceldif = '%s/clu/clu_start.ldif' % logsRemoteDataDir
+ sourceldif = '%s/clu/clu_start.ldif' % remote.data
targetldif = '%s/clu/ldif-diff_checkbehavior.ldif' \
- % logsRemoteDataDir
+ % remote.data
</script>
<!--- Test Case information
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml
index d2eae82..af26f3c 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml
@@ -54,7 +54,7 @@
<!--- Define default value for sourceldif -->
<script>
- sourceldif = '%s/clu/clu_start.ldif' % logsRemoteDataDir
+ sourceldif = '%s/clu/clu_start.ldif' % remote.data
</script>
<!--- Test Case information
@@ -86,7 +86,7 @@
{
'sourceLdif' : sourceldif ,
'changesLdif' : '%s/clu/ldifmodify_checkbehavior.ldif' \
- % logsRemoteDataDir ,
+ % remote.data ,
'targetLdif' : '%s/ldifmodify.out' % DIRECTORY_INSTANCE_DIR
}
</call>
@@ -94,7 +94,7 @@
<call function="'LdifDiffWithScript'">
{
'sourceLdif' : '%s/ldifmodify.out' % DIRECTORY_INSTANCE_DIR ,
- 'targetLdif' : '%s/clu/ldifmodify.ref' % logsRemoteDataDir ,
+ 'targetLdif' : '%s/clu/ldifmodify.ref' % remote.data ,
'outputLdif' : '%s/ldifmodify.diff' % DIRECTORY_INSTANCE_DIR
}
</call>
@@ -141,7 +141,7 @@
{
'sourceLdif' : sourceldif ,
'changesLdif' : '%s/clu/ldifmodify_moddn.ldif' \
- % logsRemoteDataDir ,
+ % remote.data ,
'targetLdif' : '%s/ldifmodify_moddn.out' \
% DIRECTORY_INSTANCE_DIR ,
'expectedRC' : 1
@@ -197,7 +197,7 @@
{
'sourceLdif' : sourceldif ,
'changesLdif' : '%s/clu/ldifmodify_concurrente.ldif' \
- % logsRemoteDataDir ,
+ % remote.data ,
'targetLdif' : '%s/ldifmodify_concurrente.out' \
% DIRECTORY_INSTANCE_DIR ,
'expectedRC' : 1
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml
index 1399ae7..354bee9 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml
@@ -55,9 +55,9 @@
<!--- Define default value for basedn, dsfilename, filter files -->
<script>
basedn = 'ou=ldapsearch,o=clu tests,dc=example,dc=com'
- dsfilename = '%s/clu/clu_start.ldif' % logsRemoteDataDir
- filterfile = '%s/clu/filters.ldif' % logsRemoteDataDir
- mfilterfile = '%s/clu/multiple_filters.ldif' % logsRemoteDataDir
+ dsfilename = '%s/clu/clu_start.ldif' % remote.data
+ filterfile = '%s/clu/filters.ldif' % remote.data
+ mfilterfile = '%s/clu/multiple_filters.ldif' % remote.data
</script>
<!--- Test Case information
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml
index 5a85f4e..fe0984b 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml
@@ -54,7 +54,7 @@
<!--- Define default value for template -->
<script>
- template = '%s/clu/make-ldif_template.ref' % logsRemoteDataDir
+ template = '%s/clu/make-ldif_template.ref' % remote.data
</script>
<!--- Test Case information
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml
index c8c897b..39f6774 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml
@@ -54,7 +54,7 @@
<!--- Define default value for template -->
<script>
- task = '%s/clu/disconnect.ldif' % logsRemoteDataDir
+ task = '%s/clu/disconnect.ldif' % remote.data
</script>
<!--- Test Case information
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_setup.xml
index 492e7b7..1424cc7 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_setup.xml
@@ -111,7 +111,7 @@
<call function="'importLdif'">
{
- 'ldifFile' : '%s/clu/clu_start.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/clu/clu_start.ldif' % remote.data
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/controls/core_ctrls_assertion.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/controls/core_ctrls_assertion.xml
index d20dbf7..54ba6bf 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/controls/core_ctrls_assertion.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/controls/core_ctrls_assertion.xml
@@ -159,7 +159,7 @@
<call function="'testCase_Preamble'"/>
<script>
ldifFile = '%s/core/ldifs/ctrls_assertion_add_aci.ldif'\
- % logsRemoteDataDir
+ % remote.data
</script>
<message>
'++ add aci for user.1 to be able to use assertion control'
@@ -272,7 +272,7 @@
<call function="'testCase_Preamble'"/>
<script>
ldifFile='%s/core/ldifs/ctrls_assertion_delete_aci.ldif'\
- % logsRemoteDataDir
+ % remote.data
</script>
<message>
'++ Delete aci which allow user.1 to use assertion control'
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/controls/core_ctrls_matched_values.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/controls/core_ctrls_matched_values.xml
index a7eb24e..e09f911 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/controls/core_ctrls_matched_values.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/controls/core_ctrls_matched_values.xml
@@ -213,7 +213,7 @@
<call function="'testCase_Preamble'"/>
<script>
ldifFile = '%s/core/ldifs/ctrls_matched_values_add_aci.ldif'\
- % logsRemoteDataDir
+ % remote.data
</script>
<message>
'++ add aci for user.1 to be able to use assertion control'
@@ -397,7 +397,7 @@
<call function="'testCase_Preamble'"/>
<script>
ldifFile='%s/core/ldifs/ctrls_matched_values_delete_aci.ldif'\
- % logsRemoteDataDir
+ % remote.data
</script>
<message>
'++ Delete aci which allow user to use matched values control'
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml
index 02ae6d6..328f2c0 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml
@@ -106,7 +106,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'entryToBeAdded' : '%s/core/ldifs/control1.ldif' %
- logsRemoteDataDir }
+ remote.data }
</call>
@@ -193,7 +193,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'entryToBeAdded' : '%s/core/ldifs/control2.ldif'
- % logsRemoteDataDir }
+ % remote.data }
</call>
<script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml
index 30a4881..63425d0 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml
@@ -28,8 +28,17 @@
<stax>
<defaultcall function="main_core" />
<function name="main_core">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<block name="'core'">
<sequence>
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
<script>
CurrentTestPath['group']='core'
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
index 878ed70..9eeaa49 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
@@ -192,7 +192,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit3.ldif' % logsRemoteDataDir
+ 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit3.ldif' % remote.data
}
</call>
<call function="'checktestRC'">
@@ -260,7 +260,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit4.ldif' % logsRemoteDataDir
+ 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit4.ldif' % remote.data
}
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
index 17e5e14..993b5bb 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
@@ -212,7 +212,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit3.ldif' % logsRemoteDataDir
+ 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit3.ldif' % remote.data
}
</call>
<call function="'checktestRC'">
@@ -280,7 +280,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit4.ldif' % logsRemoteDataDir
+ 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit4.ldif' % remote.data
}
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml
index 1b98e04..70dd842 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml
@@ -81,7 +81,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'entryToBeAdded' : '%s/core/ldifs/core_start.ldif'
- % logsRemoteDataDir,
+ % remote.data,
'verbose' : False
}
</call>
@@ -95,7 +95,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'entryToBeAdded' : '%s/core/ldifs/core_test_1K.ldif'
- % logsRemoteDataDir,
+ % remote.data,
'verbose' : False
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig.xml b/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig.xml
index 13ebf9a..eff9d3b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig.xml
@@ -30,13 +30,21 @@
<defaultcall function="main_dsconfig"/>
<function name="main_dsconfig">
-
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'dsconfig'">
<sequence>
-
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
+
<script>
CurrentTestPath['group']='dsconfig'
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/dsml/dsml.xml b/opendj-sdk/opends/tests/functional-tests/testcases/dsml/dsml.xml
index b5b6ff9..c2ae885 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/dsml/dsml.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/dsml/dsml.xml
@@ -28,8 +28,18 @@
<stax>
<defaultcall function="main_dsml" />
<function name="main_dsml">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
+
<block name="'dsml'">
<sequence>
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
<script>
CurrentTestPath['group']='dsml'
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/dsml/dsml_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/dsml/dsml_setup.xml
index 970cb05..5ac7332 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/dsml/dsml_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/dsml/dsml_setup.xml
@@ -189,7 +189,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : 'import_%s' % dsmlBaseDNs.get(baseDN)[1],
- 'ldifFile' : '%s/dsml/ldif-files/%s' % (logsRemoteDataDir,dsmlBaseDNs.get(baseDN)[0]),
+ 'ldifFile' : '%s/dsml/ldif-files/%s' % (remote.data,dsmlBaseDNs.get(baseDN)[0]),
'backEnd' : '%s' % dsmlBaseDNs.get(baseDN)[1]
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/dsml/dsml_test.xml b/opendj-sdk/opends/tests/functional-tests/testcases/dsml/dsml_test.xml
index 1aa7d8a..cbf45ac 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/dsml/dsml_test.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/dsml/dsml_test.xml
@@ -86,7 +86,10 @@
familyList=STAFResult
# The subversion folder could be present, if so remove it
if familyList.count != 0:
- familyList.remove('.svn')
+ try:
+ familyList.remove('.svn')
+ except ValueError:
+ print "List element .svn does not exist"
import re
import base64
runFileRE = re.compile( 'dat$')
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_setup.xml
index 747d20f..69dd80c 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_setup.xml
@@ -78,7 +78,7 @@
'------ Load LDIF : groups.ldif'
</message>
<call function="'importLdif'">
- { 'ldifFile' : '%s/groups/groups.ldif' % logsRemoteDataDir }
+ { 'ldifFile' : '%s/groups/groups.ldif' % remote.data }
</call>
<call function="'checkRC'">
{ 'returncode' : RC ,
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/groups/groups.xml b/opendj-sdk/opends/tests/functional-tests/testcases/groups/groups.xml
index b74fc5f..18ec8f3 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/groups/groups.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/groups/groups.xml
@@ -30,16 +30,24 @@
<defaultcall function="main_groups"/>
<function name="main_groups">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'groups'">
<sequence>
-
+
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
+
<script>
- CurrentTestPath={}
- envAlreadyLoaded='true'
CurrentTestPath['group']='groups'
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n.xml b/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n.xml
index 2254780..9caaa46 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n.xml
@@ -30,12 +30,22 @@
<defaultcall function="main_i18n"/>
<function name="main_i18n">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'i18n'">
<sequence>
+
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
<!--
#@TestGroupName i18n
@@ -43,8 +53,6 @@
-->
<script>
- CurrentTestPath={}
- envAlreadyLoaded='true'
CurrentTestPath['group']='i18n'
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml b/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml
index e2bcffb..a43180b 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml
@@ -76,7 +76,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'extraParams' : '-i 8859-1',
- 'entryToBeAdded' : '%s/i18n/8-bit/base64/European.base64.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/i18n/8-bit/base64/European.base64.ldif' % remote.data ,
'expectedRC' : 0 }
</call>
@@ -105,7 +105,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'extraParams' : '-i 8859-1',
- 'entryToBeAdded' : '%s/i18n/8-bit/base64/LDAPcmds_tp1_Add.base64.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/i18n/8-bit/base64/LDAPcmds_tp1_Add.base64.ldif' % remote.data ,
'expectedRC' : 0 }
</call>
@@ -114,7 +114,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsFilename' : '%s/i18n/8-bit/LDAPcmds_tp1_Delete.8859-1.ldif' % logsRemoteDataDir ,
+ 'dsFilename' : '%s/i18n/8-bit/LDAPcmds_tp1_Delete.8859-1.ldif' % remote.data ,
'expectedRC' : 0 }
</call>
@@ -144,7 +144,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'extraParams' : '-i 8859-1',
- 'entryToBeAdded' : '%s/i18n/8-bit/base64/LDAPcmds_tp2_Add.base64.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/i18n/8-bit/base64/LDAPcmds_tp2_Add.base64.ldif' % remote.data ,
'expectedRC' : 0 }
</call>
@@ -153,7 +153,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsFilename' : '%s/i18n/8-bit/base64/LDAPcmds_tp2_Modify.base64.ldif' % logsRemoteDataDir ,
+ 'dsFilename' : '%s/i18n/8-bit/base64/LDAPcmds_tp2_Modify.base64.ldif' % remote.data ,
'expectedRC' : 0 }
</call>
@@ -183,7 +183,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'extraParams' : '-i 8859-1',
- 'entryToBeAdded' : '%s/i18n/8-bit/base64/LDAPcmds_tp3_Add.base64.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/i18n/8-bit/base64/LDAPcmds_tp3_Add.base64.ldif' % remote.data ,
'expectedRC' : 0 }
</call>
@@ -192,7 +192,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsFilename' : '%s/i18n/8-bit/base64/LDAPcmds_tp3_Modify.base64.ldif' % logsRemoteDataDir ,
+ 'dsFilename' : '%s/i18n/8-bit/base64/LDAPcmds_tp3_Modify.base64.ldif' % remote.data ,
'expectedRC' : 0 }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml b/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml
index 06bbe50..100ac00 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml
@@ -55,7 +55,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/i18n/8-bit/base64/I18n_Authentication_Test.base64.ldif' \
- % logsRemoteDataDir ,
+ % remote.data ,
'expectedRC' : 0
}
</call>
@@ -150,7 +150,7 @@
'dsInstanceDn' : 'cn=Bill, ou=Authentication Tests, o=��ndide R�iz' ,
'dsInstancePswd' : 'sir��' ,
'entryToBeAdded' : '%s/i18n/8-bit/base64/Authentication.tp2.base64.ldif' \
- % logsRemoteDataDir ,
+ % remote.data ,
'expectedRC' : 0
}
</call>
@@ -192,7 +192,7 @@
'dsInstanceDn' : 'cn=��ndide, ou=Authentication Tests, o=��ndide R�iz' ,
'dsInstancePswd' : 'siroe' ,
'entryToBeAdded' : '%s/i18n/8-bit/base64/Authentication.tp3.add.base64.ldif' \
- % logsRemoteDataDir ,
+ % remote.data ,
'expectedRC' : 0
}
</call>
@@ -208,7 +208,7 @@
'dsInstanceDn' : 'cn=��ndide, ou=Authentication Tests, o=��ndide R�iz' ,
'dsInstancePswd' : 'siroe' ,
'entryToBeModified': '%s/i18n/8-bit/base64/Authentication.tp3.mod.base64.ldif' \
- % logsRemoteDataDir ,
+ % remote.data ,
'expectedRC' : 0
}
</call>
@@ -224,7 +224,7 @@
'dsInstanceDn' : 'cn=��ndide, ou=Authentication Tests, o=��ndide R�iz' ,
'dsInstancePswd' : 'siroe' ,
'entryToBeModified': '%s/i18n/8-bit/base64/Authentication.tp3.del.base64.ldif' \
- % logsRemoteDataDir ,
+ % remote.data ,
'expectedRC' : 50
}
</call>
@@ -266,7 +266,7 @@
'dsInstanceDn' : 'cn=R�s��e, ou=Authentication Tests, o=��ndide R�iz' ,
'dsInstancePswd' : 'sir��' ,
'entryToBeModified': '%s/i18n/8-bit/base64/Authentication.tp4.base64.ldif' \
- % logsRemoteDataDir ,
+ % remote.data ,
'expectedRC' : 0
}
</call>
@@ -312,7 +312,7 @@
'dsInstanceDn' : 'cn=R�s��e, ou=Authentication Tests, o=��ndide R�iz' ,
'dsInstancePswd' : 'sir��' ,
'entryToBeModified': '%s/i18n/8-bit/base64/Authentication.tp5.base64.ldif' \
- % logsRemoteDataDir ,
+ % remote.data ,
'expectedRC' : 50
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml b/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml
index a8f3522..041de3f 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml
@@ -54,7 +54,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'extraParams' : '-i 8859-1',
- 'entryToBeAdded' : '%s/i18n/8-bit/base64/Data_Comparison.tp1.base64.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/i18n/8-bit/base64/Data_Comparison.tp1.base64.ldif' % remote.data ,
'expectedRC' : 0 }
</call>
@@ -104,7 +104,7 @@
</call>
<script>
- RefFile = '%s/i18n/8-bit/base64/Data_Comparison.Ref.base64.ldif' % logsRemoteDataDir
+ RefFile = '%s/i18n/8-bit/base64/Data_Comparison.Ref.base64.ldif' % remote.data
</script>
<call function="'LdifDiffWithScript-new'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml b/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml
index 042aa87..9dc6589 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml
@@ -81,7 +81,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/i18n/8-bit/Schema_extension.8859-1.ldif' \
- % logsRemoteDataDir ,
+ % remote.data ,
'expectedRC' : 21
}
</call>
@@ -112,7 +112,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/i18n/8-bit/UTF-8/Schema_extension.UTF-8.ldif' \
- % logsRemoteDataDir ,
+ % remote.data ,
'expectedRC' : 21
}
</call>
@@ -147,7 +147,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/i18n/8-bit/base64/Schema_extension.base64.ldif' \
- % logsRemoteDataDir ,
+ % remote.data ,
'expectedRC' : 0
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml b/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml
index 8c8db88..9fa54c0 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml
@@ -28,8 +28,17 @@
<stax>
<defaultcall function="main_indexes" />
<function name="main_indexes">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<block name="'indexes'">
<sequence>
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
<script>
CurrentTestPath={'group':'indexes','suite':'indexes'}
envAlreadyLoaded='true'
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/logging/logging.xml b/opendj-sdk/opends/tests/functional-tests/testcases/logging/logging.xml
index 0321ce5..47da17c 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/logging/logging.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/logging/logging.xml
@@ -36,12 +36,21 @@
<stax>
<defaultcall function="main_logging"/>
<function name="main_logging">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'logging'">
<sequence>
- <script>
- CurrentTestPath['group']='logging'
- </script>
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
+ <script>
+ CurrentTestPath['group']='logging'
+ </script>
<call function="'testGroup_Preamble'" />
<!-- 'setup','rotation','retention','writer','properties','retention_properties','rotation_properties','cleanup'-->
<iterate var="_test" in="['setup','rotation','retention','writer','properties','retention_properties','rotation_properties','cleanup']" >
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/monitoring/monitoring.xml b/opendj-sdk/opends/tests/functional-tests/testcases/monitoring/monitoring.xml
index 831f548..5d3342a 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/monitoring/monitoring.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/monitoring/monitoring.xml
@@ -35,9 +35,18 @@
<stax>
<defaultcall function="main_monitoring"/>
<function name="main_monitoring">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'monitoring'">
<sequence>
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
<script>
CurrentTestPath['group']='monitoring'
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/plugins/plugins.xml b/opendj-sdk/opends/tests/functional-tests/testcases/plugins/plugins.xml
index 9deeae3..4aaffa0 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/plugins/plugins.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/plugins/plugins.xml
@@ -35,9 +35,18 @@
<stax>
<defaultcall function="main_plugins"/>
<function name="main_plugins">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'plugins'">
<sequence>
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
<script>
CurrentTestPath['group']='plugins'
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges.xml
index 832d91d..c6de689 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges.xml
@@ -30,12 +30,21 @@
<defaultcall function="main_privileges"/>
<function name="main_privileges">
-
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'privileges'">
<sequence>
+
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
<script>
CurrentTestPath['group']='privileges'
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml
index e216944..4aaf3d5 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml
@@ -95,7 +95,7 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'taskID' : '3' ,
- 'backupDir' : '%s/privileges/' % logsRemoteDataDir ,
+ 'backupDir' : '%s/privileges/' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -125,7 +125,7 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'taskID' : '3' ,
- 'backupDir' : '%s/privileges/' % logsRemoteDataDir ,
+ 'backupDir' : '%s/privileges/' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -159,7 +159,7 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'taskID' : '3' ,
- 'backupDir' : '%s/privileges/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/' % remote.data
}
</call>
@@ -203,7 +203,7 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'taskID' : '3.1' ,
- 'backupDir' : '%s/privileges/' % logsRemoteDataDir ,
+ 'backupDir' : '%s/privileges/' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -247,7 +247,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'taskID' : '3.2' ,
- 'backupDir' : '%s/privileges/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/' % remote.data
}
</call>
@@ -276,7 +276,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'taskID' : '3.3' ,
- 'backupDir' : '%s/privileges/' % logsRemoteDataDir ,
+ 'backupDir' : '%s/privileges/' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -306,7 +306,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'taskID' : '3.4' ,
- 'backupDir' : '%s/privileges/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/' % remote.data
}
</call>
@@ -348,7 +348,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
- 'entryToBeAdded' : '%s/privileges/add_new_root_user.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/privileges/add_new_root_user.ldif' % remote.data }
</call>
<message>
@@ -361,7 +361,7 @@
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : '3.5' ,
- 'backupDir' : '%s/privileges/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/' % remote.data
}
</call>
@@ -390,7 +390,7 @@
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : '3.6' ,
- 'backupDir' : '%s/privileges/' % logsRemoteDataDir ,
+ 'backupDir' : '%s/privileges/' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -420,7 +420,7 @@
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : '3.7' ,
- 'backupDir' : '%s/privileges/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/' % remote.data
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
index 5f10ab4..0e217eb 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
@@ -1392,7 +1392,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
- 'entryToBeAdded' : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/privileges/add_entry_with_new_objclass.ldif' % remote.data ,
'expectedRC' : 65
}
</call>
@@ -1422,7 +1422,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/privileges/addmozobj.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1452,7 +1452,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/privileges/addmozobj.ldif' % remote.data ,
'expectedRC' : 0
}
</call>
@@ -1466,7 +1466,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
- 'entryToBeAdded' : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/privileges/add_entry_with_new_objclass.ldif' % remote.data ,
'expectedRC' : 0
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml
index f325946..672fd72 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml
@@ -97,7 +97,7 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'taskID' : '1' ,
- 'ldifFile' : '%s/privileges/export_task_out.ldif' % logsRemoteDataDir ,
+ 'ldifFile' : '%s/privileges/export_task_out.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -127,7 +127,7 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'taskID' : '1' ,
- 'ldifFile' : '%s/privileges/export_task_out.ldif' % logsRemoteDataDir ,
+ 'ldifFile' : '%s/privileges/export_task_out.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -161,7 +161,7 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'taskID' : '1' ,
- 'ldifFile' : '%s/privileges/export_task_out.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/export_task_out.ldif' % remote.data
}
</call>
@@ -205,7 +205,7 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'taskID' : '1.1' ,
- 'ldifFile' : '%s/privileges/export_task_out2.ldif' % logsRemoteDataDir ,
+ 'ldifFile' : '%s/privileges/export_task_out2.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -249,7 +249,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'taskID' : '1.1' ,
- 'ldifFile' : '%s/privileges/export_task_out3.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/export_task_out3.ldif' % remote.data
}
</call>
@@ -278,7 +278,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'taskID' : '1.2' ,
- 'ldifFile' : '%s/privileges/export_task_out4.ldif' % logsRemoteDataDir ,
+ 'ldifFile' : '%s/privileges/export_task_out4.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -308,7 +308,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'taskID' : '1.3' ,
- 'ldifFile' : '%s/privileges/export_task_out5.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/export_task_out5.ldif' % remote.data
}
</call>
@@ -350,7 +350,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
- 'entryToBeAdded' : '%s/privileges/add_new_root_user.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/privileges/add_new_root_user.ldif' % remote.data }
</call>
<message>
@@ -363,7 +363,7 @@
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : '1.4' ,
- 'ldifFile' : '%s/privileges/export_task_out6.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/export_task_out6.ldif' % remote.data
}
</call>
@@ -392,7 +392,7 @@
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : '1.5' ,
- 'ldifFile' : '%s/privileges/export_task_out7.ldif' % logsRemoteDataDir ,
+ 'ldifFile' : '%s/privileges/export_task_out7.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -422,7 +422,7 @@
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : '1.6' ,
- 'ldifFile' : '%s/privileges/export_task_out8.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/export_task_out8.ldif' % remote.data
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml
index 6d58532..d8bc7f9 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml
@@ -96,7 +96,7 @@
'dsInstancePswd' : 'ACIRules',
'taskID' : STAXCurrentTestcase,
'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' \
- % logsRemoteDataDir,
+ % remote.data,
'expectedRC' : 50
}
</call>
@@ -127,7 +127,7 @@
'dsInstancePswd' : 'ACIRules',
'taskID' : STAXCurrentTestcase,
'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' \
- % logsRemoteDataDir,
+ % remote.data,
'expectedRC' : 50
}
</call>
@@ -161,7 +161,7 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' % remote.data
}
</call>
@@ -260,7 +260,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'taskID' : STAXCurrentTestcase,
'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' \
- % logsRemoteDataDir,
+ % remote.data,
'expectedRC' : 50
}
</call>
@@ -291,7 +291,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'taskID' : STAXCurrentTestcase,
'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' \
- % logsRemoteDataDir
+ % remote.data
}
</call>
@@ -358,7 +358,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/privileges/add_new_root_user.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/privileges/add_new_root_user.ldif' % remote.data }
</call>
<message>
@@ -387,7 +387,7 @@
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : STAXCurrentTestcase,
'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' \
- % logsRemoteDataDir,
+ % remote.data,
'expectedRC' : 50
}
</call>
@@ -418,7 +418,7 @@
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : STAXCurrentTestcase,
'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' \
- % logsRemoteDataDir
+ % remote.data
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
index 665ac96..6ce3cdf 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
@@ -86,7 +86,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/privileges/add_new_root_user.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/privileges/add_new_root_user.ldif' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
@@ -1390,7 +1390,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
- 'entryToBeAdded' : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/privileges/add_entry_with_new_objclass.ldif' % remote.data ,
'expectedRC' : 65
}
</call>
@@ -1419,7 +1419,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
- 'entryToBeModified' : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/privileges/addmozobj.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -1448,7 +1448,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
- 'entryToBeModified' : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/privileges/addmozobj.ldif' % remote.data }
</call>
<message>
@@ -1460,7 +1460,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
- 'entryToBeAdded' : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/privileges/add_entry_with_new_objclass.ldif' % remote.data }
</call>
<message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml
index 1affa4d..c00c634 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml
@@ -98,7 +98,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/privileges/privileges_restore_task/restore_task.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/privileges_restore_task/restore_task.ldif' % remote.data
}
</call>
@@ -112,7 +112,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'taskID' : '6' ,
- 'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/privileges_restore_task/' % remote.data
}
</call>
@@ -125,7 +125,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/privileges/privileges_restore_task/del_entry.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/privileges/privileges_restore_task/del_entry.ldif' % remote.data }
</call>
<message>
@@ -169,7 +169,7 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules',
'taskID' : '6.1',
- 'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir,
+ 'backupDir' : '%s/privileges/privileges_restore_task/' % remote.data,
'expectedRC' : 50
}
</call>
@@ -203,7 +203,7 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules',
'taskID' : '6.2',
- 'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/privileges_restore_task/' % remote.data
}
</call>
@@ -288,7 +288,7 @@
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/privileges/privileges_restore_task/restore_task.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/privileges_restore_task/restore_task.ldif' % remote.data
}
</call>
@@ -302,7 +302,7 @@
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : '6.3' ,
- 'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/privileges_restore_task/' % remote.data
}
</call>
@@ -315,7 +315,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
- 'entryToBeModified' : '%s/privileges/privileges_restore_task/del_entry.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/privileges/privileges_restore_task/del_entry.ldif' % remote.data }
</call>
<message>
@@ -359,7 +359,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : '6.4',
- 'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir,
+ 'backupDir' : '%s/privileges/privileges_restore_task/' % remote.data,
'expectedRC' : 50
}
</call>
@@ -389,7 +389,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : '6.5',
- 'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/privileges_restore_task/' % remote.data
}
</call>
@@ -459,7 +459,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
- 'entryToBeAdded' : '%s/privileges/add_new_root_user.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/privileges/add_new_root_user.ldif' % remote.data }
</call>
<message>
@@ -472,7 +472,7 @@
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/privileges/privileges_restore_task/restore_task.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/privileges_restore_task/restore_task.ldif' % remote.data
}
</call>
@@ -486,7 +486,7 @@
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : '6.6' ,
- 'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/privileges_restore_task/' % remote.data
}
</call>
@@ -499,7 +499,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
- 'entryToBeModified' : '%s/privileges/privileges_restore_task/del_entry.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/privileges/privileges_restore_task/del_entry.ldif' % remote.data }
</call>
<message>
@@ -543,7 +543,7 @@
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : '6.7',
- 'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir,
+ 'backupDir' : '%s/privileges/privileges_restore_task/' % remote.data,
'expectedRC' : 50
}
</call>
@@ -573,7 +573,7 @@
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : '6.8',
- 'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/privileges_restore_task/' % remote.data
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_setup.xml
index dbfdd9e..97b9413 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_setup.xml
@@ -105,7 +105,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/privileges/privileges_startup.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/privileges/privileges_startup.ldif' % remote.data }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
index d43e701..65c2907 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
@@ -47,7 +47,7 @@
<!--- Define default value for ldifFile1, ldifFile2 and DNToMod -->
<script>
- logPath = logsRemoteDataDir
+ logPath = remote.data
privPath = '%s/privileges/privileges_unindexed_searches' % logPath
ldifFile1 = '%s/50Entries.ldif' % privPath
ldifFile2 = '%s/privileges/add_new_root_user.ldif' % logPath
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_users.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_users.xml
index 38a7e97..ad7cf07 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_users.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_users.xml
@@ -2600,7 +2600,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/privileges/addmozobj.ldif' % remote.data ,
'expectedRC' : 50
}
</call>
@@ -2614,7 +2614,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/privileges/add_entry_with_new_objclass.ldif' % remote.data ,
'expectedRC' : 65
}
</call>
@@ -2643,7 +2643,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/privileges/addmozobj.ldif' % remote.data }
</call>
<message>
@@ -2678,7 +2678,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/privileges/add_entry_with_new_objclass.ldif' % remote.data }
</call>
<message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml b/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
index c51c892..bd6bedf 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
@@ -53,7 +53,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/quickstart/quickstart.ldif' % logsRemoteDataDir
+ 'entryToBeAdded' : '%s/quickstart/quickstart.ldif' % remote.data
}
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/basic/basic.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/basic/basic.xml
index d7157c8..c05598d 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/basic/basic.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/basic/basic.xml
@@ -495,7 +495,7 @@
<script>
filename = 'replication_mod_delete.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
+ filePath = '%s/%s' % (local.data,filename)
dn = 'uid=smason, ou=People,%s' % synchroSuffix
modif = 'delete'
attrType = 'roomNumber'
@@ -507,7 +507,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
'Copy %s file from %s to %s' \
- % (filename,logsTestDataDir,clientDataDir)
+ % (filename,local.data,clientDataDir)
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
@@ -1375,8 +1375,8 @@
<script>
filename = 'replication_mod_add_binary.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
- binaryFilePath = '%s/photo1.uu' % testsGroupDir
+ filePath = '%s/%s' % (local.data,filename)
+ binaryFilePath = '%s/replication/photo1.uu' % source.data
dn = 'uid=hmiller, ou=People,%s' % synchroSuffix
modif = 'add'
attrType = 'jpegPhoto'
@@ -1387,7 +1387,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
'Copy %s file from %s to %s' \
- % (filename,logsTestDataDir,clientDataDir)
+ % (filename,local.data,clientDataDir)
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
@@ -1473,8 +1473,8 @@
<script>
filename = 'replication_mod_replace_binary.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
- binaryFilePath = '%s/photo2.uu' % testsGroupDir
+ filePath = '%s/%s' % (local.data,filename)
+ binaryFilePath = '%s/replication/photo2.uu' % source.data
dn = 'uid=hmiller, ou=People,%s' % synchroSuffix
modif = 'replace'
attrType = 'jpegPhoto'
@@ -1485,7 +1485,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
'Copy %s file from %s to %s' \
- % (filename,logsTestDataDir,clientDataDir)
+ % (filename,local.data,clientDataDir)
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
@@ -1572,7 +1572,7 @@
<script>
filename = 'replication_mod_delete_binary.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
+ filePath = '%s/%s' % (local.data,filename)
dn = 'uid=hmiller, ou=People,%s' % synchroSuffix
modif = 'delete'
attrType = 'jpegPhoto'
@@ -1584,7 +1584,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
'Copy %s file from %s to %s' \
- % (filename,logsTestDataDir,clientDataDir)
+ % (filename,local.data,clientDataDir)
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
@@ -1668,7 +1668,7 @@
<script>
filename = 'replication_modrdn.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
+ filePath = '%s/%s' % (local.data,filename)
dn = 'uid=kvaughan, ou=People,%s' % synchroSuffix
newrdn = 'uid=kvaughan2'
newsuperior = None
@@ -1680,7 +1680,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
'Copy %s file from %s to %s' \
- % (filename,logsTestDataDir,clientDataDir)
+ % (filename,local.data,clientDataDir)
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
@@ -1775,7 +1775,7 @@
<script>
filename = 'replication_modrdn_preserve.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
+ filePath = '%s/%s' % (local.data,filename)
dn = 'uid=jwallace, ou=People,%s' % synchroSuffix
newrdn = 'uid=igueye'
newsuperior = None
@@ -1787,7 +1787,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
'Copy %s file from %s to %s' \
- % (filename,logsTestDataDir,clientDataDir)
+ % (filename,local.data,clientDataDir)
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
@@ -1890,7 +1890,7 @@
<script>
filename = 'replication_moddn.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
+ filePath = '%s/%s' % (local.data,filename)
dn = 'ou=People,%s' % synchroSuffix
newrdn = 'ou=Special People'
newsuperior = 'ou=Special Users,%s' % synchroSuffix
@@ -1902,7 +1902,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
'Copy %s file from %s to %s' \
- % (filename,logsTestDataDir,clientDataDir)
+ % (filename,local.data,clientDataDir)
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/basic/replication_basic_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/basic/replication_basic_setup.xml
index cbdcb87..488af6e 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/basic/replication_basic_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/basic/replication_basic_setup.xml
@@ -50,13 +50,13 @@
<script>
filename = 'replication_add_root_suffix.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
+ filePath = '%s/%s' % (local.data,filename)
write_replication_add_root_suffix_ldif_file(filePath, synchroSuffix)
</script>
<!-- Copy the replication_add_root_suffix ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,logsTestDataDir,clientDataDir)
+ 'Copy %s file from %s to %s' % (filename,local.data,clientDataDir)
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
@@ -66,13 +66,13 @@
<script>
filename = 'replication_add_single.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
+ filePath = '%s/%s' % (local.data,filename)
write_replication_add_single_ldif_file(filePath, synchroSuffix)
</script>
<!-- Copy the replication_add_single ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,logsTestDataDir,clientDataDir)
+ 'Copy %s file from %s to %s' % (filename,local.data,clientDataDir)
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
@@ -82,13 +82,13 @@
<script>
filename = 'replication_add_multiple.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
+ filePath = '%s/%s' % (local.data,filename)
write_replication_add_multiple_ldif_file(filePath, synchroSuffix)
</script>
<!-- Copy the replication_add_multiple ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,logsTestDataDir,clientDataDir)
+ 'Copy %s file from %s to %s' % (filename,local.data,clientDataDir)
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
@@ -98,14 +98,14 @@
<script>
filename = 'replication_mod.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
+ filePath = '%s/%s' % (local.data,filename)
write_replication_mod_ldif_file(filePath, entryDn, mod_type, attr_type,
attr_value)
</script>
<!-- Copy the replication_mod ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,logsTestDataDir,clientDataDir)
+ 'Copy %s file from %s to %s' % (filename,local.data,clientDataDir)
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
index feff2c6..ed9437f 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
@@ -139,7 +139,7 @@
'srcfolder' : '%s/replication/master_backup' \
% masterDataDir,
'destfolder' : '%s/%s/replication/master_backup' \
- % (consumer.getDir(),relativeDataDir),
+ % (consumer.getDir(),remote.reldatadir),
'extension' : '*'
}
</call>
@@ -152,7 +152,7 @@
{ 'location' : consumer.getHostname(),
'dsPath' : '%s/%s' % (consumer.getDir(), OPENDSNAME),
'backupDir' : '%s/%s/replication/master_backup' \
- % (consumer.getDir(),relativeDataDir)
+ % (consumer.getDir(),remote.reldatadir)
}
</call>
</sequence>
@@ -320,7 +320,7 @@
'srcfolder' : '%s/replication/master_backup_online' \
% masterDataDir,
'destfolder' : '%s/%s/replication/master_backup_online' \
- % (consumer.getDir(),relativeDataDir),
+ % (consumer.getDir(),remote.reldatadir),
'extension' : '*'
}
</call>
@@ -338,7 +338,7 @@
'dsInstancePswd' : consumer.getRootPwd(),
'taskID' : 'restore task',
'backupDir' : '%s/%s/replication/master_backup_online' \
- % (consumer.getDir(),relativeDataDir)
+ % (consumer.getDir(),remote.reldatadir)
}
</call>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/changelog/changelog.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/changelog/changelog.xml
index da87a29..ea877ed 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/changelog/changelog.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/changelog/changelog.xml
@@ -280,7 +280,7 @@
<script>
serverPath = '%s/%s' % (server.getDir(), OPENDSNAME)
- serverDataDir = '%s/%s' % (server.getDir(),relativeDataDir)
+ serverDataDir = '%s/%s' % (server.getDir(),remote.reldatadir)
exportedChangelog = \
'%s/replication/changelog_export_online.ldif' \
% serverDataDir
@@ -403,7 +403,7 @@
<sequence>
<script>
serverPath = '%s/%s' % (server.getDir(), OPENDSNAME)
- serverDataDir = '%s/%s' % (server.getDir(),relativeDataDir)
+ serverDataDir = '%s/%s' % (server.getDir(),remote.reldatadir)
changelogBackupDir = '%s/replication/changelog_backup' \
% serverDataDir
</script>
@@ -473,7 +473,7 @@
<script>
serverPath = '%s/%s' % (server.getDir(), OPENDSNAME)
- serverDataDir = '%s/%s' % (server.getDir(),relativeDataDir)
+ serverDataDir = '%s/%s' % (server.getDir(),remote.reldatadir)
changelogBackupDir = '%s/replication/changelog_backup' \
% serverDataDir
</script>
@@ -707,7 +707,7 @@
<sequence>
<script>
serverPath = '%s/%s' % (server.getDir(), OPENDSNAME)
- serverDataDir = '%s/%s' % (server.getDir(),relativeDataDir)
+ serverDataDir = '%s/%s' % (server.getDir(),remote.reldatadir)
changelogBackupDir = \
'%s/replication/changelog_backup_online' % serverDataDir
</script>
@@ -771,7 +771,7 @@
<script>
serverPath = '%s/%s' % (server.getDir(), OPENDSNAME)
- serverDataDir = '%s/%s' % (server.getDir(),relativeDataDir)
+ serverDataDir = '%s/%s' % (server.getDir(),remote.reldatadir)
changelogBackupDir = \
'%s/replication/changelog_backup_online' % serverDataDir
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/conflict/conflict.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/conflict/conflict.xml
index 10905b3..8ef8448 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/conflict/conflict.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/conflict/conflict.xml
@@ -77,7 +77,7 @@
server2Host = server2.getHostname()
server1Path = '%s/%s' % (server1.getDir(), OPENDSNAME)
server2Path = '%s/%s' % (server2.getDir(), OPENDSNAME)
- server2DataDir = '%s/%s' % (server2.getDir(),relativeDataDir)
+ server2DataDir = '%s/%s' % (server2.getDir(),remote.reldatadir)
server1name = '%s:%s' % (server1Host, server1.getPort())
server2name = '%s:%s' % (server2Host, server2.getPort())
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/encryption/encryption.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/encryption/encryption.xml
index c8e3dca..2d12c31 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/encryption/encryption.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/encryption/encryption.xml
@@ -270,8 +270,8 @@
<script>
filename = 'replication_mod_add_binary.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
- binaryFilePath = '%s/photo1.uu' % testsGroupDir
+ filePath = '%s/%s' % (local.data,filename)
+ binaryFilePath = '%s/replication/photo1.uu' % source.data
dn = 'uid=hmiller, ou=People,%s' % synchroSuffix
modif = 'add'
attrType = 'jpegPhoto'
@@ -281,7 +281,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,logsTestDataDir,
+ 'Copy %s file from %s to %s' % (filename,local.data,
clientDataDir)
</message>
<call function="'copyFile'">
@@ -368,8 +368,8 @@
<script>
filename = 'replication_mod_replace_binary.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
- binaryFilePath = '%s/photo2.uu' % testsGroupDir
+ filePath = '%s/%s' % (local.data,filename)
+ binaryFilePath = '%s/replication/photo2.uu' % source.data
dn = 'uid=hmiller, ou=People,%s' % synchroSuffix
modif = 'replace'
attrType = 'jpegPhoto'
@@ -380,7 +380,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,logsTestDataDir,
+ 'Copy %s file from %s to %s' % (filename,local.data,
clientDataDir)
</message>
<call function="'copyFile'">
@@ -469,7 +469,7 @@
<script>
filename = 'replication_mod_delete_binary.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
+ filePath = '%s/%s' % (local.data,filename)
dn = 'uid=hmiller, ou=People,%s' % synchroSuffix
modif = 'delete'
attrType = 'jpegPhoto'
@@ -480,7 +480,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,logsTestDataDir,
+ 'Copy %s file from %s to %s' % (filename,local.data,
clientDataDir)
</message>
<call function="'copyFile'">
@@ -562,7 +562,7 @@
<script>
filename = 'replication_modrdn.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
+ filePath = '%s/%s' % (local.data,filename)
dn = 'uid=kvaughan, ou=People,%s' % synchroSuffix
newrdn = 'uid=kvaughan2'
newsuperior = None
@@ -573,7 +573,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,logsTestDataDir,
+ 'Copy %s file from %s to %s' % (filename,local.data,
clientDataDir)
</message>
<call function="'copyFile'">
@@ -667,7 +667,7 @@
<script>
filename = 'replication_modrdn_preserve.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
+ filePath = '%s/%s' % (local.data,filename)
dn = 'uid=jwallace, ou=People,%s' % synchroSuffix
newrdn = 'uid=igueye'
newsuperior = None
@@ -678,7 +678,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,logsTestDataDir,
+ 'Copy %s file from %s to %s' % (filename,local.data,
clientDataDir)
</message>
<call function="'copyFile'">
@@ -780,7 +780,7 @@
<script>
filename = 'replication_moddn.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
+ filePath = '%s/%s' % (local.data,filename)
dn = 'ou=People,%s' % synchroSuffix
newrdn = 'ou=Special People'
newsuperior = 'ou=Special Users,%s' % synchroSuffix
@@ -791,7 +791,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,logsTestDataDir,
+ 'Copy %s file from %s to %s' % (filename,local.data,
clientDataDir)
</message>
<call function="'copyFile'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
index cd06f15..56d9ffa 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
@@ -149,7 +149,7 @@
'srcfile' : '%s/replication/master_export.ldif' \
% masterDataDir,
'destfile' : '%s/%s/replication/master_export.ldif' \
- % (consumer.getDir(),relativeDataDir)
+ % (consumer.getDir(),remote.reldatadir)
}
</call>
@@ -162,7 +162,7 @@
'dsPath' : '%s/%s' % (consumer.getDir(), OPENDSNAME),
'dsBackEnd' : 'userRoot',
'dsLdifFile' : '%s/%s/replication/master_export.ldif' \
- % (consumer.getDir(),relativeDataDir)
+ % (consumer.getDir(),remote.reldatadir)
}
</call>
</sequence>
@@ -340,8 +340,8 @@
<script>
filename = 'master_export_online_ldif'
destinationFile = '%s/%s/replication/%s'\
- % (consumer.getDir(),relativeDataDir,
- filename)
+ % (consumer.getDir(),remote.reldatadir,
+ filename)
</script>
<call function="'copyFile'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/replication.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/replication.xml
index 655ac55..6ac1e35 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/replication.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/replication.xml
@@ -28,19 +28,39 @@
<stax>
<defaultcall function="main_replication"/>
<function name="main_replication">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'replication'">
<sequence>
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
<script>
- CurrentTestPath={}
- envAlreadyLoaded='true'
CurrentTestPath['group']='replication'
</script>
<call function="'testGroup_Preamble'"/>
- <iterate var="_test"
- in="['totalupdate','binarycopy','ldifimport',
- 'resynchronization','basic','schema','failover',
- 'encryption','changelog', 'conflict']">
+
+ <!-- List of replication test suites to run -->
+ <script>
+ testList = []
+# testList.append('totalupdate')
+# testList.append('binarycopy')
+# testList.append('ldifimport')
+# testList.append('resynchronization')
+# testList.append('basic')
+# testList.append('schema')
+# testList.append('failover')
+ testList.append('encryption')
+# testList.append('changelog')
+# testList.append('conflict')
+ </script>
+
+ <iterate var="_test" in="testList" >
<sequence>
<import machine="STAF_LOCAL_HOSTNAME"
file="'%s/testcases/replication/%s/%s.xml' %
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/replication_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/replication_setup.xml
index 8949f4a..ff53897 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/replication_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/replication_setup.xml
@@ -114,7 +114,7 @@
client = _topologyServerList[0]
clientHost = client.getHostname()
clientPath = '%s/%s' % (client.getDir(),OPENDSNAME)
- clientDataDir = '%s/%s' % (client.getDir(),relativeDataDir)
+ clientDataDir = '%s/%s' % (client.getDir(),remote.reldatadir)
server1 = _topologyServerList[0]
server2 = _topologyServerList[1]
@@ -123,7 +123,7 @@
masterHost = master.getHostname()
masterReplicationServer = master.getChangelogServer()
masterPath = '%s/%s' % (master.getDir(),OPENDSNAME)
- masterDataDir = '%s/%s' % (master.getDir(),relativeDataDir)
+ masterDataDir = '%s/%s' % (master.getDir(),remote.reldatadir)
synchroSuffix = master.getSynchronizedSuffixList()[0].getSuffixDn()
masterBackupDir = '%s/replication/master_backup' % masterDataDir
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
index db97280..e6551f2 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
@@ -110,7 +110,7 @@
'remotehost' : consumer.getHostname(),
'srcfolder' : masterBackupDir,
'destfolder' : '%s/%s/replication/master_backup' \
- % (consumer.getDir(),relativeDataDir),
+ % (consumer.getDir(),remote.reldatadir),
'extension' : '*'
}
</call>
@@ -123,7 +123,7 @@
{ 'location' : consumer.getHostname(),
'dsPath' : '%s/%s' % (consumer.getDir(), OPENDSNAME),
'backupDir' : '%s/%s/replication/master_backup' \
- % (consumer.getDir(),relativeDataDir)
+ % (consumer.getDir(),remote.reldatadir)
}
</call>
</sequence>
@@ -262,7 +262,7 @@
'srcfolder' : '%s/replication/master_backup_online' \
% masterDataDir,
'destfolder' : '%s/%s/replication/master_backup_online' \
- % (consumer.getDir(),relativeDataDir),
+ % (consumer.getDir(),remote.reldatadir),
'extension' : '*'
}
</call>
@@ -280,7 +280,7 @@
'dsInstancePswd' : consumer.getRootPwd(),
'taskID' : 'restore task',
'backupDir' : '%s/%s/replication/master_backup_online' \
- % (consumer.getDir(),relativeDataDir)
+ % (consumer.getDir(),remote.reldatadir)
}
</call>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
index 4b5240e..48ab37c 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
@@ -57,7 +57,7 @@
<call function="'replication_setup'" />
<script>
- server1DataDir = '%s/%s' % (server1.getDir(),relativeDataDir)
+ server1DataDir = '%s/%s' % (server1.getDir(),remote.reldatadir)
</script>
<!--- Test Case : Total Update -->
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
index fa56632..ee43d7b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
@@ -29,173 +29,98 @@
<defaultcall function="main" />
<function name="main">
<sequence>
+
<!--- Load the environment for the test suite execution -->
<import machine="STAF_LOCAL_HOSTNAME"
file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
- <call function="'loadEnvironment'" />
+ <call function="'loadGlobalEnvironment'" />
- <!-- The Functional Tests -->
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/security/security.xml' % TESTS_DIR" />
- <!--
- add keyword 'main_security' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci.xml' % TESTS_DIR" />
- <!--
- add keyword 'main_aci' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/privileges/privileges.xml' % TESTS_DIR" />
- <!--
- add keyword 'main_privileges' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/dsconfig/dsconfig.xml' % TESTS_DIR" />
- <!--
- add keyword 'main_dsconfig' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/backends/backends.xml' % TESTS_DIR" />
- <!--
- add keyword 'main_backends' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/clu/clu.xml' % TESTS_DIR" />
- <!--
- add keyword 'main_clu' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/core/core.xml' % TESTS_DIR" />
- <!--
- add keyword 'main_core' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/schema/schema.xml' % TESTS_DIR" />
- <!--
- add keyword 'main_schema' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/replication/replication.xml' % TESTS_DIR" />
- <!--
- add keyword 'main_replication' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/indexes/indexes.xml' % TESTS_DIR" />
- <!--
- add keyword 'main_indexes' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/groups/groups.xml' % TESTS_DIR" />
- <!--
- add keyword 'main_groups' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/logging/logging.xml' % (TESTS_DIR)" />
- <!--
- add keyword 'main_logging' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/plugins/plugins.xml' % (TESTS_DIR)" />
- <!--
- add keyword 'main_plugins' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/tasks/tasks.xml' % (TESTS_DIR)" />
- <!--
- add keyword 'main_tasks' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/virtualAttributes/virtualAttributes.xml' % (TESTS_DIR)" />
- <!--
- add keyword 'main_virtualAttributes' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/monitoring/monitoring.xml' % (TESTS_DIR)" />
- <!--
- add keyword 'main_monitoring' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/dsml/dsml.xml' % (TESTS_DIR)" />
- <!--
- add keyword 'main_dsml' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/setup/setup.xml' % (TESTS_DIR)" />
- <!--
- add keyword 'main_setup' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/snmp/snmp.xml' % TESTS_DIR" />
- <!--
- add keyword 'main_snmp' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/i18n/i18n.xml' % TESTS_DIR" />
- <!--
- add keyword 'main_i18n' in run-custom-suites.dat file to run this specific testsuite or run CLI : build run-my-tests
- -->
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/sample/sample.xml' % TESTS_DIR" />
+ <!-- Build list of test groups to run -->
<script>
- # this function return a well-formatted testcase name
- def getTestCaseName(name):
- return '%s: %s: %s' % (CurrentTestPath['group'],CurrentTestPath['suite'],name)
+ noOfChildren=0
- # this functions adds a known issue to a testcase's known issues list
- issuesList=[]
- def knownIssue(issue):
- issuesList.append(issue)
-
- class functionToRun:
+ class groupToRun:
def __init__(self, name):
self.name = name
def getName(self):
return self.name
- testlog=open('%s/tests-log.xml' % logsTestsDir,'w')
+ testlog=open('%s/tests-log.xml' % logs.tests,'w')
testlog.write('<qa>\n')
testlog.write(' <functional-tests>\n')
testlog.write(' <results>\n')
testlog.close()
- suitesFileName='%s/testcases/run-custom-suites.dat' % TESTS_DIR
+ groupsFileName='%s/testcases/run-custom-suites.dat' % TESTS_DIR
- if not os.path.exists(suitesFileName):
- suitesFileName='%s/testcases/run-default-suites.dat' % TESTS_DIR
+ if not os.path.exists(groupsFileName):
+ groupsFileName='%s/testcases/run-default-suites.dat' % TESTS_DIR
- f = open(suitesFileName, 'r')
- functionsToRun = []
+ f = open(groupsFileName, 'r')
+ groupsToRun = []
for line in f.readlines():
- functionsToRun.append(functionToRun(line.rstrip()))
+
+ if line.startswith('#'):
+ continue
+ else:
+ groupsToRun.append(groupToRun(line.rstrip()))
f.close()
</script>
- <iterate var="function" in="functionsToRun">
+
+ <!-- TODO: If no groupsToRun then iterate will throw exception -->
+ <iterate var="group" in="groupsToRun" >
+
<sequence>
- <message>'calling function [%s]' % function.getName()</message>
- <call function="function.getName()" />
+
+ <message>'calling job %s' % group.getName()</message>
+
+ <!-- The job that executes the tests -->
+ <script>
+ STAXParentID=STAXJobID
+ </script>
+ <message>'STAXParentID= %s' % STAXParentID</message>
+
+ <job name="'%s: %s, %s, %s' % (STAXParentID,STAF_REMOTE_HOSTNAME,TEST_OS_STRING,group.getName())" monitor="1" clearlogs="'Enabled'" logtcstartstop="'Enabled'">
+ <job-file>
+ '%s/testcases/%s/%s.xml' % (TESTS_DIR,group.getName(),group.getName())
+ </job-file>
+ <job-function>
+ 'main_%s' % group.getName()
+ </job-function>
+ <job-function-args eval='1'>
+ STAXParentID
+ </job-function-args>
+ <job-scriptfiles machine="STAF_LOCAL_HOSTNAME">
+ STAXJobScriptFiles
+ </job-scriptfiles>
+ <job-action>
+ <log>
+ 'Started sub-job %s on %s' % (STAXSubJobID,STAF_LOCAL_HOSTNAME)
+ </log>
+ </job-action>
+ </job>
+
+ <if expr="RC == 0">
+ <sequence>
+ <message>
+ 'Sub-job %s completed. Result: %s' % (STAXSubJobID, STAXResult)
+ </message>
+ <script>
+ noOfChildren=noOfChildren+1
+ </script>
+ </sequence>
+ <else>
+ <sequence>
+ <message log="1" level="'Error'">
+ 'Sub-job %s could not be started. RC: %s Result: %s' % (STAXSubJobID,RC,STAFResult)
+ </message>
+ </sequence>
+ </else>
+ </if>
+
</sequence>
+
</iterate>
<!-- in this section we'll compute the coverage for all the tests
@@ -203,7 +128,10 @@
so far I could only get through this on either machines with a lot
of memory or small sets of tests
-->
- <if expr="os.path.exists('%s/lib/emma.jar' % dsPath)">
+ <script>
+ emmaJar='%s/%s/lib/emma.jar' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
+ </script>
+ <if expr="os.path.exists(emmaJar)">
<sequence>
<script>
coverageFiles=''
@@ -211,11 +139,11 @@
coverageFiles+='%s/coverage/%s/coverage.ec' % (TMPDIR,group)
</script>
<call function="'runCommand'">
- { 'name' : 'Generate global coverage xml report',
- 'command' : 'java',
- 'arguments' : ' -Xms64M -Xmx1024M -cp %s/lib/emma.jar emma report -r xml,html -in %s/coverage.em,%s -Dreport.xml.out.file=%s/coverage/coverage.xml -Dreport.html.out.file=%s/coverage/coverage.html -sp %s/../../../src' % (dsPath,dsPath,coverageFiles,TMPDIR,TMPDIR,TMPDIR),
- 'path' : TMPDIR
- }
+ { 'name' : 'Generate global coverage xml report',
+ 'command' : 'java',
+ 'arguments' : ' -Xms64M -Xmx1024M -cp %s emma report -r xml,html -in %s/coverage.em,%s -Dreport.xml.out.file=%s/coverage/coverage.xml -Dreport.html.out.file=%s/coverage/coverage.html -sp %s/../../../src' % (emmaJar,dsPath,coverageFiles,TMPDIR,TMPDIR,TMPDIR),
+ 'path' : TMPDIR
+ }
</call>
<script>
from java.io import FileInputStream
@@ -238,7 +166,7 @@
if thisNodeAttributes.getNamedItem("type").getNodeValue() == 'block, %':
rawCoverage = thisNodeAttributes.getNamedItem("value").getNodeValue()
coverage = rawCoverage.split('%')[0]
- testlog=open('%s/tests-log.xml' % logsTestsDir,'a')
+ testlog=open('%s/tests-log.xml' % logs.tests,'a')
testlog.seek(0,2)
testlog.write(" <all>\n")
testlog.write(" <coverage>\n")
@@ -250,7 +178,7 @@
</sequence>
<else>
<script>
- testlog=open('%s/tests-log.xml' % logsTestsDir,'a')
+ testlog=open('%s/tests-log.xml' % logs.tests,'a')
testlog.seek(0,2)
testlog.write(" <all>\n")
testlog.write(" <coverage>\n")
@@ -354,7 +282,7 @@
except NameError,details:
ServerJVMString=ServerJVMVersion
- testlog=open('%s/tests-log.xml' % logsTestsDir,'a')
+ testlog=open('%s/tests-log.xml' % logs.tests,'a')
testlog.seek(0,2)
testlog.write(' </results>\n')
testlog.write(' <identification>\n')
@@ -383,13 +311,16 @@
testlog.write(' %s\n' % ServerJVMVendor)
testlog.write(' </jvm-vendor>\n')
testlog.write(' <tests-dir>\n')
- testlog.write(' %s\n' % logsDir)
+ testlog.write(' %s\n' % logs.directory)
testlog.write(' </tests-dir>\n')
testlog.write(' </identification>\n')
testlog.write(' </functional-tests>\n')
testlog.write('</qa>\n')
testlog.close()
</script>
+
+ <return>noOfChildren</return>
+
</sequence>
</function>
</stax>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/runTestJob.xml b/opendj-sdk/opends/tests/functional-tests/testcases/runTestJob.xml
index 7c48041..332f3e9 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/runTestJob.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/runTestJob.xml
@@ -89,12 +89,21 @@
</job>
<if expr="RC == 0">
- <message>
- 'Sub-job %s completed. Result: %s' % (STAXSubJobID, STAXResult)
- </message>
+ <sequence>
+ <message>
+ 'Sub-job %s completed. Children: %s' % (STAXSubJobID, STAXResult)
+ </message>
+
+ <script>
+ noOfChildren=int(STAXResult)
+ firstChild=int(STAXSubJobID)+1
+ </script>
+ </sequence>
<else>
<sequence>
- <message log="1" level="'Error'">'Sub-job %s could not be started. RC: %s Result: %s' % (STAXSubJobID,RC,STAFResult)</message>
+ <message log="1" level="'Error'">
+ 'Sub-job %s could not be started. RC: %s Result: %s' % (STAXSubJobID,RC,STAFResult)
+ </message>
<return>1</return>
</sequence>
</else>
@@ -201,36 +210,49 @@
</script>
- <message>'Server= %s' % ServerInfoDict </message>
-
- <stafcmd name="'STAF Command: Log Query All'">
- <location>'%s' % STAF_LOCAL_HOSTNAME </location>
- <service>'log'</service>
- <request>
- 'QUERY ALL MACHINE %s LOGNAME STAX_Job_%s' % (STAXServiceMachine,STAXSubJobID)
- </request>
- </stafcmd>
-
- <if expr="RC == 0">
- <sequence>
+ <message>'Server= %s' % ServerInfoDict </message>
+ <script>
+ thisChild=firstChild
+ resultQuery=[]
+ </script>
+ <loop from="1" to="noOfChildren">
+ <sequence>
+ <stafcmd name="'STAF Command: Log Query All'">
+ <location>'%s' % STAF_LOCAL_HOSTNAME </location>
+ <service>'log'</service>
+ <request>
+ 'QUERY ALL MACHINE %s LOGNAME STAX_Job_%s' % (STAXServiceMachine,thisChild)
+ </request>
+ </stafcmd>
+
+ <if expr="RC == 0">
+ <sequence>
+ <script>
+ resultQuery.extend(STAFResult)
+ </script>
+ <message>
+ 'Log Query on STAX_Job_%s Completed. RC=%s' % (thisChild,RC)
+ </message>
+ </sequence>
+ <else>
+ <sequence>
+ <message log="1" level="'Error'">
+ 'Unable to perform log query on STAX_Job_%s. RC: %s Result: %s' % (thisChild,RC,STAFResult)
+ </message>
+ <return>1</return>
+ </sequence>
+ </else>
+ </if>
<script>
- resultQuery= STAFResult
+ thisChild=thisChild+1
</script>
- <message>
- 'Log Query on STAX_Job_%s Completed. RC=%s' % (STAXSubJobID,RC)
- </message>
</sequence>
- <else>
- <sequence>
- <message log="1" level="'Error'">
- 'Unable to perform log query on STAX_Job_%s. RC: %s Result: %s' % (STAXSubJobID,RC,STAFResult)
- </message>
- <return>1</return>
- </sequence>
- </else>
- </if>
-
- <!-- Get logsDir Variable -->
+ </loop>
+
+ <!-- TODO: Print this for now to see result of result query map -->
+ <message>'Result Query Map = %s' % resultQuery</message>
+
+ <!-- Get the location of where the test logs are -->
<call function="'GetVar'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'type' : 'shared',
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/sample/sample.xml b/opendj-sdk/opends/tests/functional-tests/testcases/sample/sample.xml
index 88d8f5a..b37efef 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/sample/sample.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/sample/sample.xml
@@ -28,11 +28,21 @@
<stax>
<defaultcall function="sample" />
<function name="sample">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<script>
CurrentTestPath['group']= 'sample'
envAlreadyLoaded='true'
</script>
+
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
<!---
#@TestSuiteName Sample
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml
index 0e3a172..f3c6dc6 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml
@@ -30,13 +30,22 @@
<defaultcall function="main_schema" />
<function name="main_schema">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'schema'">
<sequence>
-
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
+
<script>
CurrentTestPath['group']='schema'
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml
index fecce2f..ed258fc 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml
@@ -111,7 +111,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/dynamic_schema1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/dynamic_schema1.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -173,7 +173,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/schema/ldifs/updateSchema.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/schema/ldifs/updateSchema.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -189,7 +189,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/dynamic_schema2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/dynamic_schema2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -252,7 +252,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/schema/ldifs/updateSchema2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/schema/ldifs/updateSchema2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -268,7 +268,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/dynamic_schema4.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/dynamic_schema4.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -328,7 +328,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/schema/ldifs/updateSchema3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/schema/ldifs/updateSchema3.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -344,7 +344,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/dynamic_schema3.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/schema/ldifs/dynamic_schema3.ldif' % remote.data ,
'expectedRC' : 65
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
index 36d24d4..78f75b3 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
@@ -64,7 +64,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2079.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2079.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -88,7 +88,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_1.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -112,7 +112,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_2.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -136,7 +136,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_3.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_3.ldif' % remote.data ,
'expectedRC' : 65
}
</call>
@@ -158,7 +158,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_4.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_4.ldif' % remote.data ,
'expectedRC' : 65
}
</call>
@@ -180,7 +180,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_5.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2247_5.ldif' % remote.data ,
'expectedRC' : 65
}
</call>
@@ -202,7 +202,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2377.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2377.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -226,7 +226,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2798.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2798.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -250,7 +250,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/schema/ldifs/rfc3045_1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/schema/ldifs/rfc3045_1.ldif' % remote.data ,
'expectedRC' : 53
}
</call>
@@ -272,7 +272,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/schema/ldifs/rfc3045_2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/schema/ldifs/rfc3045_2.ldif' % remote.data ,
'expectedRC' : 53
}
</call>
@@ -294,7 +294,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_1.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -318,7 +318,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_2.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -342,7 +342,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_3.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_3.ldif' % remote.data ,
'expectedRC' : 65
}
</call>
@@ -364,7 +364,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_4.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_4.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -388,7 +388,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_5.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc4403_5.ldif' % remote.data ,
'expectedRC' : 65
}
</call>
@@ -410,7 +410,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_1.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -434,7 +434,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_2.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_2.ldif' % remote.data ,
'expectedRC' : 65
}
</call>
@@ -458,7 +458,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_3.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_3.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -482,7 +482,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_4.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2307bis_4.ldif' % remote.data ,
'expectedRC' : 65
}
</call>
@@ -504,7 +504,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/untypedobject.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/untypedobject.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -528,7 +528,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/changelog_1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/changelog_1.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -552,7 +552,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/changelog_2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/changelog_2.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -576,7 +576,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/changelog_3.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/changelog_3.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -600,7 +600,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/namedobject_1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/namedobject_1.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -624,7 +624,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/namedobject_2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/namedobject_2.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -648,7 +648,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/ldup_subentry_1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/ldup_subentry_1.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -672,7 +672,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/ldup_subentry_2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/ldup_subentry_2.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -696,7 +696,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/ldup_subentry_3.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/schema/ldifs/ldup_subentry_3.ldif' % remote.data ,
'expectedRC' : 53
}
</call>
@@ -826,7 +826,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/ldap_cosine_1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/ldap_cosine_1.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -850,7 +850,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/ldap_cosine_2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/ldap_cosine_2.ldif' % remote.data }
</call>
<call function="'checktestRC'">
@@ -874,7 +874,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/ldap_cosine_3.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/schema/ldifs/ldap_cosine_3.ldif' % remote.data ,
'expectedRC' : 65
}
</call>
@@ -895,7 +895,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2739.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2739.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -937,7 +937,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2714.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2714.ldif' % remote.data ,
'expectedRC' : 65
}
</call>
@@ -958,7 +958,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2714_2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2714_2.ldif' % remote.data }
</call>
<if expr="RC != 0">
@@ -999,7 +999,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/rfc2713.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/rfc2713.ldif' % remote.data }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_setup.xml
index 28749d6..a5df571 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_setup.xml
@@ -102,7 +102,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/schema/ldifs/schema_start.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/schema/ldifs/schema_start.ldif' % remote.data }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
index 983744f..03845c3 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
@@ -43,7 +43,7 @@
<script>
securityPath = '%s/security/account_activation' \
- % logsRemoteDataDir
+ % remote.data
</script>
<!--- Test Case information
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
index 64bef02..1ffd2ab 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
@@ -65,7 +65,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_policy.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_policy.ldif' % remote.data ,
'expectedRC' : 0 }
</call>
@@ -103,7 +103,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_users.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_users.ldif' % remote.data ,
'expectedRC' : 0 }
</call>
@@ -170,7 +170,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_user1.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_user1.ldif' % remote.data,
'expectedRC' : 65 }
</call>
@@ -223,7 +223,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_user2.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_user2.ldif' % remote.data,
'expectedRC' : 21 }
</call>
@@ -289,7 +289,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % remote.data ,
'expectedRC' : 0 }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
index 9e42d9e..b0e24ae 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
@@ -65,7 +65,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif' % remote.data,
'expectedRC' : 0 }
</call>
@@ -102,7 +102,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_users.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_users.ldif' % remote.data,
'expectedRC' : 0 }
</call>
@@ -169,7 +169,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif' % remote.data,
'expectedRC' : 65 }
</call>
@@ -221,7 +221,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif' % remote.data,
'expectedRC' : 21 }
</call>
@@ -284,7 +284,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % remote.data,
'expectedRC' : 0 }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
index d72f6e6..4078f08 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
@@ -65,7 +65,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
@@ -101,7 +101,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA256_users.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA256_users.ldif' % remote.data }
</call>
@@ -166,7 +166,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif' % remote.data,
'expectedRC' : 65 }
</call>
@@ -218,7 +218,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif' % remote.data,
'expectedRC' : 21 }
</call>
@@ -283,7 +283,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % remote.data }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
index f44a3e6..3ff920e 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
@@ -65,7 +65,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
@@ -101,7 +101,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA384_users.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA384_users.ldif' % remote.data }
</call>
@@ -167,7 +167,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif' % remote.data,
'expectedRC' : 65 }
</call>
@@ -219,7 +219,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif' % remote.data,
'expectedRC' : 21 }
</call>
@@ -284,7 +284,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
index 53d15bf..92da6a5 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
@@ -65,7 +65,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
@@ -101,7 +101,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA512_users.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA512_users.ldif' % remote.data }
</call>
@@ -166,7 +166,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif' % remote.data,
'expectedRC' : 65 }
</call>
@@ -219,7 +219,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif' % remote.data,
'expectedRC' : 21 }
</call>
@@ -282,7 +282,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
index a3dbd9b..ffefe14 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
@@ -64,7 +64,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/auth_pwd_syntax/admin_mod_def_policy.ldif' % logsRemoteDataDir,
+ 'entryToBeModified' : '%s/security/auth_pwd_syntax/admin_mod_def_policy.ldif' % remote.data,
'expectedRC' : 0 }
</call>
@@ -105,7 +105,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_def_users.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_def_users.ldif' % remote.data,
'expectedRC' : 0 }
</call>
@@ -173,7 +173,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/auth_pwd_syntax/admin_mod_def_policy2.ldif' % logsRemoteDataDir,
+ 'entryToBeModified' : '%s/security/auth_pwd_syntax/admin_mod_def_policy2.ldif' % remote.data,
'expectedRC' : 0 }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
index 07fc4ae..2f86136 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
@@ -69,7 +69,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
index 1ad0f0b..32f53e1 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
@@ -47,7 +47,7 @@
'dsInstanceDn' : 'uid=bhall, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base -j %s/security/bind_no_pwd/bhall.pwd' % logsRemoteDataDir }
+ 'extraParams' : '-s base -j %s/security/bind_no_pwd/bhall.pwd' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
@@ -68,7 +68,7 @@
'dsInstanceDn' : 'uid=bhall, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir,
+ 'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % remote.data,
'expectedRC' : 53 }
</call>
@@ -111,7 +111,7 @@
'dsInstanceDn' : 'uid=bhall, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base -j %s/security/bind_no_pwd/bhall.pwd' % logsRemoteDataDir }
+ 'extraParams' : '-s base -j %s/security/bind_no_pwd/bhall.pwd' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
@@ -132,7 +132,7 @@
'dsInstanceDn' : 'uid=bhall, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir }
+ 'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
@@ -153,7 +153,7 @@
'dsInstanceDn' : 'uid=tmason, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir }
+ 'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
@@ -174,7 +174,7 @@
'dsInstanceDn' : 'uid=Anybody, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir }
+ 'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
@@ -208,7 +208,7 @@
'dsInstanceDn' : 'uid=bhall, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir,
+ 'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % remote.data,
'expectedRC' : 53 }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
index ef71e3e..4aea199 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
@@ -46,7 +46,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/bind_no_pwd/bind_no_pwd_startup.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/bind_no_pwd/bind_no_pwd_startup.ldif' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/client_auth_lib.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/client_auth_lib.xml
index f380ecb..9fa6528 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/client_auth_lib.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/client_auth_lib.xml
@@ -42,7 +42,7 @@
<script>
SERVER_KEYPASS="servercert"
SERVER_STOREPASS="servercert"
- CERT_TMP="%s/CERT_%s" % (logsRemoteDataDir,DIRECTORY_INSTANCE_PORT)
+ CERT_TMP="%s/CERT_%s" % (remote.data,DIRECTORY_INSTANCE_PORT)
CLIENT_KEYSTORE="%s/keystore" % (CERT_TMP)
CLIENT_KEYPASS="password"
CLIENT_STOREPASS="password"
@@ -57,10 +57,10 @@
SERVER_CERT_FILE="%s/server_cert.txt" % (CERT_TMP)
user1LdifFileName='user1_cert.ldif'
user2LdifFileName='user2_cert.ldif'
- remoteUser1LdifFile='%s/%s/../%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME,relativeDataDir,user1LdifFileName)
- remoteUser2LdifFile='%s/%s/../%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME,relativeDataDir,user2LdifFileName)
- localUser1LdifFile='%s/%s' % (logsTempDir,user1LdifFileName)
- localUser2LdifFile='%s/%s' % (logsTempDir,user2LdifFileName)
+ remoteUser1LdifFile='%s/%s' % (remote.data,user1LdifFileName)
+ remoteUser2LdifFile='%s/%s' % (remote.data,user2LdifFileName)
+ localUser1LdifFile='%s/%s' % (local.temp,user1LdifFileName)
+ localUser2LdifFile='%s/%s' % (local.temp,user2LdifFileName)
</script>
</sequence>
</function>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
index 7cb0216..473445b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
@@ -71,7 +71,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/jks/jks_startup.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/jks/jks_startup.ldif' % remote.data,
'extraParams' : '-Z -X' }
</call>
@@ -106,7 +106,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/jks/modrdn/a1_modrdn.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/jks/modrdn/a1_modrdn.ldif' % remote.data ,
'extraParams' : '-Z -X' }
</call>
@@ -141,7 +141,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/jks/add/bin_a1_in.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/jks/add/bin_a1_in.ldif' % remote.data ,
'extraParams' : '-Z -X' }
</call>
@@ -176,7 +176,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/jks/mod/bin_a1_mod.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/jks/mod/bin_a1_mod.ldif' % remote.data ,
'extraParams' : '-Z -X' }
</call>
@@ -211,7 +211,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/jks/del/bin_a1_out.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/jks/del/bin_a1_out.ldif' % remote.data ,
'extraParams' : '-Z -X' }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
index b76813b..9a857ac 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
@@ -71,7 +71,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/jks/jks_startup.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/jks/jks_startup.ldif' % remote.data,
'extraParams' : '-Z -X' }
</call>
@@ -106,7 +106,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/jks/modrdn/a1_modrdn.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/jks/modrdn/a1_modrdn.ldif' % remote.data ,
'extraParams' : '-Z -X' }
</call>
@@ -141,7 +141,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/jks/add/bin_a1_in.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/jks/add/bin_a1_in.ldif' % remote.data ,
'extraParams' : '-Z -X' }
</call>
@@ -176,7 +176,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/jks/mod/bin_a1_mod.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/jks/mod/bin_a1_mod.ldif' % remote.data ,
'extraParams' : '-Z -X' }
</call>
@@ -211,7 +211,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/jks/del/bin_a1_out.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/jks/del/bin_a1_out.ldif' % remote.data ,
'extraParams' : '-Z -X' }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
index 8673a14..3b12f43 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
@@ -66,7 +66,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/pkcs12/pkcs12_startup.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/pkcs12/pkcs12_startup.ldif' % remote.data,
'extraParams' : '-Z -X' }
</call>
@@ -101,7 +101,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pkcs12/modrdn/a1_modrdn.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/pkcs12/modrdn/a1_modrdn.ldif' % remote.data ,
'extraParams' : '-Z -X' }
</call>
@@ -136,7 +136,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pkcs12/add/bin_a1_in.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/pkcs12/add/bin_a1_in.ldif' % remote.data ,
'extraParams' : '-Z -X' }
</call>
@@ -171,7 +171,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pkcs12/mod/bin_a1_mod.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/pkcs12/mod/bin_a1_mod.ldif' % remote.data ,
'extraParams' : '-Z -X' }
</call>
@@ -206,7 +206,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pkcs12/del/bin_a1_out.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/pkcs12/del/bin_a1_out.ldif' % remote.data ,
'extraParams' : '-Z -X' }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml
index d638288..e0d1127 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml
@@ -46,7 +46,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_max_pwd_age.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_policy/admin_change_max_pwd_age.ldif' % remote.data }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml
index 8c36359..3d8e283 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml
@@ -69,7 +69,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_max_pwd_age.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_policy/admin_change_max_pwd_age.ldif' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
index 08fe942..7471d05 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
@@ -119,7 +119,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/security/pwd_policy/add_entry1.ldif' \
- % logsRemoteDataDir }
+ % remote.data }
</call>
<message>
@@ -227,7 +227,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/security/pwd_policy/add_entry2.ldif' \
- % logsRemoteDataDir }
+ % remote.data }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
index ea67cd9..a01a844 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
@@ -110,7 +110,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/security/pwd_policy/add_sales_person.ldif' \
- % logsRemoteDataDir }
+ % remote.data }
</call>
<call function="'SearchObject'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
index 385e341..e61118e 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
@@ -107,7 +107,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/security/pwd_policy/add_entry_preencoded_pwd.ldif' \
- % logsRemoteDataDir ,
+ % remote.data ,
'expectedRC' : 53 }
</call>
@@ -185,7 +185,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/security/pwd_policy/add_entry_preencoded_pwd.ldif' \
- % logsRemoteDataDir }
+ % remote.data }
</call>
<call function="'SearchObject'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml
index e8ce255..0af00ab 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml
@@ -66,7 +66,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/security/pwd_policy/pwd_policy_startup.ldif'\
- % logsRemoteDataDir }
+ % remote.data }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml
index a4b3e83..1c60f89 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml
@@ -83,7 +83,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/pwd_policy_root/add_new_root_user.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/pwd_policy_root/add_new_root_user.ldif' % remote.data }
</call>
<message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
index c1b35ef..8c0d8cd 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
@@ -69,7 +69,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/pwd_storage/pwd_storage_startup.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/pwd_storage/pwd_storage_startup.ldif' % remote.data }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
index 376ab6a..0b1906a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
@@ -41,7 +41,7 @@
-->
<script>
- path = '%s/security/pwd_validator' % logsRemoteDataDir
+ path = '%s/security/pwd_validator' % remote.data
</script>
<!--- Test Case information
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
index 1223e02..7aa0909 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
@@ -399,7 +399,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/%s' % (logsRemoteDataDir,ldifpath) }
+ 'entryToBeModified' : '%s/%s' % (remote.data,ldifpath) }
</call>
-->
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
index 2787d42..563ab10 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
@@ -75,7 +75,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/sasl/admin_enable_sasl_anon.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/sasl/admin_enable_sasl_anon.ldif' % remote.data }
</call>
-->
<call function="'testCase_Postamble'"/>
@@ -154,7 +154,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/sasl/admin_disable_sasl_anon.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/sasl/admin_disable_sasl_anon.ldif' % remote.data }
</call>
-->
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
index 8d9dc8d..5a594af 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
@@ -1930,7 +1930,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/sasl/admin_del_realm.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/sasl/admin_del_realm.ldif' % remote.data }
</call>
<message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
index 8c1b75d..93e2754 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
@@ -70,7 +70,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/sasl/sasl_startup.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/sasl/sasl_startup.ldif' % remote.data }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/security.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/security.xml
index 32a0505..560fbee 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/security.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/security.xml
@@ -30,13 +30,23 @@
<defaultcall function="main_security"/>
<function name="main_security">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'security'">
<sequence>
-
+
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
+
<!--- Test Group information
#@TestGroupName Security tests
#@TestGroupPurpose Test the security.
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
index 01cd3af..fd7d117 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
@@ -46,7 +46,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/startTLS/starttls_startup.ldif' % logsRemoteDataDir,
+ 'entryToBeAdded' : '%s/security/startTLS/starttls_startup.ldif' % remote.data,
'extraParams' : '-q -X' }
</call>
@@ -68,7 +68,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/add/bin_a1_tls_in.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/add/bin_a1_tls_in.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -90,7 +90,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/mod/bin_a1_tls_mod.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/mod/bin_a1_tls_mod.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -112,7 +112,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/del/bin_a1_tls_out.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/del/bin_a1_tls_out.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
index 434ed0f..690df8f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
@@ -60,7 +60,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -82,7 +82,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/startTLS/force_pwd_change/add_entry1.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/security/startTLS/force_pwd_change/add_entry1.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -119,7 +119,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mcat,ou=people,ou=startTLS tests,o=SSL Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'pizza' ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/user_change_force_pwd.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/user_change_force_pwd.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -155,7 +155,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -168,7 +168,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/startTLS/force_pwd_change/add_entry2.ldif' % logsRemoteDataDir ,
+ 'entryToBeAdded' : '%s/security/startTLS/force_pwd_change/add_entry2.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -217,7 +217,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -239,7 +239,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -286,7 +286,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mdog,ou=people,ou=startTLS tests,o=SSL Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'pizza' ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/user_add_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/user_add_attr.ldif' % remote.data ,
'extraParams' : '-q -X' ,
'expectedRC' : 49 }
</call>
@@ -323,7 +323,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mdog,ou=people,ou=startTLS tests,o=SSL Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'pizza' ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/user_del_attr.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/user_del_attr.ldif' % remote.data ,
'extraParams' : '-q -X' ,
'expectedRC' : 49 }
</call>
@@ -408,7 +408,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mdog,ou=people,ou=startTLS tests,o=SSL Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'adminpizza' ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/user_change_pwd1.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/user_change_pwd1.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -535,7 +535,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -557,7 +557,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -579,7 +579,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mdog,ou=people,ou=startTLS tests,o=SSL Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'adminlongpizza' ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/user_change_pwd2.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/user_change_pwd2.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -615,7 +615,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -637,7 +637,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -667,7 +667,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mdog,ou=people,ou=startTLS tests,o=SSL Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'adminshortpizza' ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/user_change_pwd3.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/user_change_pwd3.ldif' % remote.data ,
'extraParams' : '-q -X' ,
'expectedRC' : 49 }
</call>
@@ -705,7 +705,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
@@ -718,7 +718,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif' % logsRemoteDataDir ,
+ 'entryToBeModified' : '%s/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif' % remote.data ,
'extraParams' : '-q -X' }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/setup/directory_manager.xml b/opendj-sdk/opends/tests/functional-tests/testcases/setup/directory_manager.xml
index 046104d..328666b 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/setup/directory_manager.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/setup/directory_manager.xml
@@ -124,7 +124,7 @@
DM_I1_ROOT = '%s/%s' % (DM_I1_BASE, OPENDSNAME)
DM_I2_BASE = '%s/dm_i2' % (OUT_GROUP)
DM_I2_ROOT = '%s/%s' % (DM_I2_BASE, OPENDSNAME)
- DM_O1_LDIF = '%s/setup/dm-o1.ldif' % logsRemoteDataDir
+ DM_O1_LDIF = '%s/setup/dm-o1.ldif' % remote.data
</script>
@@ -603,7 +603,7 @@
<script>
DM_I3_BASE = '%s/dm_i3' % (OUT_GROUP)
DM_I3_ROOT = '%s/%s' % (DM_I3_BASE, OPENDSNAME)
- DM_PASSWD_FILE = '%s/setup/pwd.ldif' % logsRemoteDataDir
+ DM_PASSWD_FILE = '%s/setup/pwd.ldif' % remote.data
</script>
<call function="'testCase_Preamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/setup/import.xml b/opendj-sdk/opends/tests/functional-tests/testcases/setup/import.xml
index d945937..315ea27 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/setup/import.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/setup/import.xml
@@ -271,7 +271,7 @@
IMP_I2_BASE = '%s/imp_i2' % (OUT_GROUP)
IMP_I2_ROOT = '%s/%s' % (IMP_I2_BASE, OPENDSNAME)
- IMP_LDIF_FILE = '%s/setup/imp-o1.ldif' % logsRemoteDataDir
+ IMP_LDIF_FILE = '%s/setup/imp-o1.ldif' % remote.data
IMP_SKIP_FILE = '%s/imp-skip.ldif' % (OUT_GROUP)
IMP_REJECT_FILE = '%s/imp-reject.ldif' % (OUT_GROUP)
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/setup/incompatible_options.xml b/opendj-sdk/opends/tests/functional-tests/testcases/setup/incompatible_options.xml
index 51688b8..b9d7bbd 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/setup/incompatible_options.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/setup/incompatible_options.xml
@@ -71,7 +71,7 @@
<sequence>
<script>
- INC_LDIF_FILE = '%s/setup/inc-options.ldif' % logsRemoteDataDir
+ INC_LDIF_FILE = '%s/setup/inc-options.ldif' % remote.data
</script>
<call function="'testCase_Preamble'"/>
@@ -169,7 +169,7 @@
<sequence>
<script>
- INC_LDIF_FILE = '%s/setup/inc-options.ldif' % logsRemoteDataDir
+ INC_LDIF_FILE = '%s/setup/inc-options.ldif' % remote.data
</script>
<call function="'testCase_Preamble'"/>
@@ -222,7 +222,7 @@
<sequence>
<script>
- INC_USER_PWD_FILE = '%s/setup/pwd.ldif' % logsRemoteDataDir
+ INC_USER_PWD_FILE = '%s/setup/pwd.ldif' % remote.data
</script>
<call function="'testCase_Preamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/setup/security.xml b/opendj-sdk/opends/tests/functional-tests/testcases/setup/security.xml
index 771413c..f87643f 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/setup/security.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/setup/security.xml
@@ -137,7 +137,7 @@
<script>
DM_DN = 'cn=DM'
DM_PW = 'secret12'
- DM_PW_FILE = '%s/setup/pwd-security.ldif' % logsRemoteDataDir
+ DM_PW_FILE = '%s/setup/pwd-security.ldif' % remote.data
KEYTOOL = '%s/bin/keytool%s' % (JAVA_HOME, fileExt)
SEC_I1_BASE = '%s/sec_i1' % (OUT_GROUP)
@@ -145,7 +145,7 @@
SEC_I2_BASE = '%s/sec_i2' % (OUT_GROUP)
SEC_I2_ROOT = '%s/%s' % (SEC_I2_BASE, OPENDSNAME)
MY_KEYSTORE = '%s/ks' % OUT_GROUP
- SEC_O1_LDIF = '%s/setup/sec-o1.ldif' % logsRemoteDataDir
+ SEC_O1_LDIF = '%s/setup/sec-o1.ldif' % remote.data
</script>
<call function="'checkFileExists'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/setup/setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/setup/setup.xml
index 69c80ba..92e62b0 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/setup/setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/setup/setup.xml
@@ -30,12 +30,19 @@
<defaultcall function="main_setup"/>
<function name="main_setup">
-
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'setup'">
<sequence>
-
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
<!--- Test Group information
#@TestGroupName Setup tests
#@TestGroupPurpose Test the tools commands.
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp.xml b/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp.xml
index 3f10c7e..063d595 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp.xml
@@ -29,14 +29,26 @@
<defaultcall function="main_snmp"/>
- <function name="main_snmp">
-
+ <function name="main_snmp" scope="local">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
+
<sequence>
<block name="'snmp'">
<sequence>
+ <message log="1" level="'Info'">'STAXParentID= %s' % STAXParentID</message>
+
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
+
<!--- Test Group information
#@TestGroupName SNMP tests
#@TestGroupPurpose Test the SNMP Connection Handler.
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp_setup.xml
index c09a4f3..d3b9674 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp_setup.xml
@@ -53,7 +53,7 @@
<!--- Define default value for manager -->
<script>
- snmpPath = '%s/../%s/snmp' % (dsPath,relativeJavaDir),
+ snmpPath = '%s/snmp' % remote.java,
opendmkPath = '%s/jdmkrt.jar' % snmpPath
</script>
@@ -129,8 +129,7 @@
<call function="'importLdif'">
{
- 'ldifFile' : '%s/snmp/snmp_start.ldif'
- % logsRemoteDataDir
+ 'ldifFile' : '%s/snmp/snmp_start.ldif' % remote.data
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp_v3_customconf.xml b/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp_v3_customconf.xml
index 7921fce..0ca7dc8 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp_v3_customconf.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp_v3_customconf.xml
@@ -58,7 +58,7 @@
defSecurityFileProp = SNMP_PROPERTIES['security-agent-file']
defSecurityLevelProp = SNMP_PROPERTIES['security-level']
newContextProp = 'myContext'
- newSecurityFileProp = '%s/snmp/agent.security' % logsRemoteDataDir
+ newSecurityFileProp = '%s/snmp/agent.security' % remote.data
lowUser = 'myUser1'
defUser = 'myUser2'
highUser = 'myUser3'
@@ -66,7 +66,7 @@
lowSecurityLevelProp = 'noauthnopriv'
highSecurityLevelProp = 'authpriv'
wrongSecurityLevelProp = 'mySecurityLevel'
- mySecurityFile = '%s/snmp/manager.security' % logsRemoteDataDir
+ mySecurityFile = '%s/snmp/manager.security' % remote.data
oid = 'dsServerType.1'
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp_v3_defaultconf.xml b/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp_v3_defaultconf.xml
index 89f82dd..61449df 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp_v3_defaultconf.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/snmp/snmp_v3_defaultconf.xml
@@ -54,7 +54,7 @@
<!--- Define default value for securityFile, securityLevel,
context and oid -->
<script>
- securityFile = '%s/snmp/manager.security' % logsRemoteDataDir
+ securityFile = '%s/snmp/manager.security' % remote.data
securityLevel = SNMP_PROPERTIES['security-level']
context = SNMP_PROPERTIES['community']
oid = 'dsServerType.1'
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/allowed-tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/allowed-tasks.xml
index 3fe549d..6402d72 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/allowed-tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/allowed-tasks.xml
@@ -83,7 +83,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_asynchronous' % logsRemoteDataDir,
+ 'ldifFile' : '%s/tasks/export_asynchronous' % remote.data,
'startTask' : '0',
'backEnd' : 'userRoot',
'expectedRC' : 1}
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/backup_db.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/backup_db.xml
index a690d3c..4664820 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/backup_db.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/backup_db.xml
@@ -72,7 +72,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/tasks/backup_asynchronous' % logsRemoteDataDir,
+ 'backupDir' : '%s/tasks/backup_asynchronous' % remote.data,
'startTask' : '0',
'backEnd' : 'userRoot'}
</call>
@@ -102,7 +102,7 @@
<message>'--- Check log files backup_asynchronous ---'</message>
<call function="'listFolder'">
{ 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % logsRemoteDataDir,
+ 'foldername' : '%s/tasks' % remote.data,
'filename' : 'backup_asynchronous'
}
</call>
@@ -142,14 +142,14 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/tasks/backup_synchronous' % logsRemoteDataDir,
+ 'backupDir' : '%s/tasks/backup_synchronous' % remote.data,
'backEnd' : 'userRoot'}
</call>
<message>'--- Check log files ---'</message>
<call function="'listFolder'">
{ 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % logsRemoteDataDir,
+ 'foldername' : '%s/tasks' % remote.data,
'filename' : 'backup_synchronous'
}
</call>
@@ -189,7 +189,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'startTask' : '20061212000000',
- 'backupDir' : '%s/tasks/backup_schedule_asynchronous' % logsRemoteDataDir,
+ 'backupDir' : '%s/tasks/backup_schedule_asynchronous' % remote.data,
'backEnd' : 'userRoot'}
</call>
@@ -197,7 +197,7 @@
<message>'--- Check log files backup_schedule_asynchronous ---'</message>
<call function="'listFolder'">
{ 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % logsRemoteDataDir,
+ 'foldername' : '%s/tasks' % remote.data,
'filename' : 'backup_schedule_asynchronous'
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/export-ldif.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/export-ldif.xml
index 2058d29..30b2738 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/export-ldif.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/export-ldif.xml
@@ -70,14 +70,14 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_asynchronous' % logsRemoteDataDir,
+ 'ldifFile' : '%s/tasks/export_asynchronous' % remote.data,
'startTask' : '0',
'backEnd' : 'userRoot'}
</call>
<message>'--- Check log files export_asynchronous ---'</message>
<call function="'listFolder'">
{ 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % logsRemoteDataDir,
+ 'foldername' : '%s/tasks' % remote.data,
'filename' : 'export_asynchronous'
}
</call>
@@ -118,7 +118,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_synchronous' % logsRemoteDataDir,
+ 'ldifFile' : '%s/tasks/export_synchronous' % remote.data,
'backEnd' : 'userRoot'}
</call>
@@ -147,7 +147,7 @@
<message>'--- Check log files ---'</message>
<call function="'listFolder'">
{ 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % logsRemoteDataDir,
+ 'foldername' : '%s/tasks' % remote.data,
'filename' : 'export_synchronous'
}
</call>
@@ -186,7 +186,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_schedule_asynchronous' % logsRemoteDataDir,
+ 'ldifFile' : '%s/tasks/export_schedule_asynchronous' % remote.data,
'startTask' : '20061212000000',
'backEnd' : 'userRoot'}
</call>
@@ -194,7 +194,7 @@
<message>'--- Check log files export_asynchronous ---'</message>
<call function="'listFolder'">
{ 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % logsRemoteDataDir,
+ 'foldername' : '%s/tasks' % remote.data,
'filename' : 'export_schedule_asynchronous'
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/import-ldif.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/import-ldif.xml
index 06e4f3c..0316b94 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/import-ldif.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/import-ldif.xml
@@ -70,7 +70,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'dsLdifFile' : '%s/tasks/import.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/tasks/import.ldif' % remote.data,
'dsAppend' : ' ',
'dsBackEnd' : 'userRoot'}
</call>
@@ -149,7 +149,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'dsLdifFile' : '%s/tasks/import.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/tasks/import.ldif' % remote.data,
'dsAppend' : ' ',
'startTask' : '0',
'dsBackEnd' : 'userRoot'}
@@ -210,7 +210,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'dsLdifFile' : '%s/tasks/import.ldif' % logsRemoteDataDir,
+ 'dsLdifFile' : '%s/tasks/import.ldif' % remote.data,
'dsAppend' : ' ',
'startTask' : '20061212000000',
'dsBackEnd' : 'userRoot'}
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restore_db.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restore_db.xml
index 2428e82..d5c0ec3 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restore_db.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restore_db.xml
@@ -67,7 +67,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/tasks/backup_asynchronous' % logsRemoteDataDir,
+ 'backupDir' : '%s/tasks/backup_asynchronous' % remote.data,
'startTask' : '0'}
</call>
@@ -101,7 +101,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/tasks/backup_synchronous' % logsRemoteDataDir}
+ 'backupDir' : '%s/tasks/backup_synchronous' % remote.data}
</call>
<!-- manage-tasks -->
@@ -157,7 +157,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'startTask' : '%s' % mydate,
- 'backupDir' : '%s/tasks/backup_schedule_asynchronous' % logsRemoteDataDir
+ 'backupDir' : '%s/tasks/backup_schedule_asynchronous' % remote.data
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/tasks.xml
index 06e5aaf..2379fed 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/tasks.xml
@@ -35,9 +35,18 @@
<stax>
<defaultcall function="main_tasks"/>
<function name="main_tasks">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'tasks'">
<sequence>
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
<script>
CurrentTestPath['group']='tasks'
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml b/opendj-sdk/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml
index 9114a83..6241d28 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml
@@ -30,16 +30,24 @@
<defaultcall function="main_virtualAttributes"/>
<function name="main_virtualAttributes">
+ <function-list-args>
+ <function-required-arg name="STAXParentID"/>
+ </function-list-args>
<sequence>
<block name="'virtualAttributes'">
<sequence>
+
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
<script>
- CurrentTestPath={}
- envAlreadyLoaded='true'
CurrentTestPath['group']='virtualAttributes'
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml b/opendj-sdk/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
index 5f1d194..0101b31 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
@@ -455,7 +455,7 @@
'dsInstanceDn' : applicationDn,
'dsInstancePswd' : applicationPswd,
'dsFilename' : '%s/virtualAttributes/ldif_mod.ldif' \
- % logsRemoteDataDir,
+ % remote.data,
'expectedRC' : 21
}
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml
index 1b4e5a8..88463c9 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml
@@ -79,7 +79,7 @@
</message>
<call function="'importLdif'">
{'ldifFile' : '%s/virtualAttributes/virtualAttributes.ldif'
- % logsRemoteDataDir }
+ % remote.data }
</call>
<call function="'checkRC'">
{ 'returncode' : RC ,
diff --git a/opendj-sdk/opends/tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/shared/functions/dsadm.xml
index dec7a63..7d13f9e 100755
--- a/opendj-sdk/opends/tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/shared/functions/dsadm.xml
@@ -1148,8 +1148,8 @@
m.update(location)
m.update(dsPath)
taskLdifFile='import-task-%s.ldif' % m.hexdigest()
- taskLdif='%s/../%s/%s' % (dsPath,relativeDataDir,taskLdifFile)
- tmpTaskLdif='%s/%s' % (logsTempDir,taskLdifFile)
+ taskLdif='%s/%s' % (remote.temp,taskLdifFile)
+ tmpTaskLdif='%s/%s' % (local.temp,taskLdifFile)
taskDN='ds-task-id=%s,cn=Scheduled Tasks,cn=Tasks' % taskID
</script>
@@ -1712,8 +1712,8 @@
m.update(location)
m.update(dsPath)
taskLdifFile='export-task-%s.ldif' % m.hexdigest()
- taskLdif='%s/../%s/%s' % (dsPath,relativeDataDir,taskLdifFile)
- tmpTaskLdif='%s/%s' % (logsTempDir,taskLdifFile)
+ taskLdif='%s/%s' % (remote.temp,taskLdifFile)
+ tmpTaskLdif='%s/%s' % (local.temp,taskLdifFile)
taskDN='ds-task-id=%s,cn=Scheduled Tasks,cn=Tasks' % taskID
</script>
@@ -2063,8 +2063,8 @@
m.update(location)
m.update(dsPath)
taskLdifFile='backup-task-%s.ldif' % m.hexdigest()
- taskLdif='%s/../%s/%s' % (dsPath,relativeDataDir,taskLdifFile)
- tmpTaskLdif='%s/%s' % (logsTempDir,taskLdifFile)
+ taskLdif='%s/%s' % (remote.temp,taskLdifFile)
+ tmpTaskLdif='%s/%s' % (local.temp,taskLdifFile)
taskDN='ds-task-id=%s,cn=Scheduled Tasks,cn=Tasks' % taskID
</script>
@@ -2357,8 +2357,8 @@
m.update(location)
m.update(dsPath)
taskLdifFile='restore-task-%s.ldif' % m.hexdigest()
- taskLdif='%s/../%s/%s' % (dsPath,relativeDataDir,taskLdifFile)
- tmpTaskLdif='%s/%s' % (logsTempDir,taskLdifFile)
+ taskLdif='%s/%s' % (remote.temp,taskLdifFile)
+ tmpTaskLdif='%s/%s' % (local.temp,taskLdifFile)
taskDN='ds-task-id=%s,cn=Scheduled Tasks,cn=Tasks' % taskID
</script>
@@ -2511,8 +2511,8 @@
m.update(location)
m.update(dsPath)
taskLdifFile='shutdown-task-%s.ldif' % m.hexdigest()
- taskLdif='%s/../%s/%s' % (dsPath,relativeDataDir,taskLdifFile)
- tmpTaskLdif='%s/%s' % (logsTempDir,taskLdifFile)
+ taskLdif='%s/%s' % (remote.temp,taskLdifFile)
+ tmpTaskLdif='%s/%s' % (local.temp,taskLdifFile)
taskDN='ds-task-id=%s,cn=Scheduled Tasks,cn=Tasks' % taskID
</script>
@@ -2642,8 +2642,8 @@
m.update(location)
m.update(dsPath)
taskLdifFile='restart-task-%s.ldif' % m.hexdigest()
- taskLdif='%s/../%s/%s' % (dsPath,relativeDataDir,taskLdifFile)
- tmpTaskLdif='%s/%s' % (logsTempDir,taskLdifFile)
+ taskLdif='%s/%s' % (remote.temp,taskLdifFile)
+ tmpTaskLdif='%s/%s' % (local.temp,taskLdifFile)
taskDN='ds-task-id=%s,cn=Scheduled Tasks,cn=Tasks' % taskID
</script>
@@ -2782,8 +2782,8 @@
m.update(location)
m.update(dsPath)
taskLdifFile='schema-%s.ldif' % m.hexdigest()
- taskLdif='%s/../%s/%s' % (dsPath,relativeDataDir,taskLdifFile)
- tmpTaskLdif='%s/%s' % (logsTempDir,taskLdifFile)
+ taskLdif='%s/%s' % (remote.temp,taskLdifFile)
+ tmpTaskLdif='%s/%s' % (local.temp,taskLdifFile)
taskDN='ds-task-id=%s,cn=Scheduled Tasks,cn=Tasks' % taskID
</script>
@@ -2824,7 +2824,7 @@
<message>'Copy schema update ldif file.'</message>
<call function="'copyFile'">
{ 'location' : myLocation,
- 'srcfile' : '%s/schema/ldifs/%s' % (logsRemoteDataDir,ldifFile),
+ 'srcfile' : '%s/schema/ldifs/%s' % (remote.data,ldifFile),
'destfile' : '%s/%s/config/schema/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME,ldifFile),
'remotehost' : myLocation }
</call>
@@ -2921,8 +2921,8 @@
m.update(location)
m.update(dsPath)
taskLdifFile='leaveShutdownTask-%s.ldif' % m.hexdigest()
- taskLdif='%s/../%s/%s' % (dsPath,relativeDataDir,taskLdifFile)
- tmpTaskLdif='%s/%s' % (logsTempDir,taskLdifFile)
+ taskLdif='%s/%s' % (remote.temp,taskLdifFile)
+ tmpTaskLdif='%s/%s' % (local.temp,taskLdifFile)
taskDN='ds-task-id=%s,cn=Scheduled Tasks,cn=Tasks' % taskID
</script>
@@ -2961,7 +2961,7 @@
<message>'Copy update ldif file.'</message>
<call function="'copyFile'">
{ 'location' : myLocation,
- 'srcfile' : '%s/schema/ldifs/%s' % (logsRemoteDataDir,ldifFile),
+ 'srcfile' : '%s/schema/ldifs/%s' % (remote.data,ldifFile),
'destfile' : '%s/%s/config/schema/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME,ldifFile),
'remotehost' : myLocation }
</call>
@@ -3070,8 +3070,8 @@
m.update(location)
m.update(dsPath)
taskLdifFile='totalupdate-task-%s.ldif' % m.hexdigest()
- taskLdif='%s/../%s/%s' % (dsPath,relativeDataDir,taskLdifFile)
- tmpTaskLdif='%s/%s' % (logsTempDir,taskLdifFile)
+ taskLdif='%s/%s' % (remote.temp,taskLdifFile)
+ tmpTaskLdif='%s/%s' % (local.temp,taskLdifFile)
taskDN='ds-task-id=%s,cn=Scheduled Tasks,cn=Tasks' % taskID
</script>
@@ -3795,8 +3795,8 @@
m.update(location)
m.update(dsPath)
taskLdifFile='rebuildIndex-task-%s.ldif' % m.hexdigest()
- taskLdif='%s/../%s/%s' % (dsPath,relativeDataDir,taskLdifFile)
- tmpTaskLdif='%s/%s' % (logsTempDir,taskLdifFile)
+ taskLdif='%s/%s' % (remote.temp,taskLdifFile)
+ tmpTaskLdif='%s/%s' % (local.temp,taskLdifFile)
taskDN='ds-task-id=%s,cn=Scheduled Tasks,cn=Tasks' % taskID
</script>
diff --git a/opendj-sdk/opends/tests/shared/functions/environment.xml b/opendj-sdk/opends/tests/shared/functions/environment.xml
index a7f94c0..db57ea9 100755
--- a/opendj-sdk/opends/tests/shared/functions/environment.xml
+++ b/opendj-sdk/opends/tests/shared/functions/environment.xml
@@ -151,6 +151,15 @@
True = 1
False = 0
+ # this function return a well-formatted testcase name
+ def getTestCaseName(name):
+ return '%s: %s: %s' % (CurrentTestPath['group'],CurrentTestPath['suite'],name)
+
+ # this functions adds a known issue to a testcase's known issues list
+ issuesList=[]
+ def knownIssue(issue):
+ issuesList.append(issue)
+
DSCONFIG = 'dsconfig'
DSREPLICATION = 'dsreplication'
@@ -272,111 +281,201 @@
</function>
- <function name="SetLogsDir">
+ <function name="SetFolders">
<function-prolog>
- This function sets the directory to which logs are written
+ This function sets the folders to which test data are written.
</function-prolog>
+ <function-map-args>
+ <function-arg-def name="sourceDir" type="required">
+ <function-arg-description>
+ A locally accessable directory to the tests source
+ </function-arg-description>
+ <function-arg-property name="type" value="structure"/>
+ </function-arg-def>
+ <function-arg-def name="localDir" type="required">
+ <function-arg-description>
+ A locally accessable directory to write test information
+ </function-arg-description>
+ <function-arg-property name="type" value="structure"/>
+ </function-arg-def>
+ <function-arg-def name="remoteDir" type="required">
+ <function-arg-description>
+ A remotely accessable directory to write test information
+ </function-arg-description>
+ <function-arg-property name="type" value="structure"/>
+ </function-arg-def>
+ </function-map-args>
<sequence>
<script>
- logsDate=strftime("%Y%m%d-%H%M%S",localtime())
- logsArch=DSInfo.getServerArch(DSInfo.ServerDict['system os'])
- logsOSName=DSInfo.getServerOSName(DSInfo.ServerDict['system os'])
- logsOS='%s-%s' % (logsOSName,logsArch)
- logsJvm=DSInfo.getServerJavaMajorMinor(DSInfo.ServerDict['java version'])
- logsDir='%s/%s/%s-jvm%s' % (LOGS_ROOT,logsDate,logsOS,logsJvm)
- logsTestsDir='%s/testlogs' % logsDir
- logsReportDir='%s/reports' % logsDir
- logsSUTDir='%s/sutlogs' % logsDir
- logsTestDataDir='%s/testdata' % logsDir
- logsTempDir='%s/temp' % logsDir
-
- relativeSharedDir='shared'
- relativeJavaDir='%s/java' % relativeSharedDir
- relativeDataDir='%s/data' % relativeSharedDir
- logsLocalDataDir='%s/%s' % (logsTestDataDir,relativeDataDir)
- logsRemoteDataDir='%s/%s' % (DIRECTORY_INSTANCE_DIR,relativeDataDir)
+ logs = test_env.logs(localDir)
+ source = test_env.source(sourceDir)
+ local = test_env.data(localDir)
+ remote = test_env.data(remoteDir)
</script>
- <message>
- 'Tests logs output set to %s' % logsDir
- </message>
-
- <call function="'SetVar'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'type' : 'shared',
- 'variable' : 'Job%s_LogsDir=%s' % (STAXJobID,logsDir) }
- </call>
+ <message>'source.directory = %s' % source.directory</message>
+ <message>'local.directory = %s' % local.directory</message>
+ <message>'remote.directory = %s' % remote.directory</message>
+ <message>'logs.directory = %s' % logs.directory</message>
+
+ <return>
+ local.directory
+ </return>
+ </sequence>
+
+ </function>
+
+ <function name="CreateFolders" scope="local">
+ <function-prolog>
+ This function sets the folders to which logs are written
+ </function-prolog>
+
+ <sequence>
+
<!-- Create folders -->
- <message>'Create folder %s' % logsReportDir</message>
+ <message>'Create local folder %s' % logs.reports</message>
<call function="'createFolder'">
{ 'location' : STAF_LOCAL_HOSTNAME,
- 'foldername' : '%s' % logsReportDir }
+ 'foldername' : '%s' % logs.reports }
</call>
- <message>'Create folder %s' % logsTempDir</message>
+ <message>'Create local folder %s' % local.temp</message>
<call function="'createFolder'">
{ 'location' : STAF_LOCAL_HOSTNAME,
- 'foldername' : '%s' % logsTempDir }
+ 'foldername' : '%s' % local.temp }
</call>
- <message>'Create folder %s' % logsSUTDir</message>
+ <message>'Create local folder %s' % logs.sut</message>
<call function="'createFolder'">
{ 'location' : STAF_LOCAL_HOSTNAME,
- 'foldername' : '%s' % logsSUTDir }
+ 'foldername' : '%s' % logs.sut }
</call>
- <message>'Create folder %s' % logsTestsDir</message>
+ <message>'Create local folder %s' % logs.tests</message>
<call function="'createFolder'">
{ 'location' : STAF_LOCAL_HOSTNAME,
- 'foldername' : '%s' % logsTestsDir }
+ 'foldername' : '%s' % logs.tests }
</call>
- <message>'Create folder %s' % logsTestDataDir</message>
+ <message>'Create local folder %s' % local.testdata</message>
<call function="'createFolder'">
{ 'location' : STAF_LOCAL_HOSTNAME,
- 'foldername' : '%s' % logsTestDataDir }
+ 'foldername' : '%s' % local.testdata }
+ </call>
+
+ <message>'Create remote folder %s' % remote.temp</message>
+ <call function="'createFolder'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'foldername' : '%s' % remote.temp }
</call>
</sequence>
</function>
- <function name="loadEnvironment">
+ <function name="loadGlobalEnvironment">
<function-prolog>
This function loads the environment (libraries, functions, variables)
- needed by the tests.
+ needed by the global test job farmer.
</function-prolog>
<sequence>
- <message>
- 'Load environment for test suite execution.'
- </message>
-
- <call function="'importSharedLibraries'"/>
-
- <call function="'importPythonLibraries'"/>
-
- <call function="'initialiseGlobalVariables'"/>
-
+ <message>
+ 'Load environment for test suite execution.'
+ </message>
+
+ <call function="'importSharedLibraries'"/>
+
+ <call function="'importPythonLibraries'"/>
+
+ <call function="'initialiseGlobalVariables'"/>
+
<call function="'GetDirectoryServerInformation'"/>
- <call function="'SetLogsDir'"/>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
+ <!-- Set variables to build unique path to store data -->
+ <script>
+ # Private
+ logsDate=strftime("%Y%m%d-%H%M%S",localtime())
+ logsArch=\
+ DSInfo.getServerArch(DSInfo.ServerDict['system os'])
+ logsOSName=\
+ DSInfo.getServerOSName(DSInfo.ServerDict['system os'])
+ logsOS='%s-%s' % (logsOSName,logsArch)
+ logsJvm=\
+ DSInfo.getServerJavaMajorMinor(DSInfo.ServerDict['java version'])
+ </script>
+
+ <call function="'SetFolders'">
+ { 'sourceDir' : '%s' % TESTS_ROOT,
+ 'localDir' : '%s/%s/%s-jvm%s' % (LOGS_ROOT,logsDate,logsOS,logsJvm),
+ 'remoteDir' : DIRECTORY_INSTANCE_DIR }
</call>
-
-
- </sequence>
+
+ <call function="'SetVar'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'type' : 'shared',
+ 'variable' : 'Job%s_LogsDir=%s' % (STAXJobID,local.directory) }
+ </call>
+
+ <!-- Create the local folders to store data -->
+ <call function="'CreateFolders'"/>
+
+ </sequence>
</function>
+ <function name="loadJobEnvironment">
+ <function-prolog>
+ This function loads the environment (libraries, functions, variables)
+ needed by the test jobs.
+ </function-prolog>
+ <function-map-args>
+ <function-arg-def name="parent" type="optional" default="''">
+ <function-arg-description>
+ Location of target host
+ </function-arg-description>
+ <function-arg-property name="type" value="integer"/>
+ </function-arg-def>
+ </function-map-args>
+
+ <sequence>
+ <message>
+ 'Load environment for test suite execution.'
+ </message>
+
+ <call function="'importSharedLibraries'"/>
+
+ <call function="'importPythonLibraries'"/>
+
+ <call function="'initialiseGlobalVariables'"/>
+
+ <call function="'GetVar'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'type' : 'shared',
+ 'variable' : 'Job%s_LogsDir' % parent }
+ </call>
+
+ <!-- TODO: defend against mangled STAFResult -->
+ <script>
+ parentsLogDir=STAFResult
+ </script>
+
+ <message>'%s' % parentsLogDir</message>
+
+ <call function="'SetFolders'">
+ { 'sourceDir' : '%s' % TESTS_ROOT,
+ 'localDir' : '%s' % parentsLogDir,
+ 'remoteDir' : DIRECTORY_INSTANCE_DIR }
+ </call>
+
+ </sequence>
+
+ </function>
</stax>
diff --git a/opendj-sdk/opends/tests/shared/functions/ldap.xml b/opendj-sdk/opends/tests/shared/functions/ldap.xml
index 08c42fe..0281349 100755
--- a/opendj-sdk/opends/tests/shared/functions/ldap.xml
+++ b/opendj-sdk/opends/tests/shared/functions/ldap.xml
@@ -2715,8 +2715,8 @@
'command' : '%s/bin/java' % JAVA_HOME,
'arguments' : '%s %s' % (STAFCmd,STAFCmdParams),
'location' : location,
- 'path' : '%s/../%s/ldap' % (dsPath,relativeJavaDir),
- 'env' : ['PATH=/bin:/usr/bin:%s/bin' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME,'CLASSPATH=%s/../%s/ldap' % (dsPath,relativeJavaDir)],
+ 'env' : ['PATH=/bin:/usr/bin:%s/bin' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME,'CLASSPATH=%s/../%s/ldap' % (dsPath,remote.reljavadir)],
+ 'path' : '%s/../%s/ldap' % (dsPath,remote.reljavadir),
'expectedRC': expectedRC
}
</call>
@@ -2958,8 +2958,8 @@
'command' : '%s/bin/java' % JAVA_HOME,
'arguments' : '%s %s' % (STAFCmd,STAFCmdParams),
'location' : location,
- 'env' : ['PATH=/bin:/usr/bin:%s/bin' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME,'CLASSPATH=%s/../%s/ldap' % (dsPath,relativeJavaDir)],
- 'path' : '%s/../%s/ldap' % (dsPath,relativeJavaDir),
+ 'env' : ['PATH=/bin:/usr/bin:%s/bin' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME,'CLASSPATH=%s/../%s/ldap' % (dsPath,remote.reljavadir)],
+ 'path' : '%s/../%s/ldap' % (dsPath,remote.reljavadir),
'expectedRC': expectedRC
}
</call>
@@ -3070,8 +3070,8 @@
'command' : '%s/bin/java' % JAVA_HOME,
'arguments' : '%s %s' % (STAFCmd,STAFCmdParams),
'location' : location,
- 'env' : ['PATH=/bin:/usr/bin:%s/bin' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME,'CLASSPATH=%s/../%s' % (dsPath,relativeJavaDir)],
- 'path' : '%s/../%s' % (dsPath,relativeJavaDir),
+ 'env' : ['PATH=/bin:/usr/bin:%s/bin' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME,'CLASSPATH=%s/../%s/ldap' % (dsPath,remote.reljavadir)],
+ 'path' : '%s/../%s/ldap' % (dsPath,remote.reljavadir),
'expectedRC': expectedRC
}
</call>
diff --git a/opendj-sdk/opends/tests/shared/functions/snmp.xml b/opendj-sdk/opends/tests/shared/functions/snmp.xml
index 41b0e5a..c02a203 100755
--- a/opendj-sdk/opends/tests/shared/functions/snmp.xml
+++ b/opendj-sdk/opends/tests/shared/functions/snmp.xml
@@ -166,7 +166,7 @@
separator=':'
opends_jarfile='%s/%s' % (DIRECTORY_INSTANCE_DIR,SNMP_OPENDS_JARFILE)
- snmpPath='%s/%s/snmp' % (DIRECTORY_INSTANCE_DIR, relativeJavaDir)
+ snmpPath='%s/snmp' % remote.java
jdmk_jarfile='%s/jdmkrt.jar' % snmpPath
emma_jarfile='%s/%s/lib/emma.jar' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
@@ -190,7 +190,7 @@
'command' : '%s/bin/java' % JAVA_HOME ,
'arguments' : '%s %s' % (STAFCmd, STAFCmdParams) ,
'location' : location ,
- 'path' : '%s/%s/snmp' % (DIRECTORY_INSTANCE_DIR, relativeJavaDir),
+ 'path' : '%s/snmp' % remote.java,
'env' : env ,
'expectedRC' : expectedRC
}
@@ -334,7 +334,7 @@
separator=':'
opends_jarfile='%s/%s' % (DIRECTORY_INSTANCE_DIR,SNMP_OPENDS_JARFILE)
- snmpPath='%s/%s/snmp' % (DIRECTORY_INSTANCE_DIR, relativeJavaDir)
+ snmpPath='%s/snmp' % remote.java
jdmk_jarfile='%s/jdmkrt.jar' % snmpPath
emma_jarfile='%s/%s/lib/emma.jar' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
@@ -358,7 +358,7 @@
'command' : '%s/bin/java' % JAVA_HOME ,
'arguments' : '%s %s' % (STAFCmd, STAFCmdParams) ,
'location' : location ,
- 'path' : '%s/%s/snmp' % (DIRECTORY_INSTANCE_DIR, relativeJavaDir),
+ 'path' : '%s/snmp' % remote.java,
'env' : env ,
'expectedRC' : expectedRC
}
@@ -466,7 +466,7 @@
separator=':'
opends_jarfile='%s/%s' % (DIRECTORY_INSTANCE_DIR,SNMP_OPENDS_JARFILE)
- snmpPath='%s/%s/snmp' % (DIRECTORY_INSTANCE_DIR, relativeJavaDir)
+ snmpPath='%s/snmp' % remote.java
jdmk_jarfile='%s/jdmkrt.jar' % snmpPath
cp = 'CLASSPATH=%s%s%s%s%s%s.' \
% (opends_jarfile,separator,jdmk_jarfile,separator,jstaf_jarfile,separator)
diff --git a/opendj-sdk/opends/tests/shared/functions/stafcmd.xml b/opendj-sdk/opends/tests/shared/functions/stafcmd.xml
index ab709ca..c38c782 100755
--- a/opendj-sdk/opends/tests/shared/functions/stafcmd.xml
+++ b/opendj-sdk/opends/tests/shared/functions/stafcmd.xml
@@ -513,13 +513,13 @@
</function-arg-def>
<function-arg-def name="type" type="required">
<function-arg-description>
- Name of file to be deleted
+ Type of variable
</function-arg-description>
<function-arg-property name="type" value="variable"/>
</function-arg-def>
<function-arg-def name="variable" type="required">
<function-arg-description>
- Name of file to be deleted
+ Name of variable
</function-arg-description>
<function-arg-property name="type" value="variable"/>
</function-arg-def>
diff --git a/opendj-sdk/opends/tests/shared/functions/topology.xml b/opendj-sdk/opends/tests/shared/functions/topology.xml
index b61e5b3..e16b742 100755
--- a/opendj-sdk/opends/tests/shared/functions/topology.xml
+++ b/opendj-sdk/opends/tests/shared/functions/topology.xml
@@ -157,9 +157,9 @@
<sequence>
<!-- ON LOCAL HOST: get data ready to copy to remote host -->
<script>
- testsGroupDir='%s/%s/%s' % (TESTS_DIR,relativeDataDir,groupDataDir)
- localTestsGroupDir='%s/%s' % (logsLocalDataDir,groupDataDir)
- remoteTestsGroupDir='%s/%s' % (logsRemoteDataDir,groupDataDir)
+ sourceTestsGroupDir='%s/%s' % (source.data,groupDataDir)
+ localTestsGroupDir ='%s/%s' % (local.data, groupDataDir)
+ remoteTestsGroupDir='%s/%s' % (remote.data,groupDataDir)
</script>
<call function="'GetEntry'">
@@ -176,11 +176,12 @@
<!-- Locally copy static data files to temporary staging area -->
<!-- LDIF (.ldif) test data files -->
<message>
- 'Copy ldif data files locally to %s.' % localTestsGroupDir
+ 'Copy ldif data files locally from %s to %s.' % \
+ (sourceTestsGroupDir,localTestsGroupDir)
</message>
<call function="'CopyFolderByExtension'">
{ 'location' : STAXServiceMachine,
- 'srcfolder' : testsGroupDir,
+ 'srcfolder' : sourceTestsGroupDir,
'destfolder' : localTestsGroupDir,
'extension' : 'ldif'
}
@@ -191,11 +192,12 @@
<sequence>
<!-- add file extension test data files -->
<message>
- 'Copy %s data files locally to %s.' % (ft,localTestsGroupDir)
+ 'Copy %s data files locally from %s to %s.' % \
+ (ft,sourceTestsGroupDir,localTestsGroupDir)
</message>
<call function="'CopyFolderByExtension'">
{ 'location' : STAXServiceMachine,
- 'srcfolder' : testsGroupDir,
+ 'srcfolder' : sourceTestsGroupDir,
'destfolder' : localTestsGroupDir,
'extension' : '%s' % ft
}
@@ -206,11 +208,12 @@
<!-- LDIF (.ldif) files for quickinstall -->
<script>
- quickStartGroupDir='%s/%s/quickstart' % (TESTS_DIR,relativeDataDir)
- quickStartLocalTestsGroupDir='%s/quickstart' % (logsLocalDataDir)
+ quickStartGroupDir='%s/quickstart' % (source.data)
+ quickStartLocalTestsGroupDir='%s/quickstart' % local.data
</script>
<message>
- 'Copy ldif data files locally to %s.' % quickStartLocalTestsGroupDir
+ 'Copy quickstart ldif data files locally from %s to %s.' % \
+ (quickStartGroupDir,quickStartLocalTestsGroupDir)
</message>
<call function="'CopyFolderByExtension'">
{ 'location' : STAXServiceMachine,
@@ -222,11 +225,12 @@
<!-- PWD (.pwd) files -->
<message>
- 'Copy pwd data files locally to %s.' % localTestsGroupDir
+ 'Copy pwd data files locally from %s to %s.' % \
+ (sourceTestsGroupDir,localTestsGroupDir)
</message>
<call function="'CopyFolderByExtension'">
{ 'location' : STAXServiceMachine,
- 'srcfolder' : testsGroupDir,
+ 'srcfolder' : sourceTestsGroupDir,
'destfolder' : localTestsGroupDir,
'extension' : 'pwd'
}
@@ -234,11 +238,12 @@
<!-- Archive (.gz) files -->
<message>
- 'Copy gz data files locally to %s.' % localTestsGroupDir
+ 'Copy gz data files locally from %s to %s.' % \
+ (sourceTestsGroupDir,localTestsGroupDir)
</message>
<call function="'CopyFolderByExtension'">
{ 'location' : STAXServiceMachine,
- 'srcfolder' : testsGroupDir,
+ 'srcfolder' : sourceTestsGroupDir,
'destfolder' : localTestsGroupDir,
'extension' : 'gz'
}
@@ -246,11 +251,12 @@
<!-- Archive (.ref) files -->
<message>
- 'Copy ref data files locally to %s.' % localTestsGroupDir
+ 'Copy ref data files locally from %s to %s.' % \
+ (sourceTestsGroupDir,localTestsGroupDir)
</message>
<call function="'CopyFolderByExtension'">
{ 'location' : STAXServiceMachine,
- 'srcfolder' : testsGroupDir,
+ 'srcfolder' : sourceTestsGroupDir,
'destfolder' : localTestsGroupDir,
'extension' : 'ref'
}
@@ -258,11 +264,12 @@
<!-- Archive (ldap/.java) files -->
<script>
- javaSharedDir='%s/ldap' % (TESTS_JAVA_DIR)
- javaLocalDir='%s/shared/java/ldap' % (logsTestDataDir)
+ javaSharedDir='%s/ldap' % source.java
+ javaLocalDir ='%s/ldap' % local.java
</script>
<message>
- 'Copy java files locally to %s.' % javaLocalDir
+ 'Copy java files locally from %s to %s.' % \
+ (javaSharedDir,javaLocalDir)
</message>
<call function="'CopyFolderByExtension'">
{
@@ -299,11 +306,12 @@
<!-- Archive (.security) files -->
<message>
- 'Copy security data files locally to %s.' % localTestsGroupDir
+ 'Copy security data files locally from %s to %s.' % \
+ (sourceTestsGroupDir,localTestsGroupDir)
</message>
<call function="'CopyFolderByExtension'">
{ 'location' : STAXServiceMachine,
- 'srcfolder' : testsGroupDir,
+ 'srcfolder' : sourceTestsGroupDir,
'destfolder' : localTestsGroupDir,
'extension' : 'security'
}
@@ -311,11 +319,12 @@
<!-- Archive (snmp/.java) files -->
<script>
- javaSharedDir='%s/snmp' % (TESTS_JAVA_DIR)
- javaLocalDir='%s/shared/java/snmp' % (logsTestDataDir)
+ javaSharedDir = '%s/snmp' % source.java
+ javaLocalDir = '%s/snmp' % local.java
</script>
<message>
- 'Copy java files locally to %s.' % javaLocalDir
+ 'Copy java files locally from %s to %s.' % \
+ (javaSharedDir,javaLocalDir)
</message>
<call function="'CopyFolderByExtension'">
{
@@ -349,7 +358,8 @@
<sequence>
<!--- Install DS Copy zip file -->
<message>
- 'Copy DS zip archive locally to %s.' % TMPDIR
+ 'Copy DS zip archive locally from %s to %s.' % \
+ (ZIPPATH,TMPDIR)
</message>
<call function="'copyFile'">
{
@@ -432,7 +442,7 @@
<!-- Archive SNMP_OPENDMK_JARFILE file -->
<message>
'Copy OpenDMK jar file %s locally to %s.' \
- % (SNMP_OPENDMK_JARFILE,javaLocalDir)
+ % (SNMP_OPENDMK_JARFILE,javaLocalDir)
</message>
<call function="'copyFile'">
{
@@ -449,55 +459,32 @@
<!-- Delete the any existing testdata archive -->
<message>
- 'Delete %s/testdata.zip' % logsTempDir
+ 'Delete %s/testdata.zip' % local.temp
</message>
<call function="'deleteFile'">
{ 'location' : STAXServiceMachine,
- 'filename' : '%s/testdata.zip' % logsTempDir
- }
- </call>
-
- <!-- Zip up contents of tests directory -->
- <message>
- 'Zip up local data directory to %s/testdata.zip' % logsTempDir
- </message>
- <call function="'zipUpFile'">
- { 'location' : STAXServiceMachine,
- 'zipfile' : '%s/testdata.zip' % logsTempDir ,
- 'folder' : '%s' % localTestsGroupDir ,
- 'relativeto' : logsTestDataDir
- }
- </call>
-
- <message>
- 'Zip up local quickstart directory to %s/testdata.zip' % logsTempDir
- </message>
- <call function="'zipUpFile'">
- { 'location' : STAXServiceMachine,
- 'zipfile' : '%s/testdata.zip' % logsTempDir ,
- 'folder' : '%s' % quickStartLocalTestsGroupDir ,
- 'relativeto' : logsTestDataDir
+ 'filename' : '%s/testdata.zip' % local.temp
}
</call>
<message>
- 'Zip up local java files to %s/testdata.zip' % logsTempDir
+ 'Zip up local testdata files to %s/testdata.zip' % local.temp
</message>
<script>
- javaLocalDir='%s/shared/java' % (logsTestDataDir)
+ javaLocalDir='%s' % local.java
</script>
<call function="'zipUpFile'">
{ 'location' : STAXServiceMachine,
- 'zipfile' : '%s/testdata.zip' % logsTempDir ,
- 'folder' : '%s' % javaLocalDir ,
- 'relativeto' : logsTestDataDir
+ 'zipfile' : '%s/testdata.zip' % local.temp,
+ 'folder' : local.testdata,
+ 'relativeto' : local.directory
}
</call>
</sequence>
<else>
<message>
- 'Test data is already created.'
+ 'Test data for %s group is already created.' % groupDataDir
</message>
</else>
</if>
@@ -608,10 +595,10 @@
<!--- Copy staging data to remote host -->
<message>
- 'Copy %s/testdata.zip to %s on %s' % (logsTestDataDir,dsDir,dsHost)
+ 'Copy %s/testdata.zip to %s on %s' % (local.testdata,dsDir,dsHost)
</message>
<call function="'copyFile'">
- { 'srcfile' : '%s/testdata.zip' % logsTempDir,
+ { 'srcfile' : '%s/testdata.zip' % local.temp,
'destfile' : '%s/testdata.zip' % dsDir,
'remotehost' : dsHost
}
@@ -630,7 +617,7 @@
<!--- Install DS Copy zip file -->
<message>
- 'Copy DS zip archive %s/%s to %s' % (logsTempDir,ZIPNAME,dsHost)
+ 'Copy DS zip archive %s/%s to %s' % (local.temp,ZIPNAME,dsHost)
</message>
<call function="'copyFile'">
{ 'srcfile' : '%s/%s' % (ZIPPATH,ZIPNAME),
@@ -664,8 +651,8 @@
<!-- configure the coverage dump file -->
<script>
- mylog="::coverage - checking for %s/lib/emma.jar\n" % dsPath
- if os.path.exists('%s/lib/emma.jar' % dsPath):
+ mylog="::coverage - checking for %s/%s/lib/emma.jar\n" % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
+ if os.path.exists('%s/%s/lib/emma.jar' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)):
mylog+=" ::coverage on\n"
if not os.path.exists('%s/coverage' % TMPDIR):
os.mkdir('%s/coverage' % TMPDIR)
@@ -675,9 +662,9 @@
os.mkdir('%s/coverage/%s' % (TMPDIR,CurrentTestPath['group']))
mylog+=" ::mkdir %s/coverage/%s on\n" \
% (TMPDIR,CurrentTestPath['group'])
- mylog+=" ::writing to %s/classes/emma.properties" \
- % dsPath
- coveragefh = open( '%s/classes/emma.properties' % dsPath, 'w' )
+ mylog+=" ::writing to %s/%s/classes/emma.properties" \
+ % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
+ coveragefh = open( '%s/%s/classes/emma.properties' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME), 'w' )
coveragefh.write( 'coverage.out.file=%s/coverage/%s/coverage.ec\n' \
% (TMPDIR,CurrentTestPath['group']) )
coveragefh.close()
@@ -744,8 +731,8 @@
syncserver = syncserverMap['instance']
filename = 'replication_conf.ldif'
- filePath = '%s/%s' % (logsTestDataDir,filename)
- dataDir = '%s/%s' % (syncserver.getDir(),relativeDataDir)
+ filePath = '%s/%s' % (local.testdata,filename)
+ dataDir = '%s/%s' % (syncserver.getDir(),remote.reldatadir)
write_replication_conf_ldif_file(filePath, syncserver)
</script>
@@ -757,7 +744,7 @@
<!-- Copy the replication_conf ldif to remote host -->
<message>
- 'Copy %s file from %s to %s' % (filename,logsTestDataDir,dataDir)
+ 'Copy %s file from %s to %s' % (filename,local.testdata,dataDir)
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
@@ -867,7 +854,7 @@
'dsInstanceDn' : syncserver.getRootDn(),
'dsInstancePswd' : syncserver.getRootPwd(),
'entryToBeAdded' : '%s/%s/replication/workaround-2201.ldif' \
- % (syncserver.getDir(), relativeDataDir)
+ % (syncserver.getDir(),remote.reldatadir)
}
</call>
diff --git a/opendj-sdk/opends/tests/shared/functions/utils.xml b/opendj-sdk/opends/tests/shared/functions/utils.xml
index 94792a5..14c5ba3 100755
--- a/opendj-sdk/opends/tests/shared/functions/utils.xml
+++ b/opendj-sdk/opends/tests/shared/functions/utils.xml
@@ -641,11 +641,11 @@
class Test:
def __init__(self, group, suite, fullname, start, stop, failures, successes, issues, duration):
self.message=[]
- self.log='%s/test.log' % logsTempDir
- self.errors='%s/error.log' % logsTempDir
- self.access='%s/access.log' % logsTempDir
+ self.log='%s/test.log' % local.temp
+ self.errors='%s/error.log' % local.temp
+ self.access='%s/access.log' % local.temp
for f in [self.log,self.errors,self.access]:
- if os.path.exists(logsTempDir):
+ if os.path.exists(local.temp):
fh=open(f,'w')
fh.write('')
fh.close()
@@ -816,7 +816,7 @@
thisTest.appendLog(logType, _log)
# save to test log
- testlog=open('%s/tests-log.xml' % logsTestsDir,'a')
+ testlog=open('%s/tests-log.xml' % logs.tests,'a')
testlog.seek(0,2)
testlog.write(thisTest.toXML())
testlog.close()
@@ -903,7 +903,7 @@
FormattedTestgroup=FormattedTestcase.group(ThisGroupName)
FormattedTestsuite=FormattedTestcase.suite(ThisSuiteName)
- TestLogDir= '%s/%s' % (logsTestsDir,FormattedTestgroup)
+ TestLogDir= '%s/%s' % (logs.tests,FormattedTestgroup)
TestLogFile='%s/%s' % (TestLogDir,FormattedTestsuite)
</script>
@@ -938,8 +938,8 @@
# the reason for that is that the topology is created AFTER the
# first test group has started (as part of the first setup)
# the following groups are going to use the same topology
- mylog="::coverage - checking for %s/lib/emma.jar\n" % dsPath
- if os.path.exists('%s/lib/emma.jar' % dsPath):
+ mylog="::coverage - checking for %s/%s/lib/emma.jar\n" % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
+ if os.path.exists('%s/%s/lib/emma.jar' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)):
mylog+=" ::coverage on\n"
if not os.path.exists('%s/coverage' % TMPDIR):
os.mkdir('%s/coverage' % TMPDIR)
@@ -947,8 +947,8 @@
if not os.path.exists('%s/coverage/%s' % (TMPDIR,CurrentTestPath['group'])):
os.mkdir('%s/coverage/%s' % (TMPDIR,CurrentTestPath['group']))
mylog+=" ::mkdir %s/coverage/%s on\n" % (TMPDIR,CurrentTestPath['group'])
- mylog+=" ::writing to %s/classes/emma.properties" % dsPath
- coveragefh = open( '%s/classes/emma.properties' % dsPath, 'w' )
+ mylog+=" ::writing to %s/%s/classes/emma.properties" % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
+ coveragefh = open( '%s/%s/classes/emma.properties' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME), 'w' )
coveragefh.write( 'coverage.out.file=%s/coverage/%s/coverage.ec\n' % (TMPDIR,CurrentTestPath['group']) )
coveragefh.close()
</script>
@@ -976,13 +976,21 @@
</script>
<message>'##### %s group postamble #####' % ThisGroupName</message>
-
- <if expr="os.path.exists('%s/lib/emma.jar' % dsPath)">
+
+ <script>
+ emmaJar='%s/%s/lib/emma.jar' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
+ coverageEm='%s/%s/coverage.em' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
+ coverageEc='%s/coverage/%s/coverage.ec' % (TMPDIR,CurrentTestPath['group'])
+ coverageXml='%s/coverage/%s/coverage.xml' % (TMPDIR,CurrentTestPath['group'])
+ coverageHtml='%s/coverage/%s/coverage.html' % (TMPDIR,CurrentTestPath['group'])
+ </script>
+
+ <if expr="os.path.exists(emmaJar)">
<sequence>
<call function="'runCommand'">
{ 'name' : 'Generate coverage xml report for test group %s' % CurrentTestPath['group'],
'command' : 'java',
- 'arguments' : ' -Xms64M -Xmx512M -cp %s/lib/emma.jar emma report -r xml,html -in %s/coverage.em,%s/coverage/%s/coverage.ec -Dreport.xml.out.file=%s/coverage/%s/coverage.xml -Dreport.html.out.file=%s/coverage/%s/coverage.html -sp %s/../../../src' % (dsPath,dsPath,TMPDIR,CurrentTestPath['group'],TMPDIR,CurrentTestPath['group'],TMPDIR,CurrentTestPath['group'],TMPDIR),
+ 'arguments' : ' -Xms64M -Xmx512M -cp %s emma report -r xml,html -in %s,%s -Dreport.xml.out.file=%s -Dreport.html.out.file=%s -sp %s/../../../src' % (emmaJar,coverageEm,coverageEc,coverageXml,coverageHtml,TMPDIR),
'path' : TMPDIR
}
</call>
@@ -1007,7 +1015,7 @@
if thisNodeAttributes.getNamedItem("type").getNodeValue() == 'block, %':
rawCoverage = thisNodeAttributes.getNamedItem("value").getNodeValue()
coverage = rawCoverage.split('%')[0]
- testlog=open('%s/tests-log.xml' % logsTestsDir,'a')
+ testlog=open('%s/tests-log.xml' % logs.tests,'a')
testlog.seek(0,2)
testlog.write(" <group>\n")
testlog.write(" <name>\n")
@@ -1022,7 +1030,7 @@
</sequence>
<else>
<script>
- testlog=open('%s/tests-log.xml' % logsTestsDir,'a')
+ testlog=open('%s/tests-log.xml' % logs.tests,'a')
testlog.seek(0,2)
testlog.write(" <group>\n")
testlog.write(" <name>\n")
@@ -1487,9 +1495,9 @@
if not env:
if is_windows_platform(location):
- env=['PATH=C:\Windows;C:\Windows\system32;%s' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME]
+ env=['PATH=C:\Windows;C:\Windows\system32;%s' % path, 'JAVA_HOME=%s' % JAVA_HOME]
else:
- env=['PATH=/bin:/usr/bin:%s' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME]
+ env=['PATH=/bin:/usr/bin:%s' % path, 'JAVA_HOME=%s' % JAVA_HOME]
</script>
<message>
'%s: Running command:\n %s %s\nlocation: %s\nenv: %s\nworkdir: %s' % (_id,command,arguments,location,env,path)
@@ -1859,7 +1867,7 @@
refFile = '%s.ref' % tmpName
if not refPath:
- refPath = '%s/%s' % (logsLocalDataDir,FormattedTestgroup)
+ refPath = '%s/%s' % (local.data,FormattedTestgroup)
if not diffFile:
regexp = re.compile('\..*$')
@@ -1867,7 +1875,7 @@
diffFile = '%s.diff' % tmpName
if not diffPath:
- diffPath = '%s/%s/diffs' % (logsTestsDir,FormattedTestgroup)
+ diffPath = '%s/%s/diffs' % (logs.tests,FormattedTestgroup)
else:
diffPath = '%s/diffs' % (diffPath)
@@ -2014,14 +2022,6 @@
</function-map-args>
<sequence>
- <call function="'ResolveVar'" >
- {
- 'location' : location ,
- 'type' : 'STRING',
- 'name' : 'STAF/Env/JAVA_HOME'
- }
- </call>
- <script>local_java_home = '%s' % STAFResult</script>
<!-- Build the command -->
<script>
@@ -2036,7 +2036,7 @@
cp = 'CLASSPATH=.'
if location == STAXServiceMachine:
- cmd = '%s/bin/javac' % local_java_home
+ cmd = '%s/bin/javac' % LOCAL_JAVA_HOME
env = ['%s' % cp]
else:
cmd = '%s/bin/javac' % JAVA_HOME
diff --git a/opendj-sdk/opends/tests/shared/python/common.py b/opendj-sdk/opends/tests/shared/python/common.py
index 63928f7..ec585da 100644
--- a/opendj-sdk/opends/tests/shared/python/common.py
+++ b/opendj-sdk/opends/tests/shared/python/common.py
@@ -37,7 +37,9 @@
"is_windows_platform",
"create_property_table",
"compare_property_table",
- "exception_thrown" ]
+ "exception_thrown",
+ "directory_server",
+ "test_env" ]
class format_testcase:
'Format the Test name objects'
@@ -233,3 +235,108 @@
result = result + ' should be the same.\n'
return result
+
+class directory_server:
+ 'Container to hold DS instance objects'
+ def __init__(self):
+ self.location=''
+ self.host=''
+ self.port=''
+ self.dn=''
+ self.password=''
+
+ def location(self,location):
+ return location
+
+ def host(self,name):
+ return name
+
+ def port(self,port):
+ return port
+
+ def dn(self,dn):
+ return dn
+
+ def password(self,pswd):
+ return pswd
+
+ def suffix(self,sfx):
+ return sfx
+
+class test_env:
+ 'Container to hold test environment instance objects'
+ def __init__(self):
+ self.environment=''
+
+ class source:
+ 'Container to hold source data instance objects'
+ def __init__(self,dir):
+ self.directory=dir
+ self.data='%s/functional-tests/shared/data' % dir
+ self.common='%s/shared' % dir
+ self.java='%s/java' % self.common
+
+ def get_directory(self):
+ return self.directory
+
+ def get_data(self):
+ return self.data
+
+ def get_common(self):
+ return self.common
+
+ def get_java(self):
+ return self.java
+
+ class logs:
+ 'Container to hold test log instance objects'
+ def __init__(self,dir):
+ self.directory=dir
+ self.tests='%s/testlogs' % dir
+ self.reports='%s/reports' % dir
+ self.sut='%s/sutlogs' % dir
+
+ def get_directory(self):
+ return self.directory
+
+ def get_tests(self):
+ return self.tests
+
+ def get_reports(self):
+ return self.reports
+
+ def get_sut(self):
+ return self.sut
+
+ class data:
+ 'Container to hold local and remote test data instance objects'
+ def __init__(self,dir):
+ self.directory=dir
+ self.testdata='%s/testdata' % dir
+ self.java='%s/java' % self.testdata
+ self.data='%s/data' % self.testdata
+ self.temp='%s/temp' % dir
+ self.reldatadir='testdata/data'
+ self.reljavadir='testdata/java'
+
+ def get_directory(self):
+ return self.directory
+
+ def get_testdata(self):
+ return self.testdata
+
+ def get_java(self):
+ return self.java
+
+ def get_data(self):
+ return self.data
+
+ def get_temp(self):
+ return self.temp
+
+ def get_reldatadir(self):
+ return self.directory
+
+ def get_reljavadir(self):
+ return self.directory
+
--
Gitblit v1.10.0