From 8dec4a98ad5855963901f16379ca0458f76d0860 Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Thu, 12 Apr 2007 18:17:07 +0000
Subject: [PATCH] Fix for situations where python scripts access ldif files on local machine and ldapmodify operations are performed with ldif files on the remote machine.
---
opends/tests/functional-tests/testcases/aci/aci_add_entry.xml | 202 +++++-----
opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml | 363 +++++------------
opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml | 152 +++---
opends/tests/functional-tests/testcases/aci/aci_target.xml | 76 +-
opends/tests/functional-tests/testcases/aci/aci_targetattr.xml | 126 +++---
opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml | 252 ++++++------
6 files changed, 519 insertions(+), 652 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml b/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
index 89b73ae..e439aba 100644
--- a/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
@@ -119,8 +119,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_add_entry/add_allow-add_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_allow-add_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -132,7 +132,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -254,8 +254,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_add_entry/add_allow-add_aci2.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_allow-add_aci2.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -263,11 +263,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -406,8 +406,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_add_entry/add_allow-add_aci3.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_allow-add_aci3.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -415,11 +415,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -553,8 +553,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_add_entry/add_allow-delete_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_allow-delete_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -562,11 +562,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -655,8 +655,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_add_entry/add_targetfilter_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_targetfilter_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -664,11 +664,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -787,8 +787,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_add_entry/add_targetfilter_aci2.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_targetfilter_aci2.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -796,11 +796,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -906,8 +906,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_add_entry/add_targetattr_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_targetattr_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -915,11 +915,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1041,8 +1041,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_add_entry/add_targattrfilter_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_targattrfilter_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1050,11 +1050,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1175,8 +1175,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_add_entry/add_targattrfilter_aci2.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_targattrfilter_aci2.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1184,11 +1184,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1307,8 +1307,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_add_entry/add_targattrfilter_aci3.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_targattrfilter_aci3.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1316,11 +1316,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1423,8 +1423,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_add_entry/add_multi_acis1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_multi_acis1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1432,11 +1432,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1539,8 +1539,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_add_entry/add_multi_acis2.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_multi_acis2.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1548,11 +1548,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1656,8 +1656,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_add_entry/add_multi_acis3.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_multi_acis3.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1665,11 +1665,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1788,8 +1788,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_add_entry/add_multi_acis4.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_multi_acis4.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1797,11 +1797,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1905,8 +1905,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_add_entry/add_multi_acis5.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_multi_acis5.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_add_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1914,11 +1914,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
diff --git a/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml b/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
index 46d26c1..1aa2fa5 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
@@ -158,8 +158,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_allow-delete_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_allow-delete_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -167,11 +167,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -294,8 +294,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_allow-delete_aci2.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_allow-delete_aci2.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -303,11 +303,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -446,8 +446,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_allow-delete_aci3.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_allow-delete_aci3.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -455,11 +455,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -594,8 +594,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_allow-write_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_allow-write_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -603,11 +603,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -696,8 +696,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_targetfilter_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_targetfilter_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -705,11 +705,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -828,8 +828,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_targetfilter_aci2.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_targetfilter_aci2.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -837,11 +837,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -944,8 +944,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_targetfilter_aci3.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_targetfilter_aci3.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -953,11 +953,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1060,8 +1060,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_targetfilter_aci4.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_targetfilter_aci4.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1069,11 +1069,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1176,8 +1176,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_targetfilter_aci5.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_targetfilter_aci5.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1185,11 +1185,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1294,8 +1294,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_targetattr_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_targetattr_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1303,11 +1303,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1410,8 +1410,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_targetattr_aci2.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_targetattr_aci2.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1419,11 +1419,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1527,8 +1527,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_targattrfilter_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_targattrfilter_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1536,11 +1536,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1643,8 +1643,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_allow-delete_aci4.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_allow-delete_aci4.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1652,11 +1652,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1761,8 +1761,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_multi_acis1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_multi_acis1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1770,11 +1770,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1877,8 +1877,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_multi_acis2.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_multi_acis2.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1886,11 +1886,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1994,8 +1994,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_multi_acis3.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_multi_acis3.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -2003,11 +2003,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2126,8 +2126,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_multi_acis4.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_multi_acis4.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -2135,11 +2135,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2243,8 +2243,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_delete_entry/add_multi_acis5.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_multi_acis5.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_delete_entry/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -2252,11 +2252,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml b/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
index ebcd2e0..8d5bf29 100644
--- a/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
@@ -171,8 +171,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -184,7 +184,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -323,8 +323,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci2.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci2.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -332,11 +332,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -473,8 +473,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci3.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci3.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -482,11 +482,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -607,8 +607,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci4.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci4.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -616,11 +616,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -741,8 +741,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci5.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci5.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -750,11 +750,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -874,8 +874,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci17.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci17.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -883,11 +883,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1007,8 +1007,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci6.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci6.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1016,11 +1016,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1117,8 +1117,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci7.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci7.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1126,11 +1126,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<call function="'checktestRC'">
@@ -1163,8 +1163,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci8.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci8.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1172,11 +1172,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<call function="'checktestRC'">
@@ -1209,8 +1209,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci9.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci9.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1218,11 +1218,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1271,8 +1271,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci10.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci10.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1280,11 +1280,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1333,8 +1333,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci11.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci11.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1342,11 +1342,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<call function="'checktestRC'">
@@ -1379,8 +1379,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci12.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci12.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1388,11 +1388,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1441,8 +1441,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci13.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci13.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1450,11 +1450,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<call function="'checktestRC'">
@@ -1487,8 +1487,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci14.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci14.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1496,11 +1496,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<call function="'checktestRC'">
@@ -1533,8 +1533,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci15.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci15.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1542,11 +1542,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<call function="'checktestRC'">
@@ -1579,8 +1579,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci16.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci16.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targattrfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1588,11 +1588,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<call function="'checktestRC'">
@@ -1606,139 +1606,6 @@
</sequence>
</testcase>
- <!---
- Place test-specific test information here.
- The tag, TestMarker, must be the same as the tag, TestSuiteName.
- #@TestMarker ACI Targattrfilter Tests
- #@TestName Targattrfilter equals add:street,del:street, street not present
- #@TestIssue 437
- #@TestPurpose Test with the targattrfilter set equal to add:street,del:street
- #@TestPreamble Admin adds an aci with the target equal to the dn of one existing branch.
- #@TestStep Client replaces st in an entry with the targeted branch dn.
- #@TestStep Client replaces mail in an entry with the targeted branch dn.
- #@TestStep Client replaces st in an entry that is not with the targeted branch dn.
- #@TestStep Remove aci.
- #@TestStep Client replaces st from an entry with the previously targeted branch dn.
- #@TestPostamble none
- #@TestResult Success if OpenDS returns 0
- for all ldapmodify operations,
- 0 for step 1, and
- 50 for all other steps.
- -->
- <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
- <!-- cross reference to DS6 docs -->
- <testcase name="'ACI: Targattrfilter: Targattrfilter equals add:street,del:street wildcard only, street not present'">
- <sequence>
- <call function="'testCase_Preamble'"/>
-
- <script>
- curr_aci_ldif_file = '%s/aci/aci_targattrfilter/add_aci17.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
- </script>
-
- <message>
- 'ACI: Targattrfilter: Targattrfilter equals add:street,del:street wildcard only, street not present, preamble adding aci,\n %s' % curr_aci
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
- </call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
- <message>
- 'ACI: Targattrfilter: Targattrfilter equals add:street,del:street wildcard only, street not present, user replacing street in targeted entry'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- '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' % STAGED_DATA_DIR }
- </call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
- <message>
- 'ACI: Targattrfilter: Targattrfilter equals add:street,del:street wildcard only, street not present, user replacing mail in targeted entry'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- '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' % STAGED_DATA_DIR }
- </call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
- <message>
- 'ACI: Targattrfilter: Targattrfilter equals add:street,del:street wildcard only, street not present, user replacing street in non-targeted entry'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- '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' % STAGED_DATA_DIR }
- </call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
- <message>
- 'ACI: Targattrfilter: Targattrfilter equals add:street,del:street wildcard only, street not present, admin deleting aci'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % STAGED_DATA_DIR }
- </call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
- <message>
- 'ACI: Targattrfilter: Targattrfilter equals add:street,del:street wildcard only, street not present, user replacing street in previously targeted entry'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- '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' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
- </testcase>
-
<!---
Place test-specific test information here.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
diff --git a/opends/tests/functional-tests/testcases/aci/aci_target.xml b/opends/tests/functional-tests/testcases/aci/aci_target.xml
index 2289290..110567a 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_target.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_target.xml
@@ -167,8 +167,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_target/add_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -180,7 +180,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -310,8 +310,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_target/add_entries1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_entries1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -323,7 +323,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s' % curr_aci_ldif_file }
+ 'entryToBeAdded' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -471,8 +471,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_target/add_aci3.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci3.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -484,7 +484,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -613,8 +613,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_target/add_aci4.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci4.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -626,7 +626,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -755,8 +755,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_target/add_aci5.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci5.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -768,7 +768,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -897,8 +897,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_target/add_aci6.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci6.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -910,7 +910,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1036,8 +1036,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_target/add_aci8.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci8.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1049,7 +1049,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1106,8 +1106,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_target/add_aci9.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci9.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1119,7 +1119,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 50">
@@ -1177,8 +1177,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_target/add_aci9a.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci9a.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1190,7 +1190,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1317,10 +1317,10 @@
<sequence>
<call function="'testCase_Preamble'"/>
- <script>
- curr_aci_ldif_file = '%s/aci/aci_target/add_aci10.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
- </script>
+ <script>
+ curr_aci_ldif_file = 'add_aci10.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ </script>
<message>
'ACI: Target: Multiple Targets - add aci,\n %s' % curr_aci
@@ -1331,7 +1331,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1389,8 +1389,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_target/add_aci11.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci11.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1402,7 +1402,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1460,8 +1460,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_target/add_aci12.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci12.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1473,7 +1473,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml b/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
index 99faa85..30aa92d 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
@@ -165,8 +165,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -178,7 +178,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -326,8 +326,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci2.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci2.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -339,7 +339,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -487,8 +487,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci3.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci3.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -496,11 +496,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -667,8 +667,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci4.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci4.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -676,11 +676,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -842,8 +842,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci5.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci5.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -851,11 +851,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -988,8 +988,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci6.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci6.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -997,11 +997,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1054,8 +1054,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci7.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci7.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1063,11 +1063,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1120,8 +1120,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci8.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci8.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1129,11 +1129,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1191,8 +1191,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci9.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci9.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1200,11 +1200,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1351,8 +1351,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci10.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci10.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1360,11 +1360,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1434,7 +1434,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml b/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
index 70f59d0..be13a1e 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
@@ -166,8 +166,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -175,11 +175,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -365,8 +365,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -374,11 +374,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -562,8 +562,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -571,11 +571,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -730,8 +730,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci2.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci2.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -743,7 +743,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -928,8 +928,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci3.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci3.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -941,7 +941,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1126,8 +1126,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci3a.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci3a.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1139,7 +1139,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1322,8 +1322,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci4.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci4.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1331,11 +1331,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1465,8 +1465,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci5.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci5.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1478,7 +1478,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1609,8 +1609,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci6.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci6.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1622,7 +1622,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1807,8 +1807,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci6a.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci6a.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1820,7 +1820,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2005,8 +2005,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci10.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci10.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -2018,7 +2018,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2203,8 +2203,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci11.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci11.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -2216,7 +2216,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2401,8 +2401,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci12.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci12.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -2414,7 +2414,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2599,8 +2599,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci13.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci13.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -2612,7 +2612,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2794,8 +2794,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci7.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci7.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -2807,7 +2807,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2906,8 +2906,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci8.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci8.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -2915,11 +2915,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -2975,8 +2975,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci9.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci9.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetfilter/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -2984,11 +2984,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -3023,7 +3023,7 @@
</sequence>
</testcase>
- <!---
+ <!---
Place test-specific test information here.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
#@TestMarker ACI Targetfilter Tests
--
Gitblit v1.10.0