this commit contains fixes for issues: .1241: refactoring functional tests...

al_xipe

18.12.2007 e93df61d572cc3a7ad924354510d2bc3ac44ef95

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

 opendj-sdk/opends/tests/functional-tests/config/config.py

@@ -24,6 +24,7 @@
DIRECTORY_INSTANCE_PORT = '1389'
DIRECTORY_INSTANCE_SSL_PORT = '1636'
DIRECTORY_INSTANCE_SFX  = 'dc=com'
DIRECTIRY_INSTANCE_BE       = 'userRoot'
STAGED_DATA_DIR         = '%s/functional-tests/shared/data' % DIRECTORY_INSTANCE_DIR
JAVA_HOME               = '/usr/jdk/jdk1.5.0_01'
SEND_MAIL_AFTER_TEST_RUN= 'FALSE'

 opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml

@@ -28,27 +28,29 @@
<stax>

    <function name="configureDS">

    <function-prolog>
        This function configures a Directory Server
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' DIRECTORY_INSTANCE_PORT">
            Directory Server port number
        </function-required-arg>
        <function-required-arg name="dsInstanceSuffix">
      <function-required-arg name="dsInstanceSuffix" default="'%s' % DIRECTORY_INSTANCE_SFX" >
          Directory Server suffix
      </function-required-arg>
      <function-required-arg name="dsInstanceDN" default="'%s' % DIRECTORY_INSTANCE_DN" >
          Directory manager DN
      </function-required-arg>
      <function-required-arg name="dsInstancePassword" default="'%s' % DIRECTORY_INSTANCE_PSWD" >
            Directory Server suffix
        </function-required-arg>

    </function-map-args>

      <sequence>

        <process name="'Configure DS'">
            <location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
            <command>'%s/configure-ds%s' % (OPENDS_BINPATH,fileExt)</command>
            <parms>'-p %s -b "%s"' % (dsInstancePort,dsInstanceSuffix)</parms>
        <parms>'-p %s -b "%s" -D "%s" -w %s' % (dsInstancePort,dsInstanceSuffix,dsInstanceDN,dsInstancePassword)</parms>
            <workdir>'%s' % (OPENDS_BINPATH)</workdir>
            <envs>
                ['PATH=/bin:/usr/bin:%s' % (OPENDS_BINPATH), 'JAVA_HOME=%s' % (JAVA_HOME)]
@@ -56,31 +58,23 @@
            <stderr mode="'stdout'"/>
            <returnstdout/>
        </process>

        <call function="'checkRC'">
            { 'returncode' : RC ,
              'result'     : STAXResult }
        </call>

      </sequence>

    </function>

    <function name="startDS">

    <function-prolog>
        This function starts a Directory Server
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsbinpath">
            location of the Directory Server binaries
        </function-required-arg>

    </function-map-args>

      <sequence>

        <process name="'Start DS'">
            <location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
            <command>'%s/start-ds%s' % (dsbinpath,fileExt)</command>
@@ -92,24 +86,19 @@
            <stderr mode="'stdout'"/>
            <returnstdout/>
        </process>

        <call function="'checkRC'">
            { 'returncode' : RC ,
              'result'     : STAXResult }
        </call>

      </sequence>

    </function>

    <function name="stopDS">

    <function-prolog>
        This function stops a Directory Server
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server port number
        </function-required-arg>
        <function-optional-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN" >
@@ -119,9 +108,7 @@
            Password
        </function-optional-arg>
   </function-map-args>

      <sequence>

        <process name="'Stop DS'">
            <location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
            <command>'%s/stop-ds%s' % (OPENDS_BINPATH,fileExt)</command>
@@ -138,19 +125,14 @@
            { 'returncode' : RC ,
              'result'     : STAXResult }
        </call>

      </sequence>

    </function>

    <function name="genServerJKSCert">

    <function-prolog>
        This function generates a server jks certificate
    </function-prolog>

      <sequence>

        <process name="'Generate Server JKS Certificate'">
            <location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
            <command>'%s/bin/keytool' % JAVA_HOME</command> 
@@ -162,24 +144,18 @@
            <stderr mode="'stdout'"/>
            <returnstdout/>
        </process>

        <call function="'checkRC'">
            { 'returncode' : RC ,
              'result'     : STAXResult }
        </call>

      </sequence>

    </function>

    <function name="genServerPKCS12Cert">

    <function-prolog>
        This function generates a server PKCS12 certificate
    </function-prolog>

      <sequence>

        <process name="'Generate Server PKCS12 Certificate'">
            <location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
            <command>'%s/bin/keytool' % JAVA_HOME</command> 
@@ -191,24 +167,18 @@
            <stderr mode="'stdout'"/>
            <returnstdout/>
        </process>

        <call function="'checkRC'">
            { 'returncode' : RC ,
              'result'     : STAXResult }
        </call>

      </sequence>

    </function>

    <function name="selfSignServerJKSCert">

    <function-prolog>
        This function self-signs a server JKS certificate
    </function-prolog>

      <sequence>

        <process name="'Self-Signs Server JKS Certificate'">
            <location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
            <command>'%s/bin/keytool' % JAVA_HOME</command> 
