Update or Add tests for ACI replication, import-ldif, security/account_acti...

ludovicp

27.27.2010 2bb53a0b19b5fce4d4540f33bcaaa2e95ddcebcf

 opends/tests/staf-tests/functional-tests/testcases/aci/aci_import.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -145,13 +145,12 @@
                   'ACI: Import: import-ldif with bad ACI, user adding import task'
                </message>
    
                <call function="'importLdifTask'">
                { 'dsInstanceHost'     : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'     : DIRECTORY_INSTANCE_PORT ,
                  'dsInstanceDn'       : DIRECTORY_INSTANCE_DN ,
                  'dsInstancePswd'     : DIRECTORY_INSTANCE_PSWD  ,
                  'taskID'             : STAXCurrentTestcase ,
                  'ldifFile'           : '%s/aci/aci_import/import_task.ldif' % remote.data
                <call function="'ImportLdifWithScript'">
                { 'dsInstanceHost'      : DIRECTORY_INSTANCE_HOST ,
                  'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT ,
                  'dsInstanceDn'        : DIRECTORY_INSTANCE_DN ,
                  'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD  ,
                  'ldifFile'            : '%s/aci/aci_import/import_task.ldif' % remote.data
                }
                </call>
    

 opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml

@@ -51,8 +51,8 @@

          <call function="'ImportLdifWithScript'">
            {
              'dsLdifFile'  : '%s/backends/export_tasks_ldif/default.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE
              'ldifFile'  : '%s/backends/export_tasks_ldif/default.ldif' % remote.data,
              'backEnd'   : DIRECTORY_INSTANCE_BE
            }
          </call>

@@ -132,8 +132,8 @@

          <call function="'ImportLdifWithScript'">
            {
              'dsLdifFile'  : '%s/backends/export_tasks_ldif/nonDefault.ldif' % remote.data,
              'dsBackEnd'   : 'nonDefault'
              'ldifFile'      : '%s/backends/export_tasks_ldif/nonDefault.ldif' % remote.data,
              'backEnd'   : 'nonDefault'
            }
          </call>

@@ -1400,10 +1400,10 @@

          <call function="'ImportLdifWithScript'">
            {
              'dsLdifFile'  : '%s/backends/ExportTasks19.ldif.gz' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE,
              'dsAppend'   : ' ',
              'dsIsCompressed'  : 'True'
              'ldifFile'      : '%s/backends/ExportTasks19.ldif.gz' % remote.data,
              'backEnd'       : DIRECTORY_INSTANCE_BE,
              'append'        : ' ',
              'isCompressed'  : 'True'
            }
          </call>


 opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Copyright 2009-2010 Sun Microsystems, Inc.
 ! -->

<stax>
@@ -141,14 +141,14 @@
          </message>
          <call function="'exportLdifWithScript'">
            { 
              'ldifFile' : '%s/backends/Export_default.ldif' % remote.data,
             'ldifFile' : '%s/backends/Export_default.ldif' % remote.data,
             'backEnd'  : '%s' % DIRECTORY_INSTANCE_BE
            }
          </call>
          
          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_default.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_default.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -236,12 +236,11 @@
            }
          </call>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
              'taskID'         : STAXCurrentTestcase,
              'ldifFile'       : '%s/backends/nonDefault.ldif' % remote.data,
              'backEnd'        : 'nonDefault'
            }
@@ -264,8 +263,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_nonDefault.ldif' % remote.data,
              'dsBackEnd'   : 'nonDefault' ,
            { 'ldifFile' : '%s/backends/Export_nonDefault.ldif' % remote.data,
              'backEnd'  : 'nonDefault' ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -349,8 +348,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_IncludeBranch.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_IncludeBranch.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -430,8 +429,8 @@
          </call>
          
          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_IncludeBranches.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_IncludeBranches.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -511,8 +510,8 @@
          </call>
  
          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_ExcludeBranch.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_ExcludeBranch.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -592,8 +591,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_ExcludeBranches.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_ExcludeBranches.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -673,8 +672,8 @@
          </call>
  
          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_MixBranches.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_MixBranches.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -752,8 +751,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_IncludeAttr.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_IncludeAttr.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -831,8 +830,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_IncludeAttrs.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_IncludeAttrs.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -912,8 +911,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_ExcludeAttr.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_ExcludeAttr.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -991,8 +990,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_ExcludeAttrs.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_ExcludeAttrs.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -1074,8 +1073,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_FractionalMix.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_FractionalMix.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -1155,8 +1154,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_FilteredInclude.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_FilteredInclude.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -1235,8 +1234,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -1315,8 +1314,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_FilteredExclude.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_FilteredExclude.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -1397,8 +1396,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_FilteredExcludes.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_FilteredExcludes.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -1480,8 +1479,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -1561,8 +1560,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_FilteredComplexIncludes.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_FilteredComplexIncludes.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -1641,8 +1640,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_FilteredComplexExcludes.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_FilteredComplexExcludes.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -1723,8 +1722,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/Export_FilteredMix.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
@@ -1803,10 +1802,10 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile'  : '%s/backends/Export_FilteredMix.ldif' % remote.data,
              'dsAppend'    : 'True' ,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
              'dsPath'      : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            { 'ldifFile'  : '%s/backends/Export_FilteredMix.ldif' % remote.data,
              'append'    : 'True' ,
              'backEnd'   : DIRECTORY_INSTANCE_BE ,
              'dsPath'    : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
         
@@ -1884,10 +1883,10 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile'      : '%s/backends/ExportCompressed.ldif' % remote.data,
              'dsIsCompressed'  : 'True' ,
              'dsBackEnd'       : DIRECTORY_INSTANCE_BE ,
              'dsPath'          : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            { 'ldifFile'      : '%s/backends/ExportCompressed.ldif' % remote.data,
              'isCompressed'  : 'True' ,
              'backEnd'       : DIRECTORY_INSTANCE_BE ,
              'dsPath'        : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
        
@@ -1965,10 +1964,10 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile'    : '%s/backends/ExportEncrypted.ldif' % remote.data,
              'dsIsEncrypted' : 'True' ,
              'dsBackEnd'     : DIRECTORY_INSTANCE_BE ,
              'dsPath'        : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            { 'ldifFile'    : '%s/backends/ExportEncrypted.ldif' % remote.data,
              'isEncrypted' : 'True' ,
              'backEnd'     : DIRECTORY_INSTANCE_BE ,
              'dsPath'      : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>
    
@@ -2089,8 +2088,8 @@
          </call>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile' : '%s/backends/ExportWrapCol.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
            { 'ldifFile' : '%s/backends/ExportWrapCol.ldif' % remote.data,
              'backEnd'  : DIRECTORY_INSTANCE_BE ,
              'dsPath'   : '%s/%s' % (DsInstanceDir, OPENDSNAME)
            }
          </call>

 opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Copyright 2009-2010 Sun Microsystems, Inc.
 ! -->

<stax>
@@ -49,12 +49,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
              'taskID'         : STAXCurrentTestcase,
              'ldifFile'       : '%s/backends/Example.ldif' % remote.data
            }
          </call>
@@ -122,12 +121,11 @@
            }
          </call>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
              'taskID'         : STAXCurrentTestcase,
              'ldifFile'       : '%s/backends/nonDefault.ldif' % remote.data,
              'backEnd'        : 'nonDefault'
            }
@@ -180,12 +178,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'  : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'    : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'  : DIRECTORY_INSTANCE_PSWD,
              'taskID'          : STAXCurrentTestcase,
              'ldifFile'        : '%s/backends/Include.ldif' % remote.data,
              'includeBranches' : ['dc=com'],
            }
@@ -238,12 +235,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'  : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'    : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'  : DIRECTORY_INSTANCE_PSWD,
              'taskID'          : STAXCurrentTestcase,
              'ldifFile'        : '%s/backends/Include.ldif' % remote.data,
              'includeBranches' : ['dc=com','dc=example,dc=com']
            }
@@ -296,9 +292,9 @@

          <call function="'testCase_Preamble'" />

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'  : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'    : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'  : DIRECTORY_INSTANCE_PSWD,
              'taskID'          : STAXCurrentTestcase,
@@ -356,9 +352,9 @@

          <call function="'testCase_Preamble'" />

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'  : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'    : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'  : DIRECTORY_INSTANCE_PSWD,
              'taskID'          : STAXCurrentTestcase,
@@ -418,12 +414,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'  : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'    : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'  : DIRECTORY_INSTANCE_PSWD,
              'taskID'          : STAXCurrentTestcase,
              'ldifFile'        : '%s/backends/Exclude.ldif' % remote.data,
              'includeBranches' : ['dc=com'],
              'excludeBranches' : ['ou=Departed,ou=People,dc=example,dc=com'],
@@ -479,12 +474,11 @@

          <call function="'testCase_Preamble'" />

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'    : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'      : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD,
              'taskID'            : STAXCurrentTestcase,
              'ldifFile'          : '%s/backends/Include.ldif' % remote.data,
              'includeAttributes' : ['dc'],
            }
@@ -536,12 +530,11 @@

          <call function="'testCase_Preamble'" />

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'  : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'    : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'  : DIRECTORY_INSTANCE_PSWD,
              'taskID'          : STAXCurrentTestcase,
              'ldifFile'        : '%s/backends/Include.ldif' % remote.data,
              'includeAttributes' : ['dc','cn','ou','sn']
            }
@@ -594,12 +587,11 @@

          <call function="'testCase_Preamble'" />

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'    : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'      : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD,
              'taskID'            : STAXCurrentTestcase,
              'ldifFile'          : '%s/backends/Exclude.ldif' % remote.data,
              'excludeAttributes' : ['userpassword']
            }
@@ -651,12 +643,11 @@

          <call function="'testCase_Preamble'" />

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'    : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'      : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD,
              'taskID'            : STAXCurrentTestcase,
              'ldifFile'          : '%s/backends/Exclude.ldif' % remote.data,
              'excludeAttributes' : ['userpassword','mail','roomnumber']
            }
@@ -708,12 +699,11 @@

          <call function="'testCase_Preamble'" />

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'    : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'      : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD,
              'taskID'            : STAXCurrentTestcase,
              'ldifFile'          : '%s/backends/Exclude.ldif' % remote.data,
              'includeBranches'   : ['dc=com','dc=example,dc=com','ou=People,dc=example,dc=com'],
              'excludeBranches'   : ['ou=Departed,ou=People,dc=example,dc=com'],
@@ -770,12 +760,11 @@

          <call function="'testCase_Preamble'" />

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'  : DIRECTORY_INSTANCE_PORT,
             'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'    : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'  : DIRECTORY_INSTANCE_PSWD,
              'taskID'          : STAXCurrentTestcase,
              'ldifFile'        : '%s/backends/Include.ldif' % remote.data,
              'includeFilters'  : ['objectclass=*'],
            }
@@ -828,12 +817,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'  : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'    : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'  : DIRECTORY_INSTANCE_PSWD,
              'taskID'          : STAXCurrentTestcase,
              'ldifFile'        : '%s/backends/Exclude.ldif' % remote.data,
              'excludeFilters'  : ['objectclass=person'],
            }
@@ -888,12 +876,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'  : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'    : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'  : DIRECTORY_INSTANCE_PSWD,
              'taskID'          : STAXCurrentTestcase,
              'ldifFile'        : '%s/backends/Include.ldif' % remote.data,
              'includeFilters'  : ['objectclass=domain*','objectclass=organizationalunit']
            }
@@ -948,12 +935,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'  : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'    : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'  : DIRECTORY_INSTANCE_PSWD,
              'taskID'          : STAXCurrentTestcase,
              'ldifFile'        : '%s/backends/Exclude.ldif' % remote.data,
              'excludeFilters'  : ['objectclass=person','objectclass=organizationalunit'],
            }
@@ -1005,12 +991,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'  : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'    : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'  : DIRECTORY_INSTANCE_PSWD,
              'taskID'          : STAXCurrentTestcase,
              'ldifFile'        : '%s/backends/Include.ldif' % remote.data,
              'includeFilters'  : ['|(objectclass=person)(objectclass=domain)(objectclass=organizationalunit)'],
            }
@@ -1063,12 +1048,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'  : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'    : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'  : DIRECTORY_INSTANCE_PSWD,
              'taskID'          : STAXCurrentTestcase,
              'ldifFile'        : '%s/backends/Exclude.ldif' % remote.data,
              'excludeFilters'  : ['&amp;(objectclass=person)(ou=Departed)'],
            }
