From 504f0f7a278410099e966d7689c07b106f88cb06 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Wed, 13 Jun 2007 21:56:23 +0000
Subject: [PATCH] Issue 1784 data and temporary files must go into a unique folder
---
opends/tests/functional-tests/testcases/aci/aci_target.xml | 154 +++++++++++++++++++++++++-------------------------
1 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/aci/aci_target.xml b/opends/tests/functional-tests/testcases/aci/aci_target.xml
index 9b4c237..313ac3b 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_target.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_target.xml
@@ -88,7 +88,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rm_global_search.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_rm_global_search.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -176,7 +176,7 @@
<script>
curr_aci_ldif_file = 'add_aci1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -188,7 +188,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -258,7 +258,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -319,7 +319,7 @@
<script>
curr_aci_ldif_file = 'add_entries1.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -331,7 +331,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeAdded' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -399,7 +399,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci_from_entries.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_target/del_aci_from_entries.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -480,7 +480,7 @@
<script>
curr_aci_ldif_file = 'add_aci3.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -492,7 +492,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -562,7 +562,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -622,7 +622,7 @@
<script>
curr_aci_ldif_file = 'add_aci4.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -634,7 +634,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -704,7 +704,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -764,7 +764,7 @@
<script>
curr_aci_ldif_file = 'add_aci5.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,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/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -846,7 +846,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -906,7 +906,7 @@
<script>
curr_aci_ldif_file = 'add_aci6.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -918,7 +918,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -988,7 +988,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -1045,7 +1045,7 @@
<script>
curr_aci_ldif_file = 'add_aci8.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -1057,7 +1057,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1115,7 +1115,7 @@
<script>
curr_aci_ldif_file = 'add_aci9.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -1127,7 +1127,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 50">
@@ -1186,7 +1186,7 @@
<script>
curr_aci_ldif_file = 'add_aci9a.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -1198,7 +1198,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1268,7 +1268,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -1327,7 +1327,7 @@
<script>
curr_aci_ldif_file = 'add_aci10.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,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_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1398,7 +1398,7 @@
<script>
curr_aci_ldif_file = 'add_aci11.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -1410,7 +1410,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1469,7 +1469,7 @@
<script>
curr_aci_ldif_file = 'add_aci12.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -1481,7 +1481,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1539,7 +1539,7 @@
<script>
curr_aci_ldif_file = 'add_aci13.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -1551,7 +1551,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1611,7 +1611,7 @@
<script>
curr_aci_ldif_file = 'add_aci21.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -1623,7 +1623,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1691,7 +1691,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -1751,7 +1751,7 @@
<script>
curr_aci_ldif_file = 'add_aci22.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -1763,7 +1763,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1831,7 +1831,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -1891,7 +1891,7 @@
<script>
curr_aci_ldif_file = 'add_aci23.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -1903,7 +1903,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1971,7 +1971,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -2031,7 +2031,7 @@
<script>
curr_aci_ldif_file = 'add_aci24.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -2043,7 +2043,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2113,7 +2113,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -2173,7 +2173,7 @@
<script>
curr_aci_ldif_file = 'add_aci25.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -2185,7 +2185,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2255,7 +2255,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -2315,7 +2315,7 @@
<script>
curr_aci_ldif_file = 'add_aci26.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -2327,7 +2327,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2397,7 +2397,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -2457,7 +2457,7 @@
<script>
curr_aci_ldif_file = 'add_aci27.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -2469,7 +2469,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2539,7 +2539,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -2595,7 +2595,7 @@
<script>
curr_aci_ldif_file = 'add_aci28.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -2607,7 +2607,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2677,7 +2677,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -2737,7 +2737,7 @@
<script>
curr_aci_ldif_file = 'add_aci31.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -2749,7 +2749,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2765,7 +2765,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' % (STAGED_DATA_DIR) }
+ 'entryToBeModified' : '%s/aci/aci_target/mod_entry31.ldif' % (logsRemoteDataDir) }
</call>
<if expr="RC != 0">
@@ -2781,7 +2781,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' % (STAGED_DATA_DIR) }
+ 'entryToBeModified' : '%s/aci/aci_target/mod_entry31a.ldif' % (logsRemoteDataDir) }
</call>
<if expr="RC != 53">
@@ -2797,7 +2797,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' % (STAGED_DATA_DIR) }
+ 'entryToBeModified' : '%s/aci/aci_target/mod_entry31b.ldif' % (logsRemoteDataDir) }
</call>
<if expr="RC != 53">
@@ -2813,7 +2813,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' % (STAGED_DATA_DIR) }
+ 'entryToBeModified' : '%s/aci/aci_target/mod_entry31c.ldif' % (logsRemoteDataDir) }
</call>
<if expr="RC != 0">
@@ -2829,7 +2829,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<call function="'checktestRC'">
@@ -2871,7 +2871,7 @@
<script>
curr_aci_ldif_file = 'add_aci32.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -2883,7 +2883,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -2899,7 +2899,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/mod_entry32.ldif' % (STAGED_DATA_DIR) }
+ 'entryToBeModified' : '%s/aci/aci_target/mod_entry32.ldif' % (logsRemoteDataDir) }
</call>
<if expr="RC != 0">
@@ -3121,7 +3121,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/mod_entry32c.ldif' % (STAGED_DATA_DIR) }
+ 'entryToBeModified' : '%s/aci/aci_target/mod_entry32c.ldif' % (logsRemoteDataDir) }
</call>
<if expr="RC != 0">
@@ -3137,7 +3137,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<call function="'checktestRC'">
@@ -3175,7 +3175,7 @@
<script>
curr_aci_ldif_file = 'add_aci33.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -3187,7 +3187,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3275,7 +3275,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -3335,7 +3335,7 @@
<script>
curr_aci_ldif_file = 'add_aci34.ldif'
- curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
+ curr_aci=retrieve_aci('%s/aci/aci_target/%s' % (logsLocalDataDir,curr_aci_ldif_file));
</script>
<message>
@@ -3347,7 +3347,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -3417,7 +3417,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_target/del_aci.ldif' % logsRemoteDataDir }
</call>
<if expr="RC != 0">
@@ -3536,7 +3536,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_reset_global_search.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_reset_global_search.ldif' % logsRemoteDataDir }
</call>
<call function="'checktestRC'">
--
Gitblit v1.10.0