@@ -220,24 +190,18 @@
            <stderr mode="'stdout'"/>
            <returnstdout/>
        </process>

        <call function="'checkRC'">
            { 'returncode' : RC ,
              'result'     : STAXResult }
        </call>

      </sequence>

    </function>

        <function name="selfSignServerPKCS12Cert">

    <function-prolog>
        This function self-signs a server PKCS12 certificate
    </function-prolog>

      <sequence>

        <process name="'Self-Signs Server PKCS12 Certificate'">
            <location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
            <command>'%s/bin/keytool' % JAVA_HOME</command> 
@@ -249,37 +213,30 @@
            <stderr mode="'stdout'"/>
            <returnstdout/>
        </process>

        <call function="'checkRC'">
            { 'returncode' : RC ,
              'result'     : STAXResult }
        </call>

      </sequence>

    </function>
    
    <!-- Import Function -->
    <function name="importLdif">

    <function-prolog>
        This function performs an offline import of an ldif file
    </function-prolog>

    <function-map-args>
        <function-required-arg name="ldifFile">
            The name of the ldif file
        </function-required-arg>
        <function-optional-arg name="backEnd" default="'userRoot'">
      <function-optional-arg name="backEnd" default="'%s' % DIRECTORY_INSTANCE_BE">
            The name of the database backend
        </function-optional-arg>
        <function-optional-arg name="extraParams" default="' '">
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <message>
          'import-ldif%s -l %s -n %s %s' % (fileExt,ldifFile,backEnd,extraParams)
        </message>
@@ -294,41 +251,34 @@
          <stderr mode="'stdout'"/>
          <returnstdout/>
        </process>

        <script>
          importRC=RC
          importResult=STAXResult
        </script>

        <call function="'checkRC'">
            { 'returncode' : importRC ,
              'result'     : importResult }
        </call>

        <return>importRC</return>

      </sequence>

    </function>

    <!-- Import Task Function -->
    <function name="importLdifTask">

    <function-prolog>
        This function performs an on line import task of an ldif file
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
            Directory Server host name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server port number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="taskID">
@@ -337,7 +287,7 @@
        <function-required-arg name="ldifFile">
            The name of the ldif file
        </function-required-arg>
        <function-optional-arg name="backEnd" default="'userRoot'">
      <function-optional-arg name="backEnd" default="'%s' % DIRECTORY_INSTANCE_BE">
            Optional the name of the database backend
        </function-optional-arg>
        <function-optional-arg name="isCompressed" default="'FALSE'">
@@ -380,9 +330,7 @@
            Optional include filters
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <script>
          taskDN='ds-task-id=%s,cn=Scheduled Tasks,cn=Tasks' % taskID
        </script>
@@ -495,7 +443,7 @@

        
        <!-- Copy the import-task ldif to remote host -->
        <message>'Copy import task ldif file.'</message>
      <message>'Copy import task ldif (import-task.ldif) file from %s to %s' % (TMP_DATA_DIR,STAGED_DATA_DIR)</message>
        <call function="'copyfile'">
          { 'srcfile'    : '%s/import-task.ldif' % TMP_DATA_DIR,
            'destfile'   : '%s/import-task.ldif' % STAGED_DATA_DIR,
@@ -541,9 +489,7 @@

        <!-- Wait for the task to be COMPLETED_SUCCESSFULLY -->
        <loop from="1" to="5" while="loopRC != 0">

          <sequence>
          
            <message>
              'ldapsearch%s -h %s -p %s -D "%s" -w %s -s base -b "%s" "objectclass=*" ds-task-state' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,taskDN)
            </message>
@@ -587,24 +533,17 @@
            <call function="'Sleep'">
              { 'sleepForMilliSeconds' : '2000' }
            </call>
            
          </sequence>
          
        </loop>

        <return>loopRC</return>

      </sequence>

    </function>

    <!-- Check Import Function -->
    <function name="checkImport">

    <function-prolog>
      This function verifies an import of an ldif file 
    </function-prolog>
    
    <function-map-args>
      <function-required-arg name="expectedEntries">
        Entries expected to be present after import