@@ -1120,12 +1104,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'    : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'      : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD,
              'taskID'            : STAXCurrentTestcase,
              'ldifFile'          : '%s/backends/Exclude.ldif' % remote.data,
              'excludeFilters'    : ['&amp;(objectclass=person)(ou=Departed)'],
              'includeBranches'   : ['dc=com'],
@@ -1179,12 +1162,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
              'taskID'         : STAXCurrentTestcase,
              'ldifFile'       : '%s/backends/Append.ldif' % remote.data,
              'append'         : 'TRUE'
            }
@@ -1237,12 +1219,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'  : DIRECTORY_INSTANCE_PORT,
             'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'    : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'  : DIRECTORY_INSTANCE_PSWD,
              'taskID'          : STAXCurrentTestcase,
              'ldifFile'        : '%s/backends/Append.ldif' % remote.data,
              'append'          : 'TRUE',
              'replaceExisting' : 'TRUE'
@@ -1296,12 +1277,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
              'taskID'         : STAXCurrentTestcase,
              'ldifFile'       : '%s/backends/Example.ldif.gz' % remote.data,
              'isCompressed'   : 'TRUE'
            }
@@ -1354,12 +1334,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
               'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
              'taskID'         : STAXCurrentTestcase,
              'ldifFile'       : '%s/backends/Example.ldif' % remote.data,
              'isEncrypted'    : 'TRUE'
            }
@@ -1420,12 +1399,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
              'taskID'         : STAXCurrentTestcase,
              'ldifFile'       : '%s/backends/Example.ldif' % remote.data,
              'isEncrypted'    : 'TRUE'
            }
@@ -1486,14 +1464,13 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
              'taskID'         : STAXCurrentTestcase,
              'ldifFile'       : '%s/backends/Example.ldif' % remote.data,
              'rejectsFile'    : './rejects'
              'rejectFile'                   : './rejects'
            }
          </call>

@@ -1545,15 +1522,14 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'       : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'       : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'         : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'       : DIRECTORY_INSTANCE_PSWD,
              'taskID'               : STAXCurrentTestcase,
              'ldifFile'             : '%s/backends/Example.ldif' % remote.data,
              'rejectsFile'          : './rejects',
              'overwriteRejectsFile' : 'TRUE'
              'rejectFile'                    : './rejects',
              'overwriteFile'              : 'TRUE'
            }
          </call>

@@ -1605,12 +1581,11 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'       : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'       : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'  : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'         : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'       : DIRECTORY_INSTANCE_PSWD,
              'taskID'               : STAXCurrentTestcase,
              'ldifFile'             : '%s/backends/Schema.ldif' % remote.data,
              'skipSchemaValidation' : 'TRUE'
            }
@@ -1663,14 +1638,12 @@

          <call function="'testCase_Preamble'"/>

          <call function="'importLdifTask'">
          <call function="'ImportLdifWithScript'">
            { 'dsInstanceHost'       : DIRECTORY_INSTANCE_HOST,
              'dsInstancePort'       : DIRECTORY_INSTANCE_PORT,
              'dsInstanceAdminPort'   : DIRECTORY_INSTANCE_ADMIN_PORT,
              'dsInstanceDn'         : DIRECTORY_INSTANCE_DN,
              'dsInstancePswd'       : DIRECTORY_INSTANCE_PSWD,
              'taskID'               : STAXCurrentTestcase,
              'ldifFile'             : '%s/backends/Schema.ldif' % remote.data,
              'skipSchemaValidation' : 'FALSE'
              'ldifFile'                         : '%s/backends/Schema.ldif' % remote.data
            }
          </call>


 opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml

@@ -50,8 +50,8 @@
          <call function="'testCase_Preamble'"/>
              
          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile'  : '%s/backends/Example.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE
            { 'ldifFile'  : '%s/backends/Example.ldif' % remote.data,
              'backEnd'   : DIRECTORY_INSTANCE_BE
            }
          </call>
  
@@ -128,8 +128,8 @@
          <call function="'StopDsWithScript'"/>

          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile'  : '%s/backends/nonDefault.ldif' % remote.data,
              'dsBackEnd'   : 'nonDefault'
            { 'ldifFile'  : '%s/backends/nonDefault.ldif' % remote.data,
              'backEnd'   : 'nonDefault'
            }
          </call>

@@ -176,8 +176,8 @@
          <call function="'testCase_Preamble'"/>
  
          <call function="'ImportLdifWithScript'">
            { 'dsLdifFile'      : '%s/backends/Include.ldif' % remote.data,
              'dsIncludeBranch' : ['dc=com'] }
            { 'ldifFile'        : '%s/backends/Include.ldif' % remote.data,
              'includeBranches' : ['dc=com'] }
          </call>
  
          <call function="'checkImport'">
@@ -228,9 +228,9 @@
  
          <call function="'ImportLdifWithScript'">
            { 'location'        : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'      : '%s/backends/Include.ldif' % remote.data,
              'dsIncludeBranch' : ['dc=com'],
              'dsBackEnd'       : DIRECTORY_INSTANCE_BE 
              'ldifFile'        : '%s/backends/Include.ldif' % remote.data,
              'includeBranches' : ['dc=com'],
              'backEnd'         : DIRECTORY_INSTANCE_BE
            }
          </call>
  
@@ -280,8 +280,8 @@
              
          <call function="'ImportLdifWithScript'">
            { 'location'        : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'      : '%s/backends/Include.ldif' % remote.data,
              'dsIncludeBranch' : ['dc=com','dc=example,dc=com']
              'ldifFile'        : '%s/backends/Include.ldif' % remote.data,
              'includeBranches' : ['dc=com','dc=example,dc=com']
            }
          </call>
  
@@ -331,9 +331,9 @@
  
          <call function="'ImportLdifWithScript'">
            { 'location'        : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'      : '%s/backends/Exclude.ldif' % remote.data,
              'dsExcludeBranch' : ['ou=Departed,ou=People,dc=example,dc=com'],
              'dsBackEnd'       : DIRECTORY_INSTANCE_BE
              'ldifFile'        : '%s/backends/Exclude.ldif' % remote.data,
              'excludeBranches' : ['ou=Departed,ou=People,dc=example,dc=com'],
              'backEnd'         : DIRECTORY_INSTANCE_BE
            }
          </call>
  
@@ -386,9 +386,9 @@

          <call function="'ImportLdifWithScript'">
            { 'location'        : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'      : '%s/backends/Exclude.ldif' % remote.data,
              'dsExcludeBranch' : ['ou=Departed,ou=People,dc=example,dc=com', 'ou=unit1, ou=People, dc=example,dc=com'],
              'dsBackEnd'       : DIRECTORY_INSTANCE_BE
              'ldifFile'        : '%s/backends/Exclude.ldif' % remote.data,
              'excludeBranches' : ['ou=Departed,ou=People,dc=example,dc=com', 'ou=unit1, ou=People, dc=example,dc=com'],
              'backEnd'         : DIRECTORY_INSTANCE_BE
            }
          </call>

@@ -442,9 +442,9 @@

          <call function="'ImportLdifWithScript'">
              { 'location'        : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'      : '%s/backends/Exclude.ldif' % remote.data,
              'dsIncludeBranch' : ['dc=com'],
              'dsExcludeBranch' : ['ou=Departed,ou=People,dc=example,dc=com']
              'ldifFile'          : '%s/backends/Exclude.ldif' % remote.data,
              'includeBranches'   : ['dc=com'],
              'excludeBranches'   : ['ou=Departed,ou=People,dc=example,dc=com']
              }
          </call>

@@ -497,9 +497,9 @@
          
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Include.ldif' % remote.data,
              'dsIncludeAttribute' : ['dc'],
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Include.ldif' % remote.data,
              'includeAttributes'  : ['dc'],
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -549,9 +549,9 @@
          
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Include.ldif' % remote.data,
              'dsIncludeAttribute' : ['dc','cn','ou','sn'],
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Include.ldif' % remote.data,
              'includeAttributes'  : ['dc','cn','ou','sn'],
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>
  
@@ -601,9 +601,9 @@
                        
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Exclude.ldif' % remote.data,
              'dsExcludeAttribute' : ['userpassword'],
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Exclude.ldif' % remote.data,
              'excludeAttributes'  : ['userpassword'],
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -653,9 +653,9 @@
                                      
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Exclude.ldif' % remote.data,
              'dsExcludeAttribute' : ['userpassword','mail','roomnumber'],
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Exclude.ldif' % remote.data,
              'excludeAttributes'  : ['userpassword','mail','roomnumber'],
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -706,10 +706,10 @@
                                                        
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Example.ldif' % remote.data,
              'dsIncludeAttribute' : ['dc','cn','ou','sn'],
              'dsIncludeBranch'    : ['dc=com','dc=example,dc=com','ou=People,dc=example,dc=com'],
              'dsExcludeBranch'    : ['ou=Departed,ou=People,dc=example,dc=com']
              'ldifFile'           : '%s/backends/Example.ldif' % remote.data,
              'includeAttributes'  : ['dc','cn','ou','sn'],
              'includeBranches'    : ['dc=com','dc=example,dc=com','ou=People,dc=example,dc=com'],
              'excludeBranches'    : ['ou=Departed,ou=People,dc=example,dc=com']
              }
          </call>

@@ -762,9 +762,9 @@
                                               
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Include.ldif' % remote.data,
              'dsIncludeFilter'    : ['objectclass=*'],
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Include.ldif' % remote.data,
              'includeFilters'     : ['objectclass=*'],
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -815,9 +815,9 @@
                                      
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Exclude.ldif' % remote.data,
              'dsExcludeFilter'    : ['objectclass=person'],
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Exclude.ldif' % remote.data,
              'excludeFilters'     : ['objectclass=person'],
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -870,9 +870,9 @@
                                                    
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Include.ldif' % remote.data,
              'dsIncludeFilter'    : ['objectclass=domain','objectclass=organizationalunit'],
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Include.ldif' % remote.data,
              'includeFilters'     : ['objectclass=domain','objectclass=organizationalunit'],
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -925,9 +925,9 @@
                                             
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Exclude.ldif' % remote.data,
              'dsExcludeFilter'    : ['objectclass=person','objectclass=organizationalunit'],
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Exclude.ldif' % remote.data,
              'excludeFilters'     : ['objectclass=person','objectclass=organizationalunit'],
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -977,9 +977,9 @@
                                   
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Include.ldif' % remote.data,
              'dsIncludeFilter'    : ['|(objectclass=person)(objectclass=domain)(objectclass=organizationalunit)'],
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Include.ldif' % remote.data,
              'includeFilters'     : ['|(objectclass=person)(objectclass=domain)(objectclass=organizationalunit)'],
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -1030,9 +1030,9 @@
                                                 
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Exclude.ldif' % remote.data,
              'dsExcludeFilter'    : ['&amp;(objectclass=person)(ou=Departed)'],
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Exclude.ldif' % remote.data,
              'excludeFilters'     : ['&amp;(objectclass=person)(ou=Departed)'],
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -1082,10 +1082,10 @@
                                                                             
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Exclude.ldif' % remote.data,
              'dsExcludeFilter'    : ['&amp;(objectclass=person)(ou=Departed)'],
              'dsIncludeBranch'    : ['dc=com'],
              'dsExcludeAttribute' : ['userpassword']
              'ldifFile'           : '%s/backends/Exclude.ldif' % remote.data,
              'excludeFilters'     : ['&amp;(objectclass=person)(ou=Departed)'],
              'includeBranches'    : ['dc=com'],
              'excludeAttributes'  : ['userpassword']
              }
          </call>

@@ -1135,9 +1135,9 @@
                                                                                           
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Append.ldif' % remote.data,
              'dsAppend'           : 'TRUE',
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Append.ldif' % remote.data,
              'append'             : 'TRUE',
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -1188,10 +1188,10 @@
                                                                                                         
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Append.ldif' % remote.data,
              'dsAppend'           : 'TRUE',
              'dsReplaceExisting'  : 'TRUE',
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE,
              'ldifFile'           : '%s/backends/Append.ldif' % remote.data,
              'append'             : 'TRUE',
              'replaceExisting'    : 'TRUE',
              'backEnd'            : DIRECTORY_INSTANCE_BE,
              'knownIssue'         : '6927338'
              }
          </call>
