From adf83733d9b3b43f5e265f5c22ea6b0e3f58a98d Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Sun, 18 Feb 2007 08:12:42 +0000
Subject: [PATCH] this commit contains fixes for issues: .1241: refactoring functional tests libraries .1242: configDS now allows to pass rootDN and password parameters .1244: added a variable for back end name and made the changes in the libs
---
opends/tests/functional-tests/shared/functions/stafcmd.xml | 507 +++++++++++++++++++++++++-------------------------------
1 files changed, 226 insertions(+), 281 deletions(-)
diff --git a/opends/tests/functional-tests/shared/functions/stafcmd.xml b/opends/tests/functional-tests/shared/functions/stafcmd.xml
index 8c0cc16..afa54d1 100755
--- a/opends/tests/functional-tests/shared/functions/stafcmd.xml
+++ b/opends/tests/functional-tests/shared/functions/stafcmd.xml
@@ -26,299 +26,250 @@
! Portions Copyright 2006-2007 Sun Microsystems, Inc.
! -->
<stax>
-
- <function name="copyfile">
-
+ <function name="copyfile">
<function-prolog>
- This function copies a source file to destination file to host
+ This function copies a source file to destination file to host
</function-prolog>
-
<function-map-args>
- <function-arg-def name="srcfile" type="required">
- <function-arg-description>
- The name of the source fule
- </function-arg-description>
- <function-arg-property name="type" value="filename"/>
- </function-arg-def>
-
- <function-arg-def name="destfile" type="required">
- <function-arg-description>
- The name of the destination fule
- </function-arg-description>
- <function-arg-property name="type" value="filename"/>
- </function-arg-def>
-
- <function-arg-def name="remotehost" type="optional" default="localhost">
- <function-arg-description>
- The name of remote host (default localhost)
- </function-arg-description>
- <function-arg-property name="type" value="hostname"/>
- </function-arg-def>
-
+ <function-arg-def name="srcfile" type="required">
+ <function-arg-description>
+ The name of the source fule
+ </function-arg-description>
+ <function-arg-property name="type" value="filename"/>
+ </function-arg-def>
+ <function-arg-def name="destfile" type="required">
+ <function-arg-description>
+ The name of the destination fule
+ </function-arg-description>
+ <function-arg-property name="type" value="filename"/>
+ </function-arg-def>
+ <function-arg-def name="remotehost" type="optional" default="localhost">
+ <function-arg-description>
+ The name of remote host (default localhost)
+ </function-arg-description>
+ <function-arg-property name="type" value="hostname"/>
+ </function-arg-def>
</function-map-args>
-
- <sequence>
-
- <stafcmd name="'STAF Command: Copy File'">
- <location>'%s' % (STAF_LOCAL_HOSTNAME)</location>
- <service>'fs'</service>
- <request>'COPY FILE %s TOFILE %s TOMACHINE %s' % (srcfile,destfile,remotehost) </request>
- </stafcmd>
-
- <script>
- cmdRC=RC
- cmdResult=STAFResult
- </script>
-
- <call function="'checkRC'">
- { 'returncode' : cmdRC ,
- 'result' : cmdResult }
- </call>
-
- <return>cmdRC</return>
-
- </sequence>
-
- </function>
+ <sequence>
+ <stafcmd name="'STAF Command: Copy File'">
+ <location>'%s' % (STAF_LOCAL_HOSTNAME)</location>
+ <service>'fs'</service>
+ <request>'COPY FILE %s TOFILE %s TOMACHINE %s' % (srcfile,destfile,remotehost) </request>
+ </stafcmd>
+ <script>
+ cmdRC=RC
+ cmdResult=STAFResult
+ </script>
+ <call function="'checkRC'">
+ { 'returncode' : cmdRC ,
+ 'result' : cmdResult }
+ </call>
+ <return>cmdRC</return>
+ </sequence>
+ </function>
- <function name="CopyFolderByExtension">
-
+ <function name="CopyFolderByExtension">
<function-prolog>
- Copies files by extension from a source to destination folder on host
+ Copies files by extension from a source to destination folder on host
+ </function-prolog>
+ <function-map-args>
+ <function-arg-def name="srcfolder" type="required">
+ <function-arg-description>
+ The name of the source folder
+ </function-arg-description>
+ <function-arg-property name="type" value="foldername"/>
+ </function-arg-def>
+
+ <function-arg-def name="destfolder" type="required">
+ <function-arg-description>
+ The name of the destination fule
+ </function-arg-description>
+ <function-arg-property name="type" value="foldername"/>
+ </function-arg-def>
+
+ <function-arg-def name="extension" type="optional" default="'txt'">
+ <function-arg-description>
+ The name of host (default txt)
+ </function-arg-description>
+ <function-arg-property name="type" value="hostname"/>
+ </function-arg-def>
+
+ <function-arg-def name="hostname" type="optional" default="'localhost'">
+ <function-arg-description>
+ The name of remote host (default localhost)
+ </function-arg-description>
+ <function-arg-property name="type" value="hostname"/>
+ </function-arg-def>
+ </function-map-args>
+ <sequence>
+ <stafcmd name="'STAF Command: Copy all %s Files.' % (extension)">
+ <location>'%s' % (STAF_LOCAL_HOSTNAME)</location>
+ <service>'fs'</service>
+ <request>'COPY DIRECTORY %s TODIRECTORY %s TOMACHINE %s EXT %s RECURSE' % (srcfolder,destfolder,hostname,extension) </request>
+ </stafcmd>
+ <script>
+ cmdRC=RC
+ cmdResult=STAFResult
+ </script>
+ <call function="'checkRC'">
+ { 'returncode' : cmdRC ,
+ 'result' : cmdResult }
+ </call>
+ <return>cmdRC</return>
+ </sequence>
+ </function>
+
+ <function name="zipfile">
+ <function-prolog>
+ This function zips a folder on remote machine
</function-prolog>
<function-map-args>
- <function-arg-def name="srcfolder" type="required">
- <function-arg-description>
- The name of the source folder
- </function-arg-description>
- <function-arg-property name="type" value="foldername"/>
- </function-arg-def>
-
- <function-arg-def name="destfolder" type="required">
- <function-arg-description>
- The name of the destination fule
- </function-arg-description>
- <function-arg-property name="type" value="foldername"/>
- </function-arg-def>
-
- <function-arg-def name="extension" type="optional" default="'txt'">
- <function-arg-description>
- The name of host (default txt)
- </function-arg-description>
- <function-arg-property name="type" value="hostname"/>
- </function-arg-def>
-
- <function-arg-def name="hostname" type="optional" default="'localhost'">
- <function-arg-description>
- The name of remote host (default localhost)
- </function-arg-description>
- <function-arg-property name="type" value="hostname"/>
- </function-arg-def>
-
+ <function-required-arg name="zipfilename">
+ name of zip file
+ </function-required-arg>
+ <function-required-arg name="foldername">
+ name of destination folder to place zip file contents
+ </function-required-arg>
+ <function-required-arg name="relativeto">
+ folder that the zip archive is relative to
+ </function-required-arg>
</function-map-args>
+ <sequence>
+ <stafcmd name="'STAF Command: Zip Up Folder'">
+ <location>'%s' % (STAF_LOCAL_HOSTNAME)</location>
+ <service>'zip'</service>
+ <request>
+ 'ADD ZIPFILE %s DIRECTORY %s RECURSE RELATIVETO %s' % (zipfilename,foldername,relativeto)
+ </request>
+ </stafcmd>
+
+ <script>
+ cmdRC=RC
+ cmdResult=STAFResult
+ </script>
+
+ <call function="'checkRC'">
+ { 'returncode' : cmdRC ,
+ 'result' : cmdResult }
+ </call>
+ <return>cmdRC</return>
+ </sequence>
+ </function>
- <sequence>
-
- <stafcmd name="'STAF Command: Copy all %s Files.' % (extension)">
- <location>'%s' % (STAF_LOCAL_HOSTNAME)</location>
- <service>'fs'</service>
- <request>'COPY DIRECTORY %s TODIRECTORY %s TOMACHINE %s EXT %s RECURSE' % (srcfolder,destfolder,hostname,extension) </request>
- </stafcmd>
-
- <script>
- cmdRC=RC
- cmdResult=STAFResult
- </script>
-
- <call function="'checkRC'">
- { 'returncode' : cmdRC ,
- 'result' : cmdResult }
- </call>
-
- <return>cmdRC</return>
-
- </sequence>
-
- </function>
-
- <function name="zipfile">
-
+ <function name="unzipfile">
<function-prolog>
- This function zips a folder on remote machine
+ This function unzips a compressed zip archive on remote machine
</function-prolog>
-
<function-map-args>
- <function-required-arg name="zipfilename">
- name of zip file
- </function-required-arg>
- <function-required-arg name="foldername">
- name of destination folder to place zip file contents
- </function-required-arg>
- <function-required-arg name="relativeto">
- folder that the zip archive is relative to
- </function-required-arg>
+ <function-required-arg name="zipfile">
+ name of source zip file
+ </function-required-arg>
+ <function-required-arg name="unzipdir">
+ name of destination folder to place zip file contents
+ </function-required-arg>
+ <function-optional-arg name="ziphost" default="'localhost'">
+ name of host on which to unzip (default localhost)
+ </function-optional-arg>
</function-map-args>
- <sequence>
+ <sequence>
+ <stafcmd name="'STAF Command: Unzip File'">
+ <location>'%s' % (ziphost)</location>
+ <service>'zip'</service>
+ <request>
+ 'UNZIP ZIPFILE %s TODIRECTORY %s RESTOREPERMISSION REPLACE' % (zipfile,unzipdir)
+ </request>
+ </stafcmd>
+ <script>
+ cmdRC=RC
+ cmdResult=STAFResult
+ </script>
+ <call function="'checkRC'">
+ { 'returncode' : cmdRC ,
+ 'result' : cmdResult }
+ </call>
+ <return>cmdRC</return>
+ </sequence>
+ </function>
- <stafcmd name="'STAF Command: Zip Up Folder'">
- <location>'%s' % (STAF_LOCAL_HOSTNAME)</location>
- <service>'zip'</service>
- <request>
- 'ADD ZIPFILE %s DIRECTORY %s RECURSE RELATIVETO %s' % (zipfilename,foldername,relativeto)
- </request>
- </stafcmd>
-
- <script>
- cmdRC=RC
- cmdResult=STAFResult
- </script>
-
- <call function="'checkRC'">
- { 'returncode' : cmdRC ,
- 'result' : cmdResult }
- </call>
-
- <return>cmdRC</return>
-
- </sequence>
-
- </function>
-
- <function name="unzipfile">
-
+ <function name="deletefile">
<function-prolog>
- This function unzips a compressed zip archive on remote machine
+ This function recursively deletes a folder
</function-prolog>
-
<function-map-args>
- <function-required-arg name="zipfile">
- name of source zip file
- </function-required-arg>
- <function-required-arg name="unzipdir">
- name of destination folder to place zip file contents
- </function-required-arg>
- <function-optional-arg name="ziphost" default="'localhost'">
- name of host on which to unzip (default localhost)
- </function-optional-arg>
-
+ <function-required-arg name="filename">
+ name of file to be deleted
+ </function-required-arg>
+ <function-required-arg name="hostname">
+ name of target host
+ </function-required-arg>
</function-map-args>
+ <sequence>
+ <stafcmd name="'STAF Command: Delete Existing File'">
+ <location>'%s' % (hostname)</location>
+ <service>'fs'</service>
+ <request>
+ 'GET ENTRY %s TYPE' % (filename)
+ </request>
+ </stafcmd>
- <sequence>
+ <if expr="RC == 48">
+ <sequence>
+ <message log="1">
+ 'Success: File does not exist, dont delete it.'
+ </message>
+ <return>0</return>
+ </sequence>
+ <else>
+ <sequence>
+ <message log="1">
+ 'Success: File does exists, will delete it'
+ </message>
+ </sequence>
+ </else>
+ </if>
- <stafcmd name="'STAF Command: Unzip File'">
- <location>'%s' % (ziphost)</location>
- <service>'zip'</service>
- <request>
- 'UNZIP ZIPFILE %s TODIRECTORY %s RESTOREPERMISSION REPLACE' % (zipfile,unzipdir)
- </request>
- </stafcmd>
+ <stafcmd name="'STAF Command: Delete Existing File'">
+ <location>'%s' % (hostname)</location>
+ <service>'fs'</service>
+ <request>
+ 'DELETE ENTRY %s CONFIRM' % (filename)
+ </request>
+ </stafcmd>
- <script>
- cmdRC=RC
- cmdResult=STAFResult
- </script>
-
- <call function="'checkRC'">
- { 'returncode' : cmdRC ,
- 'result' : cmdResult }
- </call>
+ <script>
+ cmdRC=RC
+ cmdResult=STAFResult
+ </script>
+
+ <call function="'checkRC'">
+ { 'returncode' : cmdRC ,
+ 'result' : cmdResult }
+ </call>
+ <return>cmdRC</return>
+ </sequence>
+ </function>
- <return>cmdRC</return>
-
- </sequence>
-
- </function>
-
- <function name="deletefile">
-
+ <function name="deletefolder">
<function-prolog>
This function recursively deletes a folder
</function-prolog>
-
<function-map-args>
- <function-required-arg name="filename">
- name of file to be deleted
- </function-required-arg>
- <function-required-arg name="hostname">
- name of target host
- </function-required-arg>
+ <function-required-arg name="foldername">
+ name of folder to be deleted
+ </function-required-arg>
+ <function-required-arg name="hostname">
+ name of target host
+ </function-required-arg>
</function-map-args>
-
- <sequence>
-
- <stafcmd name="'STAF Command: Delete Existing File'">
- <location>'%s' % (hostname)</location>
- <service>'fs'</service>
- <request>
- 'GET ENTRY %s TYPE' % (filename)
- </request>
- </stafcmd>
-
- <if expr="RC == 48">
- <sequence>
- <message log="1">
- 'Success: File does not exist, dont delete it.'
- </message>
- <return>0</return>
- </sequence>
- <else>
- <sequence>
- <message log="1">
- 'Success: File does exists, will delete it'
- </message>
- </sequence>
- </else>
- </if>
-
- <stafcmd name="'STAF Command: Delete Existing File'">
- <location>'%s' % (hostname)</location>
- <service>'fs'</service>
- <request>
- 'DELETE ENTRY %s CONFIRM' % (filename)
- </request>
- </stafcmd>
-
- <script>
- cmdRC=RC
- cmdResult=STAFResult
- </script>
-
- <call function="'checkRC'">
- { 'returncode' : cmdRC ,
- 'result' : cmdResult }
- </call>
-
- <return>cmdRC</return>
-
- </sequence>
-
- </function>
-
- <function name="deletefolder">
-
- <function-prolog>
- This function recursively deletes a folder
- </function-prolog>
-
- <function-map-args>
- <function-required-arg name="foldername">
- name of folder to be deleted
- </function-required-arg>
- <function-required-arg name="hostname">
- name of target host
- </function-required-arg>
- </function-map-args>
-
- <sequence>
-
+ <sequence>
<stafcmd name="'STAF Command: Get Folder Attributes'">
<location>'%s' % (hostname)</location>
<service>'fs'</service>
<request>'GET ENTRY %s TYPE' % (foldername)</request>
</stafcmd>
-
+
<if expr="RC == 48">
<sequence>
<message log="1">
@@ -334,29 +285,23 @@
</sequence>
</else>
</if>
-
<stafcmd name="'STAF Command: Recursively Delete Folder'">
- <location>'%s' % (hostname)</location>
- <service>'fs'</service>
- <request>
- 'DELETE ENTRY %s RECURSE IGNOREERRORS CONFIRM' % (foldername)
- </request>
- </stafcmd>
+ <location>'%s' % (hostname)</location>
+ <service>'fs'</service>
+ <request>
+ 'DELETE ENTRY %s RECURSE IGNOREERRORS CONFIRM' % (foldername)
+ </request>
+ </stafcmd>
- <script>
- cmdRC=RC
- cmdResult=STAFResult
- </script>
-
- <call function="'checkRC'">
- { 'returncode' : cmdRC ,
- 'result' : cmdResult }
- </call>
-
- <return>cmdRC</return>
-
- </sequence>
-
- </function>
-
+ <script>
+ cmdRC=RC
+ cmdResult=STAFResult
+ </script>
+ <call function="'checkRC'">
+ { 'returncode' : cmdRC ,
+ 'result' : cmdResult }
+ </call>
+ <return>cmdRC</return>
+ </sequence>
+ </function>
</stax>
--
Gitblit v1.10.0