@@ -618,24 +557,19 @@
      <function-optional-arg name="missingAttributes" default="'NULL'">
        Optional attributes expected to be present after import
      </function-optional-arg>
      <function-optional-arg name="suffix" default="'dc=com'">
      <function-optional-arg name="suffix" default="'%s' % DIRECTORY_INSTANCE_SFX">
        Optional main suffix for the import
      </function-optional-arg>
      <function-optional-arg name="startDS" default="'yes'">
        Optional start the Directory Server after import
      </function-optional-arg>
    </function-map-args>
    
    <sequence>

    <!-- If we don't want to start DS then we don't need to stop it -->
    <script>stopDS=startDS</script>
    
    <!-- Do we need to start the DS -->
    <if expr="startDS == 'yes'">
    
      <sequence>
      
      <!-- StartDS -->
      <call function="'startDS'">
        { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
@@ -646,16 +580,12 @@
        { 'noOfLoops'        : 5 ,
          'noOfMilliSeconds' : 2000 }
      </call>

      </sequence>
      
    </if>
    
    <!-- Search for expected entries -->    
    <iterate var="expectedEntry" in="expectedEntries">
      
    <sequence>

      <call function="'SearchObject'">
        { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
          'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
@@ -665,25 +595,19 @@
          'dsFilter'       : 'objectclass=*' 
        }
      </call>
  
    <call function="'checktestRC'">
       { 'returncode' : RC ,
         'result'     : STAXResult }
    </call>
    
    </sequence>
    
    </iterate>
    
    <!-- Search for missing entries -->
    <iterate var="missingEntry" in="missingEntries">
      
    <sequence>
      
      <if expr="missingEntry == 'NULL'">
        <break/>
      </if>
      
      <call function="'SearchObject'">
        { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
          'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
@@ -693,35 +617,27 @@
          'dsFilter'       : 'objectclass=*' 
        }
      </call>
    
      <call function="'checktestRC'">
         { 'returncode' : RC ,
           'result'     : STAXResult,
           'expected'   : 32 }
      </call>

    </sequence>
      
    </iterate>

    <!-- Do we need to stop the Directory Server -->
    <if expr="stopDS == 'yes'">
      
      <!-- StopDS -->
      <call function="'stopDS'">
        { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
      </call>  
    
    </if>
    
    </sequence>

  </function>
  
      
    <!-- Export Function -->
    <function name="exportLdif">

    <function-prolog>
        This function performs an export to an ldif file on or off line
    </function-prolog>
@@ -730,7 +646,7 @@
        <function-required-arg name="ldifFile">
            The name of the ldif file to be written
        </function-required-arg>
        <function-optional-arg name="backEnd" default="'userRoot'">
      <function-optional-arg name="backEnd" default="'%s' % DIRECTORY_INSTANCE_BE">
            The name of the database backend
        </function-optional-arg>
        <function-optional-arg name="extraParams" default="' '">
@@ -739,7 +655,6 @@
    </function-map-args>

      <sequence>

        <message>
          'export-ldif%s -l %s -n %s %s' % (fileExt,ldifFile,backEnd,extraParams)
        </message>
@@ -754,41 +669,34 @@
          <stderr mode="'stdout'"/>
          <returnstdout/>
        </process>

        <script>
          exportRC=RC
          exportResult=STAXResult
        </script>

        <call function="'checkRC'">
            { 'returncode' : exportRC ,
              'result'     : exportResult }
        </call>

        <return>exportRC</return>

      </sequence>

    </function>
    
    <!-- Export Task Function -->
    <function name="exportLdifTask">

    <function-prolog>
        This function performs an on line export task of an ldif file
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
            Directory Server host name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort"  default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server port number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
      <function-required-arg name="dsInstanceDn"  default="'%s' % DIRECTORY_INSTANCE_DN">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
      <function-required-arg name="dsInstancePswd"  default="'%s' % DIRECTORY_INSTANCE_PSWD">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="taskID">
@@ -797,7 +705,7 @@
        <function-required-arg name="ldifFile">
            The name of the ldif file
        </function-required-arg>
        <function-optional-arg name="backEnd" default="'userRoot'">
      <function-optional-arg name="backEnd" default="'%s' % DIRECTORY_INSTANCE_BE">
            Optional the name of the database backend
        </function-optional-arg>
        <function-optional-arg name="Compress" default="'FALSE'">
@@ -833,11 +741,9 @@
    </function-map-args>

      <sequence>

        <script>
          taskDN='ds-task-id=%s,cn=Scheduled Tasks,cn=Tasks' % taskID
        </script>
        
        <!-- Build the export task configuration object -->
        <script>
          ldifLines=[]
@@ -848,7 +754,6 @@
          ldifLines.append('ds-task-class-name: org.opends.server.tasks.ExportTask')
          ldifLines.append('ds-task-id: %s' % taskID)
        </script>
    
        <script>
          ldifLines.append('ds-task-export-backend-id: %s' % backEnd )
          ldifLines.append('ds-task-export-ldif-file: %s' % ldifFile )
@@ -857,7 +762,6 @@
          ldifLines.append('ds-task-export-sign-hash: %s' % signHash )
        </script>
        
           
        <iterate var="branch" in="excludeBranches">
          <sequence>
            <if expr="branch == ' '">
@@ -924,7 +828,6 @@
          </sequence>
        </iterate>

        
        <!-- Write out the export-task ldif -->
        <script>
          outfile = open('%s/export-task.ldif' % TMP_DATA_DIR,"w")
@@ -935,7 +838,6 @@
          outfile.close()
        </script>

        
        <!-- Copy the export-task ldif to remote host -->
        <message>'Copy export task ldif file.'</message>
        <call function="'copyfile'">
@@ -976,16 +878,14 @@
          loopRC=1
        </script>

        <script> 
      <scrip>
          import re 
          searchre = re.compile('ds-task-state: COMPLETED_SUCCESSFULLY') 
        </script> 

        <!-- Wait for the task to be COMPLETED_SUCCESSFULLY -->
        <loop from="1" to="5" while="loopRC != 0">

          <sequence>
          
            <message>
              'ldapsearch%s -h %s -p %s -D "%s" -w %s -s base -b "%s" "objectclass=*" ds-task-state' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,taskDN)
            </message>
@@ -1029,38 +929,29 @@
            <call function="'Sleep'">
              { 'sleepForMilliSeconds' : '2000' }
            </call>
            
          </sequence>
          
        </loop>

        <return>loopRC</return>

      </sequence>

    </function>
    
    <!-- Backup Function -->
    <function name="backup">

    <function-prolog>
        This function performs an on line backup
    </function-prolog>

    <function-map-args>
        <function-required-arg name="backupDir">
            The directory where the backup files will be placed
        </function-required-arg>
        <function-optional-arg name="backEnd" default="'userRoot'">
      <function-optional-arg name="backEnd" default="'%s' % DIRECTORY_INSTANCE_BE">
            The name of the database backend
        </function-optional-arg>
        <function-optional-arg name="extraParams" default="' '">
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <message>
          'backup%s -n %s -d %s %s' % (fileExt,backEnd,backupDir,extraParams)
        </message>
@@ -1075,41 +966,34 @@
          <stderr mode="'stdout'"/>
          <returnstdout/>
        </process>

        <script>
          backupRC=RC
          backupResult=STAXResult
        </script>

        <call function="'checkRC'">
            { 'returncode' : backupRC ,
              'result'     : backupResult }
        </call>

        <return>backupRC</return>

      </sequence>

    </function>
  
    <!-- Backup Task Function -->
    <function name="backupTask">

    <function-prolog>
        This function performs an on line backup task 
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
            Directory Server host name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server port number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="taskID">
@@ -1118,7 +1002,7 @@
        <function-required-arg name="backupDir">
            Path to the target directory for the backup file(s)
        </function-required-arg>
        <function-optional-arg name="backEnd" default="'userRoot'">
      <function-optional-arg name="backEnd" default="'%s' % DIRECTORY_INSTANCE_BE">
            Optional the name of the database backend
        </function-optional-arg>
        <function-optional-arg name="backupAll" default="'FALSE'">
@@ -1143,9 +1027,7 @@
            Optional generate a hash of the backup data 
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <script>
          taskDN='ds-task-id=%s,cn=Scheduled Tasks,cn=Tasks' % taskID
        </script>
@@ -1188,7 +1070,6 @@
          outfile.close()
        </script>

        
        <!-- Copy the backup-task ldif to remote host -->
        <message>'Copy backup task ldif file.'</message>
        <call function="'copyfile'">
@@ -1236,9 +1117,7 @@

        <!-- Wait for the task to be COMPLETED_SUCCESSFULLY -->
        <loop from="1" to="5" while="loopRC != 0">

          <sequence>
          
            <message>
              'ldapsearch%s -h %s -p %s -D "%s" -w %s -s base -b "%s" "objectclass=*" ds-task-state' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,taskDN)
            </message>