@@ -1243,9 +1243,9 @@
                                                                                                                       
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Example.ldif.gz' % remote.data,
              'dsIsCompressed'     : 'TRUE',
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Example.ldif.gz' % remote.data,
              'isCompressed'       : 'TRUE',
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -1296,9 +1296,9 @@
                                                                                                                                     
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Example.ldif' % remote.data,
              'dsIsEncrypted'      : 'TRUE',
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Example.ldif' % remote.data,
              'isEncrypted'        : 'TRUE',
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -1358,9 +1358,9 @@
                                                                                                                                     
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Example.ldif' % remote.data,
              'dsIsEncrypted'      : 'TRUE',
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Example.ldif' % remote.data,
              'isEncrypted'        : 'TRUE',
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -1422,9 +1422,9 @@
                                                                                                                                                   
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Example.ldif' % remote.data,
              'dsRejectFile'       : '%s/rejects.txt' % remote.temp,
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Example.ldif' % remote.data,
              'rejectFile'         : '%s/rejects.txt' % remote.temp,
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -1475,9 +1475,9 @@
                                                                                                                                                   
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Example.ldif' % remote.data,
              'dsRejectFile'       : '%s/rejects.txt' % remote.temp,
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Example.ldif' % remote.data,
              'rejectFile'         : '%s/rejects.txt' % remote.temp,
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -1528,9 +1528,9 @@
                                                                                                                                                                 
          <call function="'ImportLdifWithScript'">
              { 'location'             : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'             : '%s/backends/Schema.ldif' % remote.data,
              'dsSkipSchemaValidation' : 'TRUE',
              'dsBackEnd'              : DIRECTORY_INSTANCE_BE
              'ldifFile'               : '%s/backends/Schema.ldif' % remote.data,
              'skipSchemaValidation'   : 'TRUE',
              'backEnd'                : DIRECTORY_INSTANCE_BE
              }
          </call>

@@ -1581,8 +1581,8 @@
                                                                                                                                                                               
          <call function="'ImportLdifWithScript'">
              { 'location'         : STAF_REMOTE_HOSTNAME,
              'dsLdifFile'         : '%s/backends/Schema.ldif' % remote.data,
              'dsBackEnd'          : DIRECTORY_INSTANCE_BE
              'ldifFile'           : '%s/backends/Schema.ldif' % remote.data,
              'backEnd'            : DIRECTORY_INSTANCE_BE
              }
          </call>
          

 opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_setup.xml

@@ -109,10 +109,9 @@
                'Add initial entries'
              </message>

              <call function="'importLdif'">
                { 
                'ldifFile'    : '%s/clu_secure/clus_start.ldif'
                                % remote.data
              <call function="'ImportLdifWithScript'">
                {
                'ldifFile' : '%s/clu_secure/clus_start.ldif' % remote.data
                }
              </call>


 opends/tests/staf-tests/functional-tests/testcases/core/binaryattr/core_binaryattr_tests.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Copyright 2009-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -218,9 +218,9 @@
                                        'dsInstanceAdminPort' : server.adminport    ,
                                        'dsInstanceDn'        : server.dn           ,
                                        'dsInstancePswd'      : server.password     ,
                                        'dsBackEnd'           : server.backend      ,
                                        'dsLdifFile'          : binaryattrLdif          ,
                                        'dsRejectFile'        : '%s/rejects.txt' % remote.temp }
                                        'backEnd'             : server.backend      ,
                                        'ldifFile'            : binaryattrLdif          ,
                                        'rejectFile'          : '%s/rejects.txt' % remote.temp }
              }
            </call>


 opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch_tests.xml

@@ -51,8 +51,8 @@

          <call function="'ImportLdifWithScript'">
            {
              'dsLdifFile'  : '%s/core/psearch/default.ldif' % remote.data,
              'dsBackEnd'   : DIRECTORY_INSTANCE_BE
              'ldifFile'  : '%s/core/psearch/default.ldif' % remote.data,
              'backEnd'   : DIRECTORY_INSTANCE_BE
            }
          </call>

@@ -1188,4 +1188,4 @@
    </testcase>
  </function>

</stax>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode_tests.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Copyright 2009-2010 Sun Microsystems, Inc.
 ! -->

<stax>
@@ -161,8 +161,8 @@
              'dsInstanceAdminPort' : server.adminport  ,
              'dsInstanceDn'        : server.dn         ,
              'dsInstancePswd'      : server.password   ,            
              'dsLdifFile'          : dsconfigbatchLdif ,
              'dsBackEnd'           : newBackend
              'ldifFile'            : dsconfigbatchLdif ,
              'backEnd'             : newBackend
            }
          </call>


 opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml

@@ -322,12 +322,12 @@
                  </call>

                  <call function="'ImportLdifWithScript'">
                    { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                    { 'dsInstanceHost'      : DIRECTORY_INSTANCE_HOST,
                      'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                      'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
                      'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
                      'dsLdifFile' : '%s/dsml/ldif-files/%s' % (remote.data,dsmlBaseDNs.get(baseDN)[0]),
                      'dsBackEnd' : '%s' % dsmlBaseDNs.get(baseDN)[1]
                      'dsInstanceDn'        : DIRECTORY_INSTANCE_DN,
                      'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD,
                      'ldifFile'            : '%s/dsml/ldif-files/%s' % (remote.data,dsmlBaseDNs.get(baseDN)[0]),
                      'backEnd'             : '%s' % dsmlBaseDNs.get(baseDN)[1]
                    }
                  </call>
                 

 opends/tests/staf-tests/functional-tests/testcases/fractional-replication/basic.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Copyright 2009-2010 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="fractional-replication_basic"/>
@@ -348,10 +348,10 @@
          <call function="'ImportLdifWithScript'">
            { "location"          : Pservers[0].getHostname(),
              "dsPath"            : '%s/%s' % (Pservers[0].getDir(),OPENDSNAME),
              "dsBackEnd"         : "userRoot",
              "dsTemplateFile"    : "%s/%s/fractional-replication/basic-master.template" % \
              "backEnd"           : "userRoot",
              "templateFile"      : "%s/%s/fractional-replication/basic-master.template" % \
                                    (Pservers[0].getDir(),remote.reldatadir),
              "dsReplaceExisting" : True,
              "replaceExisting"   : True,
            }
          </call>
          <!-- all Pservers : start -->
@@ -455,11 +455,11 @@
              'dsInstanceAdminPort' : Pservers[0].getAdminPort(),
              'dsInstanceDn'        : Pservers[0].getRootDn(),
              'dsInstancePswd'      : Pservers[0].getRootPwd(),
              'dsBackEnd'           : 'userRoot',
              'dsAppend'            : True,
              'dsRejectFile'        : '%s/basic-masterOnlineImport.rejected' % remote.temp,
              'dsOverWriteRejects'  : True,
              'dsTemplateFile'          : '%s/%s/fractional-replication/basic-masterOnlineImport.template' % \
              'backEnd'             : 'userRoot',
              'append'              : True,
              'rejectFile'          : '%s/basic-masterOnlineImport.rejected' % remote.temp,
              'overwriteFile'       : True,
              'templateFile'        : '%s/%s/fractional-replication/basic-masterOnlineImport.template' % \
                                      (Pservers[0].getDir(),remote.reldatadir)
            }
          </call>
@@ -470,11 +470,11 @@
              'dsInstanceAdminPort' : Pservers[1].getAdminPort(),
              'dsInstanceDn'        : Pservers[1].getRootDn(),
              'dsInstancePswd'      : Pservers[1].getRootPwd(),
              'dsBackEnd'           : 'userRoot',
              'dsAppend'            : True,
              'dsRejectFile'        : '%s/basic-masterOnlineImport.rejected' % remote.temp,
              'dsOverWriteRejects'  : True,
              'dsTemplateFile'          : '%s/%s/fractional-replication/basic-masterOnlineImport.template' % \
              'backEnd'             : 'userRoot',
              'append'              : True,
              'rejectFile'          : '%s/basic-masterOnlineImport.rejected' % remote.temp,
              'overwriteFile'       : True,
              'templateFile'        : '%s/%s/fractional-replication/basic-masterOnlineImport.template' % \
                                      (Pservers[1].getDir(),remote.reldatadir)
            }
          </call>

 opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication_setup.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Copyright 2009-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -141,8 +141,8 @@
              <call function="'ImportLdifWithScript'">
                { 'location'     : masterHost,
                  'dsPath'       : masterPath,
                  'dsBackEnd'    : DIRECTORY_INSTANCE_BE,
                  'dsLdifFile'   : importDataFile
                  'backEnd'      : DIRECTORY_INSTANCE_BE,
                  'ldifFile'     : importDataFile
                }
              </call>


 opends/tests/staf-tests/functional-tests/testcases/fractional-replication/utils.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Copyright 2009-2010 Sun Microsystems, Inc.
 ! -->
<stax>
  <function name="get-fractional-replication-attributes" scope="local">
@@ -467,14 +467,14 @@
                  skipLine = True
              elif not skipLine:
                refFiltered.append(f+"\n")
            f=open('%s/%s' % (TMPDIR, filteredRefTree),'w')
            f=open('%s/%s' % (local.temp, filteredRefTree),'w')
            f.writelines(refFiltered)
            f.close()
          </script>
          <call function="'copyFile'">
            {
            'location'   : STAXServiceMachine ,
            'srcfile'    : '%s/%s' % (TMPDIR, filteredRefTree) ,
            'srcfile'    : '%s/%s' % (local.temp, filteredRefTree) ,
            'destfile'   : '%s/%s' % (remote.temp, filteredRefTree) ,
            'remotehost' : dsMaster.getHostname()
            }
@@ -501,13 +501,13 @@
        <sequence>
          <script>
            filLdif = STAXResult[0][1]
            f=open('%s/%s' % (TMPDIR, fractionalTree),'w')
            f=open('%s/%s' % (local.temp, fractionalTree),'w')
            f.writelines(filLdif)
            f.close()
          </script>
          <call function="'copyFile'">
            { 'location'   : STAXServiceMachine ,
              'srcfile'    : '%s/%s' % (TMPDIR, fractionalTree) ,
              'srcfile'    : '%s/%s' % (local.temp, fractionalTree) ,
              'destfile'   : '%s/%s' % (remote.temp, fractionalTree) ,
              'remotehost' : dsMaster.getHostname()
            }

 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_import_task.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 !      Copyright 2008-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -101,16 +101,25 @@
                     'Privileges: Import Tasks: import-ldif, user adding import task'
                  </message>
      
                  <call function="'importLdifTask'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT,
                    'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                    'dsInstancePswd'   : 'ACIRules',
                    'taskID'           : STAXCurrentTestcase,
                    'ldifFile'         : '%s/privileges/privileges_import_task/import_task.ldif' \
                                          % remote.data,
                    'expectedRC'       : 50
                  }
                  <call function="'ImportLdifWithScript'">
                    { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST,
                      'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                      'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                      'dsInstancePswd'   : 'ACIRules',
                      'ldifFile'         : '%s/privileges/privileges_import_task/import_task.ldif' \
                                            % remote.data,
                      'expectedRC'                 : 1
                    }
                  </call>

                  <script>
                   resultString = STAXResult[0][1]
                  </script>

                  <call function="'searchString'">
                  { 'expectedString' : 'Tasks cannot be\nadded due to insufficient access rights\n',
                    'returnString'   : resultString ,
                    }
                  </call>
                  
                  <message>
@@ -132,15 +141,14 @@
                     'Privileges: Import Tasks: import-ldif, user adding import task'
                  </message>
      
                  <call function="'importLdifTask'">
                  <call function="'ImportLdifWithScript'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT,
                    'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                    'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                    'dsInstanceDn'     : "uid=auser,o=Privileges Tests,dc=example,dc=com" ,
                    'dsInstancePswd'   : 'ACIRules',
                    'taskID'           : STAXCurrentTestcase,
                    'ldifFile'         : '%s/privileges/privileges_import_task/import_task.ldif' \
                                          % remote.data,
                    'expectedRC'       : 50
                    'expectedRC'                  : 1
                  }
                  </call>
                  
@@ -167,12 +175,11 @@
                     'Privileges: Import Tasks: import-ldif, user adding import task'
                  </message>
      
                  <call function="'importLdifTask'">
                  <call function="'ImportLdifWithScript'">
                  { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST,
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT,
                    'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                    'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                    'dsInstancePswd'   : 'ACIRules' ,
                    'taskID'           : STAXCurrentTestcase,
                    'ldifFile'         : '%s/privileges/privileges_import_task/import_task.ldif' % remote.data
                  }
                  </call>