@@ -1273,33 +1152,24 @@
              </message>
            </else>
            </if>
            
            <call function="'checkRC'">
                { 'returncode' : searchRC ,
                  'result'     : searchResult }
            </call>
          
            <call function="'Sleep'">
              { 'sleepForMilliSeconds' : '2000' }
            </call>
            
          </sequence>
          
        </loop>

        <return>loopRC</return>

      </sequence>

    </function>
  
    <!-- Restore Function -->
    <function name="restore">

    <function-prolog>
        This function performs an off line restore
    </function-prolog>

    <function-map-args>
        <function-required-arg name="backupDir">
            Path to the directory containing the backup file(s)
@@ -1308,22 +1178,17 @@
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>
          
        <message>
           'Stopping OpenDS' 
        </message>
  
        <call function="'stopDS'">
          { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT)}
        </call>
 
        <call function="'checkRC'">
          { 'returncode' : RC ,
            'result'     : STAXResult }
        </call>

        <message>
          'restore%s -d %s %s' % (fileExt,backupDir,extraParams)
        </message>
@@ -1338,54 +1203,44 @@
          <stderr mode="'stdout'"/>
          <returnstdout/>
        </process>

        <script>
          restoreRC=RC
          restoreResult=STAXResult
        </script>

        <call function="'checkRC'">
            { 'returncode' : restoreRC ,
              'result'     : restoreResult }
        </call>

        <message>
           'Starting OpenDS' 
        </message>
  
        <call function="'startDS'">
          { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
        </call>
 
        <call function="'checkRC'">
          { 'returncode' : RC ,
            'result'     : STAXResult }
        </call>
        
        <return>restoreRC</return>

      </sequence>

    </function>

    <!-- Restore Task Function --> 
    <function name="restoreTask">

    <function-prolog>
        This function performs an on line restore task of a backup file
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
            Directory Server host name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server port number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="taskID">
@@ -1401,13 +1256,10 @@
            Optional verify the contents of the backup but do not restore it
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <script>
          taskDN='ds-task-id=%s,cn=Scheduled Tasks,cn=Tasks' % taskID
        </script>
        
        <!-- Build the restore task configuration object -->
        <script>
          ldifLines=[]
@@ -1418,19 +1270,15 @@
          ldifLines.append('ds-task-class-name: org.opends.server.tasks.RestoreTask')
          ldifLines.append('ds-task-id: %s' % taskID)
        </script>
    
        <script>

          ldifLines.append('ds-backup-directory-path: %s' % backupDir )
          ldifLines.append('ds-task-restore-verify-only: %s' % verify )
        </script>
               
        <if expr="backupId != ' '">
          <script>
            ldifLines.append('ds-backup-id: %s' % backupId ) 
          </script>
        </if> 
                   
        <!-- Write out the restore-task ldif -->
        <script>
          outfile = open('%s/restore-task.ldif' % TMP_DATA_DIR,"w")
@@ -1441,7 +1289,6 @@
          outfile.close()
        </script>

        
        <!-- Copy the restore-task ldif to remote host -->
        <message>'Copy restore task ldif file.'</message>
        <call function="'copyfile'">
@@ -1489,9 +1336,7 @@

        <!-- Wait for the task to be COMPLETED_SUCCESSFULLY -->
        <loop from="1" to="5" while="loopRC != 0">

          <sequence>
          
            <message>
              'ldapsearch%s -h %s -p %s -D "%s" -w %s -s base -b "%s" "objectclass=*" ds-task-state' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,taskDN)
            </message>