@@ -265,16 +272,25 @@
                     'Privileges: Import Tasks: import-ldif, Directory Manager, DM adding import task'
                  </message>
      
                  <call function="'importLdifTask'">
                  { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                    'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                    'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
                    'taskID'         : STAXCurrentTestcase,
                    'ldifFile'       : '%s/privileges/privileges_import_task/import_task.ldif' \
                                       % remote.data,
                    'expectedRC'     : 50
                  }
                  <call function="'ImportLdifWithScript'">
                    { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                      'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                      'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,
                      'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
                      'ldifFile'       : '%s/privileges/privileges_import_task/import_task.ldif' \
                                         % remote.data,
                      'expectedRC'               : 1
                    }
                  </call>

                  <script>
                   resultString = STAXResult[0][1]
                  </script>

                  <call function="'searchString'">
                   { 'returnString'       : resultString ,
                       'expectedString'   : 'You do not have sufficient privileges to initiate an LDIF import'
                   }
                  </call>
                  
                  <message>
@@ -296,12 +312,11 @@
                     'Privileges: Import Tasks: import-ldif, Directory Manager, DM adding import task'
                  </message>
      
                  <call function="'importLdifTask'">
                  <call function="'ImportLdifWithScript'">
                  { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                    'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                    'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                    'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
                    'taskID'         : STAXCurrentTestcase,
                    'ldifFile'       : '%s/privileges/privileges_import_task/import_task.ldif' \
                                        % remote.data
                  }
@@ -392,15 +407,24 @@
                     'Privileges: Import Tasks: import-ldif, New Root User, new root user adding import task'
                  </message>
      
                  <call function="'importLdifTask'">
                  { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                    'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                    'dsInstanceDn'   : 'cn=Zroot' ,
                    'dsInstancePswd' : 'PrivsRule' ,
                    'taskID'         : STAXCurrentTestcase,
                    'ldifFile'       : '%s/privileges/privileges_import_task/import_task.ldif' \
                                        % remote.data,
                    'expectedRC'     : 50
                  <call function="'ImportLdifWithScript'">
                    { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                      'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                      'dsInstanceDn'   : 'cn=Zroot' ,
                      'dsInstancePswd' : 'PrivsRule' ,
                      'ldifFile'       : '%s/privileges/privileges_import_task/import_task.ldif' \
                                          % remote.data,
                      'expectedRC'                : 1
                      }
                  </call>

                  <script>
                   resultString = STAXResult[0][1]
                  </script>

                  <call function="'searchString'">
                    { 'returnString'       : resultString ,
                       'expectedString'   : 'You do not have sufficient privileges to initiate an LDIF import'
                    }
                  </call>
                  
@@ -423,12 +447,11 @@
                     'Privileges: Import Tasks: import-ldif, New Root User, new root user adding import task'
                  </message>
      
                  <call function="'importLdifTask'">
                  <call function="'ImportLdifWithScript'">
                  { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                    'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                    'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                    'dsInstanceDn'   : 'cn=Zroot' ,
                    'dsInstancePswd' : 'PrivsRule' ,
                    'taskID'         : STAXCurrentTestcase,
                    'ldifFile'       : '%s/privileges/privileges_import_task/import_task.ldif' \
                                        % remote.data
                  }

 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_restore_task.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 !      Copyright 2008-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -103,12 +103,11 @@
                     'Privileges: Restore Tasks: backend-restore, Admin adding import task to create entries'
                  </message>
      
                  <call function="'importLdifTask'">
                  <call function="'ImportLdifWithScript'">
                  { 'dsInstanceHost'      : DIRECTORY_INSTANCE_HOST,
                    'dsInstancePort'      : DIRECTORY_INSTANCE_PORT,
                    'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                    'dsInstanceDn'        : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD,
                    'taskID'              : STAXCurrentTestcase,
                    'ldifFile'            : '%s/privileges/privileges_restore_task/restore_task.ldif' % remote.data
                  }
                  </call>
@@ -293,12 +292,11 @@
                     'Privileges: Restore Tasks: backend-restore, Directory Manager, alternative root user adding import task to create entries'
                  </message>
      
                  <call function="'importLdifTask'">
                  <call function="'ImportLdifWithScript'">
                  { 'dsInstanceHost'      : DIRECTORY_INSTANCE_HOST,
                    'dsInstancePort'      : DIRECTORY_INSTANCE_PORT,
                    'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                    'dsInstanceDn'        : 'cn=Aroot' ,
                    'dsInstancePswd'      : 'PrivsRule' ,
                    'taskID'              : STAXCurrentTestcase,
                    'ldifFile'            : '%s/privileges/privileges_restore_task/restore_task.ldif' % remote.data
                  }
                  </call>
@@ -477,12 +475,11 @@
                     'Privileges: Restore Tasks: backend-restore, New User Root, alternative root user adding import task to create entries'
                  </message>
      
                  <call function="'importLdifTask'">
                  <call function="'ImportLdifWithScript'">
                  { 'dsInstanceHost'      : DIRECTORY_INSTANCE_HOST,
                    'dsInstancePort'      : DIRECTORY_INSTANCE_PORT,
                    'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                    'dsInstanceDn'        : 'cn=Aroot' ,
                    'dsInstancePswd'      : 'PrivsRule' ,
                    'taskID'              : STAXCurrentTestcase,
                    'ldifFile'            : '%s/privileges/privileges_restore_task/restore_task.ldif' % remote.data
                  }
                  </call>

 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 !      Copyright 2007-2010 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -123,13 +123,12 @@
                  Admin adding import task'
                </message>
                
                <call function="'importLdifTask'">
                <call function="'ImportLdifWithScript'">
                  { 
                  'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT,
                  'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                  'taskID'           : STAXCurrentTestcase ,
                  'ldifFile'         : ldifFile1
                  }
                </call>

 opends/tests/staf-tests/functional-tests/testcases/replication-safe-data/replication-safe-data.xml

@@ -63,6 +63,7 @@
              commonSuiteList.append('changelog')
              commonSuiteList.append('conflict')
              commonSuiteList.append('externalchangelog')
              commonSuiteList.append('aci')
  
              # Safe-data mode specific test suites
              ownSuiteList = []

 opends/tests/staf-tests/functional-tests/testcases/replication-safe-read/replication-safe-read.xml

@@ -63,6 +63,7 @@
              commonSuiteList.append('changelog')
              commonSuiteList.append('conflict')
              commonSuiteList.append('externalchangelog')
              commonSuiteList.append('aci')
  
              # Safe-read mode specific test suites
              ownSuiteList = []

 opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2010 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="replication_binarycopy"/>
@@ -113,8 +113,8 @@
              <call function="'ImportLdifWithScript'">
                { 'location'   : masterHost,
                  'dsPath'     : masterPath,
                  'dsBackEnd'  : DIRECTORY_INSTANCE_BE,
                  'dsLdifFile' : '%s/replication/Example.ldif' % masterDataDir
                  'backEnd'    : DIRECTORY_INSTANCE_BE,
                  'ldifFile'   : '%s/replication/Example.ldif' % masterDataDir
                }
              </call>
                            
@@ -266,14 +266,13 @@
                '+++++ binary copy on-line: import data on %s:%s' \
                % (masterHost, master.getPort())
              </message>                
              <call function="'importLdifTask'">
              <call function="'ImportLdifWithScript'">
                { 'location'       : clientHost,
                  'dsPath'         : clientPath,
                  'dsInstanceHost' : masterHost,
                  'dsInstancePort' : master.getPort(),
                  'dsInstanceAdminPort' : master.getAdminPort(),
                  'dsInstanceDn'   : master.getRootDn(),
                  'dsInstancePswd' : master.getRootPwd(),
                  'taskID'         : 'import task',
                  'ldifFile'       : '%s/replication/Example.ldif' \
                                     % masterDataDir
                }

 opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 !      Copyright 2007-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -84,8 +84,8 @@
          <call function="'ImportLdifWithScript'">
            { 'location'     : masterHost,
              'dsPath'       : masterPath,
              'dsBackEnd'    : DIRECTORY_INSTANCE_BE,          
              'dsLdifFile'   : '%s/replication/Example.ldif' % masterDataDir
              'backEnd'      : DIRECTORY_INSTANCE_BE,
              'ldifFile'     : '%s/replication/Example.ldif' % masterDataDir
            }
          </call>


 opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 !      Copyright 2007-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -122,8 +122,8 @@
              <call function="'ImportLdifWithScript'">
                { 'location'   : masterHost,
                  'dsPath'     : masterPath,
                  'dsBackEnd'  : DIRECTORY_INSTANCE_BE,             
                  'dsLdifFile' : '%s/replication/Example.ldif' % masterDataDir
                  'backEnd'    : DIRECTORY_INSTANCE_BE,
                  'ldifFile'   : '%s/replication/Example.ldif' % masterDataDir
                }
              </call>

@@ -160,8 +160,8 @@
                  <call function="'ImportLdifWithScript'">
                    { 'location'   : consumer.getHostname(),
                      'dsPath'     : '%s/%s' % (consumer.getDir(), OPENDSNAME),
                      'dsBackEnd'  : DIRECTORY_INSTANCE_BE,  
                      'dsLdifFile' : '%s/%s/replication/master_export.ldif' \
                      'backEnd'    : DIRECTORY_INSTANCE_BE,
                      'ldifFile'   : '%s/%s/replication/master_export.ldif' \
                                     % (consumer.getDir(),remote.reldatadir)
                    }
                  </call>                                 
@@ -285,14 +285,13 @@
                '+++++ ldif import on-line: import data on %s:%s' \
                % (masterHost, master.getPort())
              </message>
              <call function="'importLdifTask'">
              <call function="'ImportLdifWithScript'">
                { 'location'       : clientHost,
                  'dsPath'         : clientPath,
                  'dsInstanceHost' : masterHost,
                  'dsInstancePort' : master.getPort(),
                  'dsInstanceAdminPort' : master.getAdminPort(),
                  'dsInstanceDn'   : master.getRootDn(),
                  'dsInstancePswd' : master.getRootPwd(),
                  'taskID'         : 'import task',
                  'ldifFile'       : '%s/replication/Example.ldif' \
                                     % masterDataDir
                }
@@ -357,14 +356,13 @@
                    '+++++ ldif import on-line: import exported file on %s:%s'\
                    % (consumer.getHostname(), consumer.getPort())
                  </message>                    
                  <call function="'importLdifTask'">
                  <call function="'ImportLdifWithScript'">
                    { 'location'       : clientHost,
                      'dsPath'         : clientPath,
                      'dsInstanceHost' : consumer.getHostname(),
                      'dsInstancePort' : consumer.getPort(),
                      'dsInstanceAdminPort' : consumer.getAdminPort(),
                      'dsInstanceDn'   : consumer.getRootDn(),
                      'dsInstancePswd' : consumer.getRootPwd(),
                      'taskID'         : 'import task',
                      'ldifFile'       : destinationFile
                    }
                  </call>

 opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 !      Copyright 2007-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -139,8 +139,8 @@
              <call function="'ImportLdifWithScript'">
                { 'location'     : masterHost,
                  'dsPath'       : masterPath,
                  'dsBackEnd'    : DIRECTORY_INSTANCE_BE,          
                  'dsLdifFile'   : importDataFile
                  'backEnd'      : DIRECTORY_INSTANCE_BE,
                  'ldifFile'     : importDataFile
                }
              </call>
            

 opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2010 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="replication_resynchronization"/>
@@ -213,14 +213,13 @@
                '+++++ resynchronization on-line: import data on %s:%s' \
                % (masterHost, master.getPort())
              </message>
              <call function="'importLdifTask'">
              <call function="'ImportLdifWithScript'">
                { 'location'       : clientHost,
                  'dsPath'         : clientPath,
                  'dsInstanceHost' : masterHost,
                  'dsInstancePort' : master.getPort(),
                  'dsInstanceAdminPort' : master.getAdminPort(),
                  'dsInstanceDn'   : master.getRootDn(),
                  'dsInstancePswd' : master.getRootPwd(),
                  'taskID'         : 'import task - tc2',
                  'ldifFile'       : '%s/replication/Example.ldif' \
                                     % masterDataDir
                }
@@ -452,14 +451,13 @@
                '+++++ resynchronization add server: import data on %s:%s' \
                % (masterHost, master.getPort())
              </message>
              <call function="'importLdifTask'">
              <call function="'ImportLdifWithScript'">
                { 'location'       : clientHost,
                  'dsPath'         : clientPath,
                  'dsInstanceHost' : masterHost,
                  'dsInstancePort' : master.getPort(),
                  'dsInstanceAdminPort' : master.getAdminPort(),
                  'dsInstanceDn'   : master.getRootDn(),
                  'dsInstancePswd' : master.getRootPwd(),
                  'taskID'         : 'import task - tc3',
                  'ldifFile'       : '%s/replication/Example.ldif' \
                                     % masterDataDir
                }

 opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2010 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="replication_totalupdate"/>
@@ -106,8 +106,8 @@
              <call function="'ImportLdifWithScript'">
                { 'location'     : masterHost,
                  'dsPath'       : masterPath,
                  'dsBackEnd'    : DIRECTORY_INSTANCE_BE,          
                  'dsLdifFile'   : '%s/replication/Example.ldif' % masterDataDir
                  'backEnd'      : DIRECTORY_INSTANCE_BE,
                  'ldifFile'     : '%s/replication/Example.ldif' % masterDataDir
                }
              </call>
              
@@ -429,8 +429,8 @@
              <call function="'ImportLdifWithScript'">
                { 'location'   : masterHost,
                  'dsPath'     : masterPath,
                  'dsBackEnd'  : DIRECTORY_INSTANCE_BE,          
                  'dsLdifFile' : '%s/replication/Short_Example.ldif' \
                  'backEnd'    : DIRECTORY_INSTANCE_BE,
                  'ldifFile'   : '%s/replication/Short_Example.ldif' \
                                 % masterDataDir
                }
              </call>

 opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml

@@ -290,7 +290,7 @@
          <script>
            expirationTime = returnString.split(':')[1].strip()

            if len(expirationTime) == 9 and expirationTime.startswith('84'):
            if len(expirationTime) == 9 and expirationTime.startswith('83'):
              myRC = 0
            else:
              myRC = 1

 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 !      Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>

@@ -104,7 +104,7 @@
            }
          </call>
          <!-- 'opendmkPath' exists so we can continue -->
          <if expr="RC != 48">
          <if expr="RC != 48 or not PRODUCTNAME.startswith('OpenDS')">
            <sequence>

              <!--- Test Case information

 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 !      Copyright 2008-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -78,6 +78,8 @@

            <sequence>

              <call function="'testCase_Preamble'"/>

              <message>
                'trap_customconf: change the community property'
              </message>

 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_defaultconf.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -79,6 +79,8 @@

            <sequence>

              <call function="'testCase_Preamble'"/>

              <timer duration="timerDuration">
                <sequence>
                  <parallel>