@@ -1506,16 +1351,13 @@
              <stderr mode="'stdout'"/>
              <returnstdout/>
            </process>
            
            <script>
              searchRC=RC
              searchResult=STAXResult
            </script>
    
            <script> 
              result = STAXResult[0][1]
            </script> 
    
            <if expr='re.search(searchre, result) != None'>
              <sequence>
                <script>loopRC=0</script>
@@ -1526,24 +1368,16 @@
              </message>
            </else>
            </if>
            
            <call function="'checkRC'">
                { 'returncode' : searchRC ,
                  'result'     : searchResult }
            </call>
          
            <call function="'Sleep'">
              { 'sleepForMilliSeconds' : '2000' }
            </call>
            
          </sequence>
          
        </loop>

        <return>loopRC</return>

      </sequence>

    </function> 
    
</stax>

 opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml

@@ -26,24 +26,21 @@
 !      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 ! -->
<stax>

    <function name="addEntry">

    <function-prolog>
        This function adds an entry to the Directory Server
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
            Directory Server Host Name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server Port Number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="entryToBeAdded">
@@ -53,9 +50,7 @@
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <message>
            'ldapmodify%s -a -h %s -p %s -D "%s" -w %s %s -f "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,entryToBeAdded)
        </message>
@@ -70,33 +65,28 @@
            <stderr mode="'stdout'"/>
            <returnstdout/>
        </process>

        <call function="'checkRC'">
            { 'returncode' : RC ,
              'result'     : STAXResult }
        </call>

      </sequence>

    </function>

    <function name="modifyEntry">

    <function-prolog>
        This function modifies an entry in the Directory Server
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
      <function-required-arg name="dsInstanceHost"  default="'%s' % DIRECTORY_INSTANCE_HOST">
            Directory Server Host Name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server Port Number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="entryToBeModified">
@@ -106,9 +96,7 @@
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <message>
            'ldapmodify%s -h %s -p %s -D "%s" -w %s %s -f "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,entryToBeModified)
        </message>
@@ -123,33 +111,28 @@
            <stderr mode="'stdout'"/>
            <returnstdout/>
        </process>

        <call function="'checkRC'">
            { 'returncode' : RC ,
              'result'     : STAXResult }
        </call>

      </sequence>

    </function>

    <function name="SearchObject">

    <function-prolog>
        This function searches the Directory Server with optional arguments possible
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
            Directory Server Host Name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server Port Number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="dsBaseDN">
@@ -165,9 +148,7 @@
            Attributes to return
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <message>
            'ldapsearch%s -h %s -p %s -D "%s" -w %s %s -b "%s" "%s" "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,dsBaseDN,dsFilter,attributes)
        </message>
@@ -182,27 +163,22 @@
            <stderr mode="'stdout'"/>
            <returnstdout/>
        </process>
        
        <return>STAXResult</return>

      </sequence>

    </function>

    <function name="SearchObjectNoPwd">

    <function-prolog>
        This function searches the Directory Server with optional arguments possible
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
            Directory Server Host Name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server Port Number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsBaseDN">
@@ -215,9 +191,7 @@
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <message>
            'ldapsearch%s -h %s -p %s -D "%s" %s -b "%s" "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,extraParams,dsBaseDN,dsFilter)
        </message>
@@ -232,22 +206,18 @@
            <stderr mode="'stdout'"/>
            <returnstdout/>
        </process>

      </sequence>

    </function>

    <function name="AnonSearchObject">

    <function-prolog>
        This function searches the Directory Server anonymously with optional arguments possible
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
            Directory Server Host Name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server Port Number
        </function-required-arg>
        <function-required-arg name="dsBaseDN">
@@ -260,9 +230,7 @@
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <message>
            'ldapsearch%s -h %s -p %s %s -b "%s" "%s"' % (fileExt,dsInstanceHost,dsInstancePort,extraParams,dsBaseDN,dsFilter)
        </message>
@@ -277,28 +245,24 @@
            <stderr mode="'stdout'"/>
            <returnstdout/>
        </process>

      </sequence>

    </function>

    <function name="DeleteEntry">

    <function-prolog>
        This function an entry in the Directory Server
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
            Directory Server Host Name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server Port Number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="dsBaseDN">
@@ -308,9 +272,7 @@
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <message>
            'ldapdelete%s -h %s -p %s -D "%s" -w %s %s "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,dsBaseDN)
        </message>
@@ -325,33 +287,28 @@
            <stderr mode="'stdout'"/>
            <returnstdout/>
        </process>

        <call function="'checkRC'">
            { 'returncode' : RC ,
              'result'     : STAXResult }
        </call>

      </sequence>

  </function>

  <function name="compareEntry">

    <function-prolog>
        This function compares the attribute and value an entry to the Directory Server
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
            Directory Server Host Name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server Port Number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="attrToBeCompared">
@@ -364,9 +321,7 @@
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <message>
            'ldapcompare%s -h %s -p %s -D "%s" -w %s %s  "%s" "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,attrToBeCompared,entryToBeCompared)
        </message>
@@ -381,10 +336,6 @@
            <stderr mode="'stdout'"/>
            <returnstdout/>
        </process>

      </sequence>

    </function>


</stax>

 opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml

@@ -26,24 +26,21 @@
 !      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 ! -->
<stax>

    <function name="configureSSL">

    <function-prolog>
        This function makes the configuration changes for SSL
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
            Directory Server Host Name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server Port Number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="keystoreType">
@@ -53,14 +50,11 @@
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <!--- Enable Key Manager Provider -->
            <message>
               'Enabling Key Manager Provider'
            </message>

            <call function="'addEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
@@ -68,17 +62,14 @@
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeAdded'   : '%s/security/%s/setup/enable_key_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
            </call>

            <call function="'checkRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

        <!--- Delete Default Trust Manager Provider -->
            <message>
               'Deleting Default Trust Manager Provider'
            </message>

            <call function="'modifyEntry'">
              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
@@ -86,7 +77,6 @@
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'entryToBeModified'   : '%s/security/%s/setup/deleteTrustMgr.ldif' % (STAGED_DATA_DIR,keystoreType) }
            </call>

            <call function="'checkRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
@@ -127,28 +117,24 @@
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>
         
      </sequence>

    </function>

    <function name="configureTLS">

    <function-prolog>
        This function makes the configuration changes for startTLS
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
            Directory Server Host Name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server Port Number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="keystoreType">
@@ -158,9 +144,7 @@
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <!--- Enable Key Manager Provider -->
            <message>
               'Enabling Key Manager Provider'
@@ -232,28 +216,24 @@
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

      </sequence>

    </function>

    <function name="unconfigureSSL">

    <function-prolog>
        This function reverses the configuration changes for SSL
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
            Directory Server Host Name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server Port Number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="keystoreType">
@@ -263,9 +243,7 @@
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <!--- Delete LDAPS Connection Handler -->
            <message>
               'Deleting Default Trust Manager Provider'
@@ -337,28 +315,24 @@
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

      </sequence>

    </function>

    <function name="unconfigureTLS">

    <function-prolog>
        This function reverses the configuration changes for startTLS
    </function-prolog>

    <function-map-args>
        <function-required-arg name="dsInstanceHost">
      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
            Directory Server Host Name
        </function-required-arg>
        <function-required-arg name="dsInstancePort">
      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
            Directory Server Port Number
        </function-required-arg>
        <function-required-arg name="dsInstanceDn">
      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
            Directory Server Manager DN
        </function-required-arg>
        <function-required-arg name="dsInstancePswd">
      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
            Directory Server Manager Password
        </function-required-arg>
        <function-required-arg name="keystoreType">