@@ -182,6 +184,8 @@

            <sequence>

              <call function="'testCase_Preamble'"/>

              <timer duration="timerDuration">
                <sequence>
                  <parallel>
@@ -290,6 +294,8 @@

            <sequence>

              <call function="'testCase_Preamble'"/>

              <timer duration="timerDuration">
                <sequence>
                  <parallel>

 opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 !      Copyright 2007-2010 Sun Microsystems, Inc.
! -->
<stax>
  <defaultcall function="import-ldif"/>
@@ -78,32 +78,11 @@
                'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                'dsInstanceDn'        : DIRECTORY_INSTANCE_DN,
                'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD,
                'dsLdifFile'          : '%s/tasks/import.ldif' % remote.data,
                'dsAppend'            : ' ',
                'dsBackEnd'           : DIRECTORY_INSTANCE_BE}
                'ldifFile'            : '%s/tasks/import.ldif' % remote.data,
                'append'              : ' ',
                'backEnd'             : DIRECTORY_INSTANCE_BE}
              </call>
  
              <!-- manage-tasks -->
              <call function="'manage-tasks'">
                { 'location'     : STAF_REMOTE_HOSTNAME ,
                'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
                'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
                'dsQuiet'        : ' '
                }
              </call>
    
              <script>
                returnString = STAXResult[0][1]
              </script>
          
              <call function="'searchStringForSubstring'">
                { 'returnString'    : returnString,
                'testString'     : 'Import',
                'expectedResult'    : '1' }
              </call>            
       
              
              <!-- Check data are imported -->
              <call function="'checkImport'">
                { 'expectedEntries' : ['uid=scarter,dc=example,dc=com',
@@ -156,10 +135,9 @@
                'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                'dsInstanceDn'        : DIRECTORY_INSTANCE_DN,
                'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD,
                'dsLdifFile'          : '%s/tasks/import.ldif' % remote.data,
                'dsAppend'            : ' ',
                'startTask'           : '0',
                'dsBackEnd'           : DIRECTORY_INSTANCE_BE}
                'ldifFile'            : '%s/tasks/import.ldif' % remote.data,
                'append'              : ' ',
                'backEnd'             : DIRECTORY_INSTANCE_BE}
              </call>
              <call function="'Sleep'">
                { 'sleepForMilliSeconds'  :  40000 }
@@ -216,22 +194,21 @@
                'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                'dsInstanceDn'        : DIRECTORY_INSTANCE_DN,
                'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD,
                'dsLdifFile'          : '%s/tasks/import.ldif' % remote.data,
                'dsAppend'            : ' ',
                'ldifFile'            : '%s/tasks/import.ldif' % remote.data,
                'append'              : ' ',
                'startTask'           : '20061212000000',
                'dsBackEnd'           : DIRECTORY_INSTANCE_BE}
                'expectedRC'          : 1,
                'backEnd'             : DIRECTORY_INSTANCE_BE}
              </call>
  
              <script>
                returnString = STAXResult[0][1]
              </script>
  
              <call function="'searchString'">
                { 'expectedString' : 'The specified start time \'20061212000000\' has already passed' ,
                  'returnString'  : returnString ,
                  'knownIssue'     : '3909' ,
                  'expectedRC'     : '1' }
                </call>
              <call function="'checktestString'">
                {'returnString'     : returnString ,
                  'expectedString'   : 'The specified start time \'20061212000000\' has already passed'
                }
              </call>
  
              
              <call function="'testCase_Postamble'"/>
@@ -280,9 +257,9 @@
                'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                'dsInstanceDn'        : DIRECTORY_INSTANCE_DN,
                'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD,
                'dsLdifFile'          : '%s/tasks/import.ldif' % remote.data,
                'ldifFile'            : '%s/tasks/import.ldif' % remote.data,
                'schedulePattern'     : '"0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58 * * * *"',
                'dsBackEnd'           : DIRECTORY_INSTANCE_BE}
                'backEnd'             : DIRECTORY_INSTANCE_BE}
              </call>
  
              <!-- manage-tasks -->

 opends/tests/staf-tests/shared/functions/dsadm.xml