@@ -368,9 +342,7 @@
            Optional extra parameters for specific test cases
        </function-optional-arg>
    </function-map-args>

      <sequence>

       <!--- Disable StartTLS -->
            <message>
               'Disabling StartTLS'
@@ -442,10 +414,6 @@
                { 'returncode' : RC ,
                  'result'     : STAXResult }
            </call>

      </sequence>

    </function>


</stax>

 opendj-sdk/opends/tests/functional-tests/shared/functions/stafcmd.xml

@@ -26,13 +26,10 @@
 !      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 ! -->
<stax>

    <function name="copyfile">

    <function-prolog>
        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>
@@ -40,53 +37,41 @@
                </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>
    
    <function name="CopyFolderByExtension">

    <function-prolog>
        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>
@@ -115,35 +100,26 @@
                </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>
@@ -159,9 +135,7 @@
            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>
@@ -179,19 +153,14 @@
            { 'returncode' : cmdRC ,
              'result'     : cmdResult }
        </call>

        <return>cmdRC</return>
        
      </sequence>

    </function>

    <function name="unzipfile">

    <function-prolog>
        This function unzips a compressed zip archive on remote machine
    </function-prolog>

    <function-map-args>
        <function-required-arg name="zipfile">
            name of source zip file
@@ -202,11 +171,9 @@
        <function-optional-arg name="ziphost" default="'localhost'">
            name of host on which to unzip (default localhost)
        </function-optional-arg>

    </function-map-args>

      <sequence>

        <stafcmd name="'STAF Command: Unzip File'">
          <location>'%s' % (ziphost)</location>
          <service>'zip'</service>
@@ -214,29 +181,22 @@
              '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>

    <function name="deletefile">

    <function-prolog>
        This function recursively deletes a folder
    </function-prolog>

    <function-map-args>
        <function-required-arg name="filename">
            name of file to be deleted
@@ -245,9 +205,7 @@
            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>
@@ -289,19 +247,14 @@
            { '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
@@ -310,9 +263,7 @@
            name of target host
        </function-required-arg>
    </function-map-args>

      <sequence>

      <stafcmd name="'STAF Command: Get Folder Attributes'">
        <location>'%s' % (hostname)</location>
        <service>'fs'</service>
@@ -334,7 +285,6 @@
          </sequence>
        </else>
      </if>

      <stafcmd name="'STAF Command: Recursively Delete Folder'">
          <location>'%s' % (hostname)</location>
          <service>'fs'</service>
@@ -347,16 +297,11 @@
          cmdRC=RC
          cmdResult=STAFResult
        </script>
        
        <call function="'checkRC'">
            { 'returncode' : cmdRC ,
              'result'     : cmdResult }
        </call>

        <return>cmdRC</return>
        
      </sequence>

    </function>

</stax>

 opendj-sdk/opends/tests/functional-tests/shared/functions/utils.xml

@@ -26,9 +26,7 @@
 !      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 ! -->
<stax>

  <function name="checkRC">

    <function-prolog>
        This function checks a return code against an expected return code
    </function-prolog>
@@ -43,11 +41,9 @@
        <function-optional-arg name="expected" default="0">
            the expected return code
        </function-optional-arg>

    </function-map-args>

      <sequence>

        <if expr="returncode == expected">
          <sequence>
          <if expr="result == ''">
@@ -69,18 +65,13 @@
          </sequence>
        </else>
        </if>


      </sequence>

    </function>

    <function name="checktestRC">

    <function-prolog>
        This function checks the return code against an expected return code for a testcase
    </function-prolog>

    <function-map-args>
        <function-required-arg name="returncode">
            return code received from command
@@ -91,11 +82,8 @@
        <function-optional-arg name="expected" default="0">
            the expected return code
        </function-optional-arg>

    </function-map-args>

      <sequence>

        <if expr="returncode == expected">
          <sequence>
          <tcstatus result="'pass'"/>
@@ -112,18 +100,13 @@
          </sequence>
        </else>
        </if>


      </sequence>

  </function>

  <function name="checktestString">

    <function-prolog>
        This function checks the return string against an expected return substring for a testcase
    </function-prolog>

    <function-map-args>
        <function-required-arg name="expectedString">
            the substring expected from the command
@@ -131,9 +114,7 @@
        <function-required-arg name="returnString">
            the return string received from command
        </function-required-arg>
 
    </function-map-args>

      <sequence>
         <script> 
              import re 
@@ -157,15 +138,12 @@
            </else>
            </if>
      </sequence>
      
  </function>

  <function name="checktestStringNotPresent">

    <function-prolog>
        This function checks the return string against an expected return substring that should not be present for a testcase
    </function-prolog>

    <function-map-args>
        <function-required-arg name="testString">
            the substring being tested from the command
@@ -173,7 +151,6 @@
        <function-required-arg name="returnString">
            the return string received from command
        </function-required-arg>
 
    </function-map-args>

      <sequence>
@@ -181,7 +158,6 @@
              import re 
              searchre = re.compile('%s' % testString)
            </script> 
  
            <if expr='re.search(searchre, returnString) == None'>
              <sequence>
              <tcstatus result="'pass'"/>
@@ -199,15 +175,12 @@
            </else>
            </if>
      </sequence>
      
  </function>

  <function name="isAlive">

    <function-prolog>
        Checks that the ldap server is running
    </function-prolog>

    <function-map-args>
        <function-required-arg name="noOfLoops">
            Number of loops
@@ -218,10 +191,8 @@
    </function-map-args>

      <sequence>

        <script>ldapRC=9999</script>
        <loop from="1" to="noOfLoops" while="ldapRC != 0">
 
          <sequence>
          <call function="'SearchObject'">
              { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
@@ -240,21 +211,15 @@
          <call function="'Sleep'">
              { 'sleepForMilliSeconds'  : noOfMilliSeconds }
          </call>
 
          </sequence>

        </loop>

      </sequence>

  </function>

  <function name="Sleep">

    <function-prolog>
        Sleep for number of milliseconds
    </function-prolog>

    <function-map-args>
        <function-required-arg name="sleepForMilliSeconds">
            Number of milliseconds to sleep
@@ -262,7 +227,6 @@
    </function-map-args>

    <sequence>

    <stafcmd name="'STAF Command: Delay'">
      <location>'%s' % (hostname)</location>
      <service>'delay'</service>
@@ -275,25 +239,19 @@
      { 'returncode' : RC ,
        'result'     : STAFResult }
    </call>

    </sequence>

  </function>

  <function name="setOSvariables">

    <function-prolog>
        Set OS related variables
    </function-prolog>

    <function-map-args>
        <function-required-arg name="hostname">
            Name of host
        </function-required-arg>
    </function-map-args>

    <sequence>

      <stafcmd name="'STAF Command: Get OS Name'">
        <location>'%s' % (hostname)</location>
        <service>'var'</service>
@@ -301,146 +259,94 @@
          'get system var STAF/Config/OS/Name'
        </request>
      </stafcmd>

      <message>
        'OS Name= %s' % STAFResult
      </message>

      <return>STAFResult</return>
    </sequence>

  </function>

  <function name="testCase_StartBanner">

    <function-prolog>
      Pretty prints a banner at the start of a test.
    </function-prolog>

    <function-no-args />

    <sequence>

      <message>
        '### Starting test case %s. ###' % STAXCurrentTestcase
      </message>

    </sequence>

  </function>

  <function name="testCase_EndBanner">

    <function-prolog>
      Pretty prints a banner at the end of a test.
    </function-prolog>

    <function-no-args />

    <sequence>

      <message>
        '### Ending test case %s. ###' % STAXCurrentTestcase
      </message>

    </sequence>

  </function>

  <function name="testCase_Preamble">

    <function-prolog>
      Performs all the preoperations for a test case
    </function-prolog>

    <function-no-args />

    <sequence>

      <call function="'testCase_StartBanner'" />

    </sequence>

  </function>

  <function name="testCase_Postamble">

    <function-prolog>
      Performs all the post operations for a test suite
    </function-prolog>

    <function-no-args />

    <sequence>

      <call function="'testCase_EndBanner'" />

    </sequence>

  </function>

  <function name="testSuite_Preamble">

    <function-prolog>
      Performs all the pre operations for a test suite
    </function-prolog>

    <function-no-args />

    <sequence>

      <message>'Enter test suite preamble'</message>

    </sequence>

  </function>

  <function name="testSuite_Postamble">

    <function-prolog>
      Performs all the post operations for a test suite
    </function-prolog>

    <function-no-args />

    <sequence>

      <message>'Enter test suite postamble'</message>

    </sequence>

  </function>

  <function name="testGroup_Preamble">

    <function-prolog>
      Performs all the pre operations for a test group
    </function-prolog>

    <function-no-args />

    <sequence>

      <message>'Enter test group postamble'</message>

    </sequence>

  </function>

  <function name="testGroup_Postamble">

    <function-prolog>
      Performs all the post operations for a test group
    </function-prolog>

    <function-no-args />

    <sequence>

      <message>'Enter test group postamble'</message>

    </sequence>

  </function>

</stax>

 opendj-sdk/opends/tests/functional-tests/staf-installer/config.py.stubs

@@ -24,6 +24,7 @@
DIRECTORY_INSTANCE_PORT     = '1389'
DIRECTORY_INSTANCE_SSL_PORT = '1636'
DIRECTORY_INSTANCE_SFX      = 'dc=com'
DIRECTORY_INSTANCE_BE       = 'userRoot'
STAGED_DATA_DIR             = '${tests.run.dir}/${tests.run.time}/data/shared/data'
JAVA_HOME                   = '${java.home}'
SEND_MAIL_AFTER_TEST_RUN    = '${staf.email.send}'