@@ -302,37 +302,88 @@
      <message>
        '%s %s' % (STAFCmd, STAFCmdParams)
      </message>
      <!-- configure the coverage dump file -->
      <script>
        mylog = "Didn't find the emma.jar file : '%s'\n" % os.path.join(dsPath,'lib','emma.jar')
        if os.path.exists(os.path.join(dsPath,'lib','emma.jar')):
          mylog= ''
          mylog=" ::coverage on\n"
          coveragePath = os.path.join(LOGS_ROOT,'coverage')
          if not os.path.exists(coveragePath):
            os.mkdir(coveragePath)
            mylog+=" ::mkdir %s on\n" % coveragePath
            # copying coverage.em in coveragePath
            import shutil
            mylog+=" ::copying %s to %s\n" % (os.path.join(dsPath,'coverage.em'),coveragePath)
            if not os.path.exists(os.path.join(dsPath,'coverage.em')):
              mylog+= " Didn't find %s to copy to %s\n" % (os.path.join(dsPath,'coverage.em'),coveragePath)
            else:
              shutil.copy(os.path.join(dsPath,'coverage.em'),coveragePath)
          coverageGroupPath=os.path.join(coveragePath,CurrentTestPath['group'])
          if not os.path.exists(coverageGroupPath):
            mylog+=" ::mkdir %s on\n" % (coverageGroupPath)
            os.mkdir(coverageGroupPath)
          existingECs=[cf for cf in os.listdir(coverageGroupPath) if cf.startswith('coverage') and cf.endswith('.ec')]
          newCoverageEC=os.path.join(coverageGroupPath,'coverage%s.ec' % len(existingECs))
          coveragefh = open( '%s/classes/emma.properties' % (dsPath), 'w' )
          coveragefh.write( 'coverage.out.file=%s\n' % (newCoverageEC) )
          coveragefh.write( 'verbosity.level=silent\n')
          coveragefh.write( 'coverage.out.merge=true\n')
          coveragefh.close()
          mylog+=" ::writing %s to %s/%s/classes/emma.properties\n" % (newCoverageEC, dsPath,OPENDSNAME)
      </script>
      <message>'%s' % mylog</message>

      <!-- Check if 'emma.jar' exists -->
      <call function="'GetEntry'">
        {
        'location'  : STAF_REMOTE_HOSTNAME ,
        'entry'     : '%s/lib/emma.jar' % dsPath ,
        'attribute' : 'TYPE'
        }
      </call>
      <if expr="RC != 48 and CurrentTestPath.has_key('group')">
        <!-- 'emma.jar' exists so we can configure the coverage dump file -->
        <sequence>
          <script>
            resultsCoveragePath = os.path.join(LOGS_ROOT,'coverage')
            resultsPath = os.path.join(resultsCoveragePath,CurrentTestPath['group'])
            remoteCoveragePath = os.path.join(remote.temp,'coverage')
            ecPath = os.path.join(remoteCoveragePath,CurrentTestPath['group'])
          </script>

          <call function="'createFolder'">
            { 'location'   : STAF_REMOTE_HOSTNAME,
              'foldername' : resultsCoveragePath
            }
          </call>
          <call function="'createFolder'">
            { 'location'   : STAF_REMOTE_HOSTNAME,
              'foldername' : resultsPath
            }
          </call>
          <call function="'createFolder'">
            { 'location'   : STAF_REMOTE_HOSTNAME,
              'foldername' : remoteCoveragePath
            }
          </call>
          <call function="'createFolder'">
            { 'location'   : STAF_REMOTE_HOSTNAME,
              'foldername' : ecPath
            }
          </call>
          
          <call function="'listFolderByExtension'" >
            {
            'location'   : STAF_REMOTE_HOSTNAME,
            'foldername' : ecPath,
            'extension'  : 'ec'
            }
          </call>
          
          <script>
            existingECs=STAXResult
            newCoverageEC=os.path.join(ecPath,'coverage%s.ec' % len(existingECs))

            coveragefh = open( '%s/emma.properties.%s' % (local.temp,len(existingECs)), 'w' )
            coveragefh.write( 'coverage.out.file=%s\n' % newCoverageEC )
            coveragefh.write( 'verbosity.level=silent\n')
            coveragefh.write( 'coverage.out.merge=true\n')
            coveragefh.close()
          </script>

          <call function="'copyFile'">
            { 'srcfile'    : '%s/emma.properties.%s' % (local.temp,len(existingECs)),
              'destfile'   : '%s/classes/emma.properties' % dsPath,
              'remotehost' : STAF_REMOTE_HOSTNAME }
          </call>

          <call function="'copyFile'">
            { 'location'   : STAF_REMOTE_HOSTNAME,
              'srcfile'    : '%s/coverage.em' % dsPath,
              'destfile'   : '%s/coverage.em' % remoteCoveragePath,
              'remotehost' : STAF_REMOTE_HOSTNAME }
          </call>

          <call function="'copyFile'">
            { 'location'   : STAF_REMOTE_HOSTNAME,
              'srcfile'    : '%s/coverage.em' % dsPath,
              'destfile'   : '%s/coverage.em' % resultsCoveragePath,
              'remotehost' : STAF_REMOTE_HOSTNAME }
          </call>
        </sequence>
      </if>


      <call function="'runCommand'">
        { 'location'  : location,
          'command'   : STAFCmd,
@@ -635,84 +686,13 @@
    </sequence>
  </function>

  <!-- Import LDIF file Function -->
  <function name="importLdif">
    <function-prolog>
      This function performs an offline import of an ldif file
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
        <function-arg-property name="type" value="hostname"/>
      </function-arg-def>
      <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
        <function-arg-description>
          Pathname to installation root
        </function-arg-description>
        <function-arg-property name="type" value="hostname"/>
      </function-arg-def>
      <function-arg-def name="ldifFile" type="required">
        <function-arg-description>
          Path to the LDIF file to be imported
        </function-arg-description>
        <function-arg-property name="type" value="filename"/>
      </function-arg-def>
      <function-arg-def name="backEnd" type="optional" default="DIRECTORY_INSTANCE_BE">
        <function-arg-description>
          Backend ID for the backend to import
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </function-arg-def>
      <function-arg-def name="extraParams" type="optional" default="''">
        <function-arg-description>
          Optional extra parameters for specific test cases
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </function-arg-def>
      <function-arg-def name="expectedRC" type="optional" default="0">
        <function-arg-description>
          Expected return code value. Default value is 0.
          Wildcard 'noCheck' to not check the RC
        </function-arg-description>
      </function-arg-def>
      <function-arg-def name="knownIssue" type="optional" default="None">
        <function-arg-description>
          Known issue. Corresponds to an issue number.
        </function-arg-description>
      </function-arg-def>
    </function-map-args>
      
    <sequence>
      <script>
          if dsPath:
            dsBinPath='%s/%s' % (dsPath,fileFolder)   
      </script>
  
      <message>
        '%s/import-ldif%s -l %s -n %s %s' % (dsBinPath,fileExt,ldifFile,backEnd,extraParams)
      </message>
      <call function="'runCommand'">
        { 'location'  : location,
          'name'      : 'Offline Import',
          'command'   : '%s/import-ldif%s' % (dsBinPath,fileExt),
          'arguments' : '-l %s -n %s %s' % (ldifFile,backEnd,extraParams),
          'expectedRC': expectedRC,
          'knownIssue': knownIssue
        }
      </call>
      <return>RC</return>
    </sequence>
  </function>
    
  <!-- Import Function With Script-->
  <!-- Import-ldif Function -->
  <function name="ImportLdifWithScript">
    <function-prolog>
      This function performs an offline import of an ldif file using the script
      This function performs an import of an ldif file
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location"
      <function-arg-def name="location" 
                        type="optional"
                        default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
@@ -720,310 +700,12 @@
        </function-arg-description>
        <function-arg-property name="type" value="hostname"/>
      </function-arg-def>
      <function-arg-def name="dsPath"
      <function-arg-def name="dsPath" 
                        type="optional"
                        default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
        <function-arg-description>
          Pathname to installation root
        </function-arg-description>
      </function-arg-def>
      <function-arg-def name="dsInstanceHost" type="optional">
        <function-arg-description>
          Directory server hostname or IP address
        </function-arg-description>
        <function-arg-property name="type" value="hostname"/>
      </function-arg-def>
      <function-arg-def name="dsInstanceAdminPort" type="optional">
        <function-arg-description>
          Directory server adminport number
        </function-arg-description>
        <function-arg-property name="type" value="Port number"/>
      </function-arg-def>
      <function-arg-def name="dsInstanceDn" type="optional">
        <function-arg-description>
          Bind DN
        </function-arg-description>
        <function-arg-property name="type" value="DN"/>
      </function-arg-def>
      <function-arg-def name="dsInstancePswd" type="optional">
        <function-arg-description>
          Bind password
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </function-arg-def>
      <function-arg-def name="dsLdifFile" type="optional">
        <function-arg-description>
          Path to the LDIF file to be imported
        </function-arg-description>
        <function-arg-property name="type" value="filename"/>
      </function-arg-def>
      <function-arg-def name="dsTemplateFile" type="optional">
        <function-arg-description>
          Path to a MakeLDIF template to use to generate the import data
        </function-arg-description>
        <function-arg-property name="type" value="filename"/>
      </function-arg-def>
      <function-arg-def name="dsAppend" type="optional">
        <function-arg-description>
          Append to an existing database rather than overwriting it
        </function-arg-description>
        <function-arg-property name="type" value="option"/>
      </function-arg-def>
      <function-arg-def name="dsReplaceExisting" type="optional">
        <function-arg-description>
          Replace existing entries when appending to the database
        </function-arg-description>
        <function-arg-property name="type" value="option"/>
      </function-arg-def>
      <function-arg-def name="dsBackEnd" type="optional">
        <function-arg-description>
          Backend ID for the backend to import
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </function-arg-def>
      <function-arg-def name="dsBranchDN" type="optional">
        <function-arg-description>
          Base DN of a branch to include in the LDIF import
        </function-arg-description>
        <function-arg-property name="type" value="dn"/>
      </function-arg-def>
      <function-arg-def name="dsIncludeBranch" type="optional">
        <function-arg-description>
          Base DN of a branch to include in the LDIF import
        </function-arg-description>
        <function-arg-property name="type" value="dn"/>
      </function-arg-def>
      <function-arg-def name="dsExcludeBranch" type="optional">
        <function-arg-description>
          Base DN of a branch to exclude from the LDIF import
        </function-arg-description>
        <function-arg-property name="type" value="dn"/>
      </function-arg-def>
      <function-arg-def name="dsIncludeAttribute" type="optional">
        <function-arg-description>
          Attribute to include in the LDIF import
        </function-arg-description>
        <function-arg-property name="type" value="attribute"/>
      </function-arg-def>
      <function-arg-def name="dsExcludeAttribute" type="optional">
        <function-arg-description>
          Attribute to exclude in the LDIF import
        </function-arg-description>
        <function-arg-property name="type" value="attribute"/>
      </function-arg-def>
      <function-arg-def name="dsIncludeFilter" type="optional">
        <function-arg-description>
          Filter to identify entries to include in the LDIF import
        </function-arg-description>
        <function-arg-property name="type" value="filter"/>
      </function-arg-def>
      <function-arg-def name="dsExcludeFilter" type="optional">
        <function-arg-description>
          Filter to identify entries to exclude from the LDIF import
        </function-arg-description>
        <function-arg-property name="type" value="filter"/>
      </function-arg-def>
      <function-arg-def name="dsRejectFile" type="optional">
        <function-arg-description>
          Write rejected entries to the specified file
        </function-arg-description>
        <function-arg-property name="type" value="filename"/>
      </function-arg-def>
      <function-arg-def name="dsOverWriteRejects" type="optional">
        <function-arg-description>
          Overwrite an existing rejects file rather than appending to it
        </function-arg-description>
        <function-arg-property name="type" value="option"/>
      </function-arg-def>
      <function-arg-def name="dsRandomSeed" type="optional">
        <function-arg-description>
          Seed for the MakeLDIF random number generator
        </function-arg-description>
        <function-arg-property name="type" value="seed"/>
      </function-arg-def>
      <function-arg-def name="dsSkipSchemaValidation" type="optional">
        <function-arg-description>
          Skip schema validation during the LDIF import
        </function-arg-description>
        <function-arg-property name="type" value="option"/>
      </function-arg-def>
      <function-arg-def name="dsIsCompressed" type="optional">
        <function-arg-description>
          LDIF file is compressed
        </function-arg-description>
        <function-arg-property name="type" value="option"/>
      </function-arg-def>
      <function-arg-def name="dsIsEncrypted" type="optional">
        <function-arg-description>
          LDIF file is encrypted
        </function-arg-description>
        <function-arg-property name="type" value="option"/>
      </function-arg-def>
      <function-arg-def name="dsQuiet" type="optional">
        <function-arg-description>
          Use quiet mode (no output)
        </function-arg-description>
        <function-arg-property name="type" value="option"/>
      </function-arg-def>
      <function-arg-def name="dsHelp" type="optional">
        <function-arg-description>
          Display usage information
        </function-arg-description>
        <function-arg-property name="type" value="option"/>
      </function-arg-def>
      <function-arg-def name="startTask" type="optional">
        <function-arg-description>
          Start time for task
        </function-arg-description>
        <function-arg-property name="type" value="integer"/>
      </function-arg-def>
      <function-arg-def name="expectedRC" type="optional" default="0">
        <function-arg-description>
          Expected return code value. Default value is 0.
          Wildcard 'noCheck' to not check the RC
        </function-arg-description>
      </function-arg-def>
      <function-arg-def name="knownIssue" type="optional" default="None">
        <function-arg-description>
          Known issue. Corresponds to an issue number.
        </function-arg-description>
      </function-arg-def>
      <function-arg-def name="schedulePattern" type="optional">
        <function-arg-description>
          Indicates the task is recurring and will be scheduled
          according to the value argument expressed in crontab(5)
          compatible time/date pattern
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </function-arg-def>
    </function-map-args>
    
    <sequence>
          
      <!-- Build the Command -->

      <script>
        STAFCmdParamsList=[]
        STAFCmdParams=''
      </script>

      <!-- Set common ldap arguments -->      
      <call function="'_adminCommonArgs'" />
        
      <script>
        if dsPath:
          dsBinPath='%s/%s' % (dsPath,fileFolder) 
          STAFCmd='%s/import-ldif%s' % (dsBinPath,fileExt)
    
        if dsLdifFile:
          STAFCmdParamsList.append('-l %s' % dsLdifFile)    

        if dsTemplateFile:
          STAFCmdParamsList.append('-A %s' % dsTemplateFile)                  

        if dsAppend:
          STAFCmdParamsList.append('-a')
          
        if dsReplaceExisting:
          STAFCmdParamsList.append('-r')
                  
        if dsIncludeBranch:
          for InBranch in dsIncludeBranch:
            STAFCmdParamsList.append('-b "%s" ' % InBranch) 
          
        if dsExcludeBranch:
          for ExBranch in dsExcludeBranch:
            STAFCmdParamsList.append('-B "%s" ' % ExBranch) 
          
        if dsIncludeAttribute:
          for InAttr in dsIncludeAttribute:
            STAFCmdParamsList.append('-i "%s" ' % InAttr)
          
        if dsExcludeAttribute:
          for ExAttr in dsExcludeAttribute:
            STAFCmdParamsList.append('-e "%s" ' % ExAttr)
          
        if dsIncludeFilter:
          for InFilter in dsIncludeFilter:
            STAFCmdParamsList.append('-I "%s" ' % InFilter)

        if dsExcludeFilter:
          for ExFilter in dsExcludeFilter:
            STAFCmdParamsList.append('-E "%s" ' % ExFilter)
          
        if dsRejectFile:
          STAFCmdParamsList.append('-R %s' % dsRejectFile)

        if dsOverWriteRejects:
          STAFCmdParamsList.append('-O')
          
        if dsRandomSeed:
          STAFCmdParamsList.append('-s %s' % dsRandomSeed)

        if dsSkipSchemaValidation:
          STAFCmdParamsList.append('-S')
          
        if dsIsCompressed:
          STAFCmdParamsList.append('-c')
          
        if dsIsEncrypted:
          STAFCmdParamsList.append('-y')
          
        if dsQuiet:
          STAFCmdParamsList.append('-q')

        if dsHelp:
          STAFCmdParamsList.append('-H')
           
        if dsBackEnd:
          STAFCmdParamsList.append('-n %s' % dsBackEnd)
  
        if startTask:
          STAFCmdParamsList.append('-t %s' % startTask)

        if schedulePattern:
          STAFCmdParamsList.append('--recurringTask %s' % schedulePattern)

        STAFCmdParams=' '.join(STAFCmdParamsList)
        
      </script>
      <message>
        '%s %s' % (STAFCmd, STAFCmdParams)
      </message>
            
      <call function="'runCommand'">
        { 'location'  : location,
          'name'      : 'Offline Import Script',
          'command'   : STAFCmd,
          'arguments' : STAFCmdParams,
          'expectedRC': expectedRC,
          'knownIssue': knownIssue
        }
      </call>

      <return>
        STAXResult
      </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-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
        <function-arg-description>
          Location of target host
        </function-arg-description>
        <function-arg-property name="type" value="hostname"/>
      </function-arg-def>
      <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
        <function-arg-description>
          Pathname to installation root
        </function-arg-description>
        <function-arg-property name="type" value="pathname"/>
      </function-arg-def>
      <function-arg-def name="dsInstanceHost" type="optional">
@@ -1038,6 +720,12 @@
        </function-arg-description>
        <function-arg-property name="type" value="integer"/>
      </function-arg-def>
      <function-arg-def name="dsInstanceAdminPort" type="optional">
        <function-arg-description>
          Directory server admin port number
        </function-arg-description>
        <function-arg-property name="type" value="integer"/>
      </function-arg-def>
      <function-arg-def name="dsInstanceDn" type="optional">
        <function-arg-description>
          Bind DN
@@ -1062,51 +750,77 @@
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </function-arg-def>
      <function-arg-def name="backEnd" type="optional" default="DIRECTORY_INSTANCE_BE">
      <function-arg-def name="backEnd" 
                        type="optional"
                        default="DIRECTORY_INSTANCE_BE">
        <function-arg-description>
          Optional the name of the database backend
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </function-arg-def>
      <function-arg-def name="isCompressed" type="optional" default="'FALSE'">
      <function-arg-def name="wrapColumn" type="optional">
        <function-arg-description>
          Optional imported ldif data file compressed
          Column at which to wrap long lines
        </function-arg-description>
        <function-arg-property name="type" value="integer"/>
      </function-arg-def>
      <function-arg-def name="startTask" type="optional" default="'0'">
        <function-arg-description>
          Optional exclude attributes
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </function-arg-def>
      <function-arg-def name="isCompressed" type="optional">
        <function-arg-description>
          Optional exported ldif data file compressed
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </function-arg-def>
      <function-arg-def name="isEncrypted" type="optional" default="'FALSE'">
      <function-arg-def name="isEncrypted" type="optional">
        <function-arg-description>
          Optional imported ldif data file encrypted
          Optional exported ldif data file encrypted
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </function-arg-def>
      <function-arg-def name="rejectsFile" type="optional">
      <function-arg-def name="append" type="optional">
        <function-arg-description>
          Optional name of rejects file
        </function-arg-description>
        <function-arg-property name="type" value="filename"/>
      </function-arg-def>
      <function-arg-def name="overwriteRejectsFile" type="optional" default="'FALSE'">
        <function-arg-description>
          Optional name of rejects file
          Optional append exported ldif data
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </function-arg-def>
      <function-arg-def name="append" type="optional" default="'FALSE'">
      <function-arg-def name="skipSchemaValidation" type="optional">
        <function-arg-description>
          Optional append imported ldif data
          Optional do not perform any schema validation
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </function-arg-def>
      <function-arg-def name="skipSchemaValidation" type="optional" default="'FALSE'">
       <function-arg-def name="templateFile" type="optional">
        <function-arg-description>
          Optional don't do schema validation on import
          Optional path to a MakeLDIF template to generate the import data.
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </function-arg-def>
      <function-arg-def name="replaceExisting" type="optional" default="'FALSE'">
      <function-arg-def name="skipFile" type="optional">
        <function-arg-description>
          Optional replace existing data
          Optional identify entries that were skipped during the import
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </function-arg-def>
      <function-arg-def name="overwriteFile" type="optional">
        <function-arg-description>
          Optional overwrite the specified skip file or reject file
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </function-arg-def>
      <function-arg-def name="replaceExisting" type="optional">
        <function-arg-description>
          Optional replace existing data with the content from the import
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </function-arg-def>
      <function-arg-def name="rejectFile" type="optional">
        <function-arg-description>
          Optional file to hold any rejected entries during the import
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </function-arg-def>
@@ -1146,6 +860,18 @@
        </function-arg-description>
        <function-arg-property name="type" value="option"/>
      </function-arg-def>
      <function-arg-def name="isSignedHash" type="optional" default="'False'">
        <function-arg-description>
          Optional generate a signed hash of the export data
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </function-arg-def>
      <function-arg-def name="extraParams" type="optional" default="''">
        <function-arg-description>
          Optional extra parameters for specific test cases
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </function-arg-def>
      <function-arg-def name="numLdapCheckTries" type="optional" default="10">
        <function-arg-description>
          Number of ldap check tries when checking if task is complete
@@ -1170,129 +896,153 @@
          Known issue. Corresponds to an issue number.
        </function-arg-description>
      </function-arg-def>
      <function-arg-def name="schedulePattern" type="optional">
        <function-arg-description>
          Indicates the task is recurring and will be scheduled
          according to the value argument expressed in crontab(5)
          compatible time/date pattern
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </function-arg-def>

    </function-map-args>

    <sequence>
    

      <!-- Local variables -->
      <script>
        myLocation=location
        myPath=dsPath

        try:
          import hashlib
          m = hashlib.md5()
        except ImportError:
          import md5
          m = md5.new()
        m.update(location)
        m.update(dsPath)
        taskLdifFile='import-task-%s.ldif' % m.hexdigest()
        taskLdif='%s/%s' % (remote.temp,taskLdifFile)
        tmpTaskLdif='%s/%s' % (local.temp,taskLdifFile)
        taskDN='ds-task-id=%s,cn=Scheduled Tasks,cn=Tasks' % taskID
        STAFCmdParamsList=[]
        STAFCmdParams=''
      </script>
      
      <!-- Build the import task configuration object -->
      <script>
        ldifLines=[]
        ldifLines.append('dn: %s' % taskDN)
        ldifLines.append('objectclass: top')
        ldifLines.append('objectclass: ds-task')
        ldifLines.append('objectclass: ds-task-import')
        ldifLines.append('ds-task-class-name: org.opends.server.tasks.ImportTask')

        ldifLines.append('ds-task-import-backend-id: %s' % backEnd )
        ldifLines.append('ds-task-import-ldif-file: %s' % ldifFile )
        ldifLines.append('ds-task-import-is-compressed: %s' % isCompressed )
        ldifLines.append('ds-task-import-is-encrypted: %s' % isEncrypted )
    
        if rejectsFile:
          ldifLines.append('ds-task-import-reject-file: %s' % rejectsFile )
      <!-- Set common ldap arguments -->
      <call function="'_adminCommonArgs'" />

        ldifLines.append('ds-task-import-overwrite-rejects: %s' % overwriteRejectsFile )
        ldifLines.append('ds-task-import-append: %s' % append )
        ldifLines.append('ds-task-import-skip-schema-validation: %s' % skipSchemaValidation )
        ldifLines.append('ds-task-import-replace-existing: %s' % replaceExisting )
      </script>
  
      <script>
        if dsPath:
          dsBinPath='%s/%s' % (dsPath,fileFolder)
          STAFCmd='%s/import-ldif%s' % (dsBinPath,fileExt)

        if dsInstancePort:
          STAFCmdParamsList.append('-p %s' % dsInstancePort)

        if ldifFile:
          STAFCmdParamsList.append('-l %s' % ldifFile)

        if startTask:
           STAFCmdParamsList.append('-t %s' % startTask)

        if append:
          STAFCmdParamsList.append('-a')

        if backEnd:
          STAFCmdParamsList.append('-n %s' % backEnd)

        if  skipSchemaValidation:
          STAFCmdParamsList.append('-S')

        if  skipFile:
          STAFCmdParamsList.append('--skipFile %s' % skipFile)

        if  rejectFile:
          STAFCmdParamsList.append('-R %s' % rejectFile)

        if  overwriteFile:
          STAFCmdParamsList.append('-O')

        if  templateFile:
          STAFCmdParamsList.append('-A %s' % templateFile)

        if  replaceExisting:
          STAFCmdParamsList.append('-r')

        if schedulePattern:
          STAFCmdParamsList.append('--recurringTask %s' % schedulePattern)

        if isCompressed:
          STAFCmdParamsList.append('-c')

        if isEncrypted:
          STAFCmdParamsList.append('-y')

        if wrapColumn:
          STAFCmdParamsList.append('--wrapColumn %s' % wrapColumn)

        if excludeBranches:
          for branch in excludeBranches:
            ldifLines.append('ds-task-import-exclude-branch: %s' % branch )  
            STAFCmdParamsList.append('-B "%s"' % branch )

        if includeBranches:
          for branch in includeBranches:
            ldifLines.append('ds-task-import-include-branch: %s' % branch )
            STAFCmdParamsList.append('-b "%s"' % branch )

        if excludeAttributes:
          for attribute in excludeAttributes:
            ldifLines.append('ds-task-import-exclude-attribute: %s' % attribute )                 
              
            STAFCmdParamsList.append('-e "%s"' % attribute)

        if includeAttributes:
          for attribute in includeAttributes:
            ldifLines.append('ds-task-import-include-attribute: %s' % attribute )
            
          for filter in excludeFilters:
            ldifLines.append('ds-task-import-exclude-filter: %s' % filter)
            
          for filter in includeFilters:
             ldifLines.append('ds-task-import-include-filter: %s' % filter)
            STAFCmdParamsList.append('-i "%s"' % attribute)

        if includeFilters:
          for attribute in includeFilters:
            STAFCmdParamsList.append('-I "%s"' % attribute)

        if excludeFilters:
          for attribute in excludeFilters:
            STAFCmdParamsList.append('-E "%s"' % attribute )

        if extraParams:
          STAFCmdParamsList.append('%s' % extraParams)

        STAFCmdParams=' '.join(STAFCmdParamsList)

      </script>

      <!-- Write out the import-task ldif -->
      <script>
        outfile = open(tmpTaskLdif,"w")
          
        for line in ldifLines:
          outfile.write("%s\n" % line)
          
        outfile.close()
      </script>
      
      <!-- Copy the import-task ldif to remote host -->
      <message>'Copy import task ldif (%s) to %s' % (tmpTaskLdif,taskLdif)</message>
      <call function="'copyFile'">
        { 'location'   : STAXServiceMachine,
          'srcfile'    : tmpTaskLdif,
          'destfile'   : taskLdif,
          'remotehost' : myLocation }
      </call>
      <message>
        '%s %s' % (STAFCmd, STAFCmdParams)
      </message>
      <message>
        'Start import-ldif'
      </message>

      <!-- Start the task using ldap task interface -->
      <call function="'StartLdapTask'">
        { 'location'   : myLocation,
          'dsPath'     : myPath,
          'taskLabel'  : 'Online Import Task',
          'dsHost'     : dsInstanceHost,
          'dsPort'     : dsInstancePort,
          'dsBindDn'   : dsInstanceDn,
          'dsBindPswd' : dsInstancePswd,
          'dsTaskLdif' : taskLdif,
          'expectedRC' : expectedRC }

      <call function="'runCommand'">
        { 'location'   : location,
          'name'       : 'Import Script',
          'command'    : STAFCmd,
          'arguments'  : STAFCmdParams,
          'expectedRC' : expectedRC,
          'knownIssue' : knownIssue
        }
      </call>

      <script>
        STAFCmdRC=STAXResult[0]
         savSTAXResult = STAXResult
        resultString = STAXResult[0][1]
      </script>
                      
      <!-- Check that the ldap task is completed -->
      <if expr="STAFCmdRC == 0">

      <if expr="dsInstanceDn != None and expectedRC == 0 and schedulePattern == None">
        <sequence>
          <call function="'CheckLdapTask'">
            { 'location'          : myLocation,
              'dsPath'            : myPath,
              'dsTaskDn'          : taskDN,
              'dsHost'            : dsInstanceHost,
              'dsPort'            : dsInstancePort,
              'dsBindDn'          : dsInstanceDn,
              'dsBindPswd'        : dsInstancePswd,
              'noOfLoops'         : numLdapCheckTries,
              'sleepMilliSeconds' : sleepBetweenLdapCheckTries }
          </call>
          <message>'Check CheckLdapTask returns RC=0'</message>
          <call function="'checktestRC'">
             { 'returncode' : RC ,
               'result'     : STAXResult }
          <message>
          'Check import-ldif task successfully completed'
          </message>

          <call function="'checkTaskExecution'">
            {
            'dsPath'              : dsPath,
            'dsInstanceAdminPort' : dsInstanceAdminPort,
            'dsInstanceHost'      : dsInstanceHost ,
            'dsInstanceDn'        : dsInstanceDn ,
            'dsInstancePswd'      : dsInstancePswd ,
            'outputToCheck'       : resultString
            }
          </call>
        </sequence>
      </if>
      
      <return>
        savSTAXResult
      </return>
    </sequence>
    
  </function>
@@ -1751,7 +1501,7 @@
        '%s %s' % (STAFCmd, STAFCmdParams)
      </message>
      <message>
        'Start exportLdifTask'
        'Start export-ldif'
      </message>


@@ -1773,7 +1523,7 @@
      <if expr="dsInstanceDn != None and expectedRC == 0 and schedulePattern == None">
        <sequence>
          <message>
          'Check export ldif task successfully completed'
          'Check export-ldif task successfully completed'
          </message>

          <call function="'checkTaskExecution'">

 opends/tests/staf-tests/shared/functions/security.xml

@@ -362,55 +362,64 @@
    <sequence>

      <call function="'getFile'">
            {
              'location'    : STAF_REMOTE_HOSTNAME,
              'filename'    : user_cert_file_rfc
            }
        {
        'location'    : STAF_REMOTE_HOSTNAME,
        'filename'    : user_cert_file_rfc
        }
      </call>

      <message>
            'Certificate contents:\n %s' % cmdResult
        'Certificate contents:\n %s' % cmdResult
      </message>

          <!-- Extract BEGIN CERTIFICATE and END CERTIFICATE -->
      <!-- Extract BEGIN CERTIFICATE and END CERTIFICATE -->
      <script>
            certList=STAXResult[1].split('\n')
            ret_str = ""
            for line in certList:
              index_cert = line.find("CERTIFICATE")
              if index_cert == -1:
                ret_str+=line.strip()
        certList=STAXResult[1].split('\n')
        ret_str = ""
        for line in certList:
          index_cert = line.find("CERTIFICATE")
          if index_cert == -1:
            ret_str+=line.strip()
      </script>

      <script>
            listAttr = []
            listAttr.append('dn: %s' %userdn)
            listAttr.append('changetype: modify')
            listAttr.append('add: objectclass')
            listAttr.append('objectclass:ds-certificate-user')
            listAttr.append('-')
            listAttr.append('add: userCertificate;binary')
            listAttr.append('userCertificate;binary:: %s' % ret_str)
        listAttr = []
        listAttr.append('dn: %s' %userdn)
        listAttr.append('changetype: modify')
        listAttr.append('add: objectclass')
        listAttr.append('objectclass:ds-certificate-user')
        listAttr.append('-')
        listAttr.append('add: userCertificate;binary')
        listAttr.append('userCertificate;binary:: %s' % ret_str)
      </script>

          <!-- Write out the ldif -->
      <!-- Create the ldif -->
      <script>
            addCertificateldif='%s' % (ldif_path)
            outfile = open(addCertificateldif,"w")
            for line in listAttr:
              outfile.write("%s\n" % line)
            outfile.close()
        addCertificateldif='%s/client.ldif' % local.temp
        outfile = open(addCertificateldif,"w")
        for line in listAttr:
          outfile.write("%s\n" % line)
        outfile.close()
      </script>

      <call function="'copyFile'">
        {
        'location'   : STAXServiceMachine,
        'srcfile'    : '%s/client-cert.ldif' % local.temp,
        'destfile'   : ldif_path,
        'remotehost' : STAF_REMOTE_HOSTNAME
        }
      </call>

      <call function="'modifyEntry'">
            {
            'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST,
            'dsInstancePort'    : DIRECTORY_INSTANCE_PORT,
            'dsInstanceDn'      : DIRECTORY_INSTANCE_DN,
            'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD,
            'entryToBeModified' : addCertificateldif,
            'expectedRC'        :  0
            }
        {
          'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST,
          'dsInstancePort'    : DIRECTORY_INSTANCE_PORT,
          'dsInstanceDn'      : DIRECTORY_INSTANCE_DN,
          'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD,
          'entryToBeModified' : addCertificateldif,
          'expectedRC'        :  0
        }
      </call>
    </sequence>
  </function>

 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr.xml

@@ -142,8 +142,8 @@
              <call function="'ImportLdifWithScript'">
              {
                'location'   : STAF_REMOTE_HOSTNAME ,
                'dsLdifFile' : ldifFile ,
                'dsBackEnd'  : 'userRoot'
                'ldifFile'   : ldifFile ,
                'backEnd'    : 'userRoot'
              }
              </call>


 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_10m.xml

@@ -201,8 +201,8 @@
                <call function="'ImportLdifWithScript'">
                  {
                  'location'   : STAF_REMOTE_HOSTNAME ,
                  'dsLdifFile' : ldifFile ,
                  'dsBackEnd'  : 'userRoot'
                  'ldifFile'   : ldifFile ,
                  'backEnd'    : 'userRoot'
                  }
                </call>
    

 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_6m.xml

@@ -174,8 +174,8 @@
              <call function="'ImportLdifWithScript'">
                {
                'location'   : STAF_REMOTE_HOSTNAME ,
                'dsLdifFile' : ldifFile ,
                'dsBackEnd'  : 'userRoot'
                'ldifFile'   : ldifFile ,
                'backEnd'    : 'userRoot'
                }
              </call>


 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_large_import_buffer.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 !      Copyright 2008-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -132,8 +132,8 @@
                
                <call function="'ImportLdifWithScript'">
                { 'location'    : STAF_REMOTE_HOSTNAME ,
                  'dsLdifFile'  : curr_filename ,
                  'dsBackEnd'   : 'userRoot'}
                  'ldifFile'    : curr_filename ,
                  'backEnd'     : 'userRoot'}
                </call>
    
                <script> 

 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 !      Copyright 2008-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -132,8 +132,8 @@
                
                <call function="'ImportLdifWithScript'">
                { 'location'    : STAF_REMOTE_HOSTNAME ,
                  'dsLdifFile'  : curr_filename ,
                  'dsBackEnd'   : 'userRoot'}
                  'ldifFile'    : curr_filename ,
                  'backEnd'     : 'userRoot'}
                </call>
    
                <script> 

 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_indexes.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 !      Copyright 2008-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -176,8 +176,8 @@
                
                <call function="'ImportLdifWithScript'">
                { 'location'    : STAF_REMOTE_HOSTNAME ,
                  'dsLdifFile'  : '%s/import_Entries_160.ldif' % remote.temp,
                  'dsBackEnd'   : 'userRoot'}
                  'ldifFile'    : '%s/import_Entries_160.ldif' % remote.temp,
                  'backEnd'     : 'userRoot'}
                </call>
    
                <script> 

 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 !      Copyright 2008-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -144,8 +144,8 @@
                
                <call function="'ImportLdifWithScript'">
                { 'location'    : STAF_REMOTE_HOSTNAME ,
                  'dsLdifFile'  : curr_filename ,
                  'dsBackEnd'   : 'userRoot'}
                  'difFile'     : curr_filename ,
                  'backEnd'     : 'userRoot'}
                </call>
    
                <script> 

 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_out-of-box.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 !      Copyright 2008-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -102,8 +102,8 @@
                
                <call function="'ImportLdifWithScript'">
                { 'location'    : STAF_REMOTE_HOSTNAME ,
                  'dsLdifFile'  : '%s/import_Entries_150k.ldif' % remote.temp,
                  'dsBackEnd'   : 'userRoot'}
                  'ldifFile'    : '%s/import_Entries_150k.ldif' % remote.temp,
                  'backEnd'     : 'userRoot'}
                </call>
    
                <script> 

 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_setup.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 !      Copyright 2008-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -84,7 +84,7 @@
                  'Import Ldif: Small Initial Import'
                </message>

                <call function="'importLdif'">
                <call function="'ImportLdifWithScript'">
                  { 'ldifFile' : '%s/import_ldif/import_ldif_start.ldif' \
                                 % remote.data }
                </call>

 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 !      Copyright 2008-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -102,12 +102,11 @@
                   'Import Ldif Tasks: Binary Attribute: Import large ldif file'
                </message>
                
                <call function="'importLdifTask'">
                <call function="'ImportLdifWithScript'">
                { 'dsInstanceHost'              : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort'              : DIRECTORY_INSTANCE_PORT,
                  'dsInstanceAdminPort'         : DIRECTORY_INSTANCE_ADMIN_PORT,
                  'dsInstanceDn'                : DIRECTORY_INSTANCE_DN,
                  'dsInstancePswd'              : DIRECTORY_INSTANCE_PSWD,
                  'taskID'                      : STAXCurrentTestcase,
                  'ldifFile'                    : curr_filename ,
                  'numLdapCheckTries'           : 1000,
                  'sleepBetweenLdapCheckTries'  : 300000

 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr_with_load.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 !      Copyright 2008-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -78,12 +78,11 @@
                   'Import Ldif Tasks: Binary Attribute With Load: Import large ldif file'
                </message>
                
                <call function="'importLdifTask'">
                <call function="'ImportLdifWithScript'">
                { 'dsInstanceHost'              : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort'              : DIRECTORY_INSTANCE_PORT,
                  'dsInstanceAdminPort'         : DIRECTORY_INSTANCE_ADMIN_PORT,
                  'dsInstanceDn'                : DIRECTORY_INSTANCE_DN,
                  'dsInstancePswd'              : DIRECTORY_INSTANCE_PSWD,
                  'taskID'                      : STAXCurrentTestcase,
                  'ldifFile'                    : '%s/import_Entries_100.ldif' % remote.temp
                }
                </call>
@@ -165,12 +164,11 @@
                   'Import Ldif Tasks: Binary Attribute With Load: Import Large Ldif File - Add import task'
                  </message>
                
                  <call function="'importLdifTask'">
                  <call function="'ImportLdifWithScript'">
                  { 'dsInstanceHost'              : DIRECTORY_INSTANCE_HOST,
                    'dsInstancePort'              : DIRECTORY_INSTANCE_PORT,
                    'dsInstanceAdminPort'         : DIRECTORY_INSTANCE_ADMIN_PORT,
                    'dsInstanceDn'                : DIRECTORY_INSTANCE_DN,
                    'dsInstancePswd'              : DIRECTORY_INSTANCE_PSWD,
                    'taskID'                      : STAXCurrentTestcase,
                    'ldifFile'                    : curr_filename ,
                    'numLdapCheckTries'           : 1000,
                    'sleepBetweenLdapCheckTries'  : 300000

 opends/tests/staf-tests/stress-tests/testcases/ldap_operation/ldap_operation_setup.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 !      Copyright 2008-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -84,7 +84,7 @@
                  'Import Ldif: Small Initial Import'
                </message>

                <call function="'importLdif'">
                <call function="'ImportLdifWithScript'">
                  { 'ldifFile' : '%s/ldap_operation/ldap_operation_start.ldif' \
                                 % remote.data }
                </call>

 opends/tests/staf-tests/stress-tests/testcases/ldap_operation/ldclt_compare.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Copyright 2009-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -127,8 +127,8 @@
              <call function="'ImportLdifWithScript'">
                {
                'location'   : STAF_REMOTE_HOSTNAME ,
                'dsLdifFile' : ldifFile ,
                'dsBackEnd'  : 'userRoot'
                'ldifFile'   : ldifFile ,
                'backEnd'    : 'userRoot'
                }
              </call>


 opends/tests/staf-tests/stress-tests/testcases/ldap_operation/ldclt_modify.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Copyright 2009-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -127,8 +127,8 @@
              <call function="'ImportLdifWithScript'">
                {
                'location'   : STAF_REMOTE_HOSTNAME ,
                'dsLdifFile' : ldifFile ,
                'dsBackEnd'  : 'userRoot'
                'ldifFile'   : ldifFile ,
                'backEnd'    : 'userRoot'
                }
              </call>


 opends/tests/staf-tests/stress-tests/testcases/ldap_operation/ldclt_modifyrdn.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Copyright 2009-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -127,8 +127,8 @@
              <call function="'ImportLdifWithScript'">
                {
                'location'   : STAF_REMOTE_HOSTNAME ,
                'dsLdifFile' : ldifFile ,
                'dsBackEnd'  : 'userRoot'
                'ldifFile'   : ldifFile ,
                'backEnd'    : 'userRoot'
                }
              </call>


 opends/tests/staf-tests/stress-tests/testcases/ldap_operation/ldclt_search.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Copyright 2009-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -127,8 +127,8 @@
              <call function="'ImportLdifWithScript'">
                {
                'location'   : STAF_REMOTE_HOSTNAME ,
                'dsLdifFile' : ldifFile ,
                'dsBackEnd'  : 'userRoot'
                'ldifFile'   : ldifFile ,
                'backEnd'    : 'userRoot'
                }
              </call>


 opends/tests/staf-tests/stress-tests/testcases/replication/replication_search.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Copyright 2009-2010 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -144,8 +144,8 @@
              <call function="'ImportLdifWithScript'">
                { 'location'   : masterHost,
                  'dsPath'     : masterPath,
                  'dsBackEnd'  : DIRECTORY_INSTANCE_BE,          
                  'dsLdifFile' : ldifFile
                  'backEnd'    : DIRECTORY_INSTANCE_BE,
                  'ldifFile'   : ldifFile
                }
              </call>