refactoring to use different backend types

gary_williams

04.14.2009 ccb383c5308f88916e6946ef9479cedef8d98481

refactoring to use different backend types

 opends/tests/staf-tests/functional-tests/shared/data/backends/Example.ldif

@@ -20,7 +20,7 @@
#
# CDDL HEADER END
#
#      Copyright 2006-2008 Sun Microsystems, Inc.
#      Copyright 2006-2009 Sun Microsystems, Inc.
#
#
# dc=com sample LDIF file
@@ -36,12 +36,6 @@
objectclass: top
objectclass: domain
dc: com
aci: (target ="ldap:///dc=example,dc=com")(targetattr !=
 "userPassword")(version 3.0;acl "Anonymous read-search access";
 allow (read, search, compare)(userdn = "ldap:///anyone");)
aci: (target="ldap:///dc=example,dc=com") (targetattr =
  "*")(version 3.0; acl "allow all Admin group"; allow(all) groupdn =
  "ldap:///cn=Directory Administrators,ou=Groups,dc=example,dc=com";)

dn: dc=example,dc=com
objectclass: top
@@ -66,26 +60,6 @@
objectclass: top
objectclass: organizationalunit
ou: People
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr =
 "userpassword || telephonenumber || facsimiletelephonenumber")(version 3.0;
 acl "Allow self entry modification";allow (write)(userdn = "ldap:///self");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn || sn || uid")(targetfilter ="(ou=Accounting)")(version 3.0;
 acl "Accounting Managers Group Permissions";allow (write) (groupdn =
  "ldap:///cn=Accounting Managers,ou=groups,dc=example,dc=com");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn || sn || uid")(targetfilter ="(ou=Human Resources)")(version 3.0;
 acl "HR Group Permissions";allow (write)(groupdn = "ldap:///cn=HR Managers,
 ou=groups,dc=example,dc=com
 ");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn ||sn || uid")(targetfilter ="(ou=Product Testing)")(version 3.0;
 acl "QA Group Permissions";allow (write)(groupdn = "ldap:///cn=QA Managers,
 ou=groups,dc=example,dc=com");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn || sn || uid")(targetfilter ="(ou=Product Development)")(version 3.0;
 acl "Engineering Group Permissions";allow (write)(groupdn = "ldap:///
 cn=PD Managers,ou=groups,dc=example,dc=com");)

dn: ou=Special Users,dc=example,dc=com
objectclass: top

 opends/tests/staf-tests/functional-tests/shared/data/backends/Example.ldif.gz

Binary files differ

 opends/tests/staf-tests/functional-tests/shared/data/backends/Exclude.ldif

@@ -20,7 +20,7 @@
#
# CDDL HEADER END
#
#      Copyright 2006-2008 Sun Microsystems, Inc.
#      Copyright 2006-2009 Sun Microsystems, Inc.
#
#
# dc=com sample LDIF file
@@ -37,12 +37,6 @@
objectclass: top
objectclass: domain
dc: com
aci: (target ="ldap:///dc=example,dc=com")(targetattr !=
 "userPassword")(version 3.0;acl "Anonymous read-search access";
 allow (read, search, compare)(userdn = "ldap:///anyone");)
aci: (target="ldap:///dc=example,dc=com") (targetattr =
  "*")(version 3.0; acl "allow all Admin group"; allow(all) groupdn =
  "ldap:///cn=Directory Administrators,ou=Groups,dc=example,dc=com";)

dn: dc=example,dc=com
objectclass: top
@@ -67,26 +61,6 @@
objectclass: top
objectclass: organizationalunit
ou: People
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr =
 "userpassword || telephonenumber || facsimiletelephonenumber")(version 3.0;
 acl "Allow self entry modification";allow (write)(userdn = "ldap:///self");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn || sn || uid")(targetfilter ="(ou=Accounting)")(version 3.0;
 acl "Accounting Managers Group Permissions";allow (write) (groupdn =
  "ldap:///cn=Accounting Managers,ou=groups,dc=example,dc=com");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn || sn || uid")(targetfilter ="(ou=Human Resources)")(version 3.0;
 acl "HR Group Permissions";allow (write)(groupdn = "ldap:///cn=HR Managers,
 ou=groups,dc=example,dc=com
 ");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn ||sn || uid")(targetfilter ="(ou=Product Testing)")(version 3.0;
 acl "QA Group Permissions";allow (write)(groupdn = "ldap:///cn=QA Managers,
 ou=groups,dc=example,dc=com");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn || sn || uid")(targetfilter ="(ou=Product Development)")(version 3.0;
 acl "Engineering Group Permissions";allow (write)(groupdn = "ldap:///
 cn=PD Managers,ou=groups,dc=example,dc=com");)

dn: ou=Special Users,dc=example,dc=com
objectclass: top

 opends/tests/staf-tests/functional-tests/shared/data/backends/Include.ldif

@@ -19,7 +19,7 @@
#
# CDDL HEADER END
#
#      Copyright 2006-2008 Sun Microsystems, Inc.
#      Copyright 2006-2009 Sun Microsystems, Inc.
# 
#
# dc=com sample LDIF file
@@ -34,12 +34,6 @@
objectclass: top
objectclass: domain
dc: com
aci: (target ="ldap:///dc=example,dc=com")(targetattr !=
 "userPassword")(version 3.0;acl "Anonymous read-search access";
 allow (read, search, compare)(userdn = "ldap:///anyone");)
aci: (target="ldap:///dc=example,dc=com") (targetattr =
  "*")(version 3.0; acl "allow all Admin group"; allow(all) groupdn =
  "ldap:///cn=Directory Administrators,ou=Groups,dc=example,dc=com";)

dn: dc=example,dc=com
objectclass: top
@@ -50,26 +44,6 @@
objectclass: top
objectclass: organizationalunit
ou: People
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr =
 "userpassword || telephonenumber || facsimiletelephonenumber")(version 3.0;
 acl "Allow self entry modification";allow (write)(userdn = "ldap:///self");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn || sn || uid")(targetfilter ="(ou=Accounting)")(version 3.0;
 acl "Accounting Managers Group Permissions";allow (write) (groupdn =
  "ldap:///cn=Accounting Managers,ou=groups,dc=example,dc=com");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn || sn || uid")(targetfilter ="(ou=Human Resources)")(version 3.0;
 acl "HR Group Permissions";allow (write)(groupdn = "ldap:///cn=HR Managers,
 ou=groups,dc=example,dc=com
 ");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn ||sn || uid")(targetfilter ="(ou=Product Testing)")(version 3.0;
 acl "QA Group Permissions";allow (write)(groupdn = "ldap:///cn=QA Managers,
 ou=groups,dc=example,dc=com");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn || sn || uid")(targetfilter ="(ou=Product Development)")(version 3.0;
 acl "Engineering Group Permissions";allow (write)(groupdn = "ldap:///
 cn=PD Managers,ou=groups,dc=example,dc=com");)

dn: uid=scarter, ou=People, dc=example,dc=com
cn: Sam Carter

 opends/tests/staf-tests/functional-tests/shared/data/backends/Schema.ldif

@@ -19,7 +19,7 @@
#
# CDDL HEADER END
#
#      Copyright 2006-2008 Sun Microsystems, Inc.
#      Copyright 2006-2009 Sun Microsystems, Inc.
# 
#
# dc=com sample LDIF file
@@ -34,12 +34,6 @@
objectclass: top
objectclass: domain
dc: com
aci: (target ="ldap:///dc=example,dc=com")(targetattr !=
 "userPassword")(version 3.0;acl "Anonymous read-search access";
 allow (read, search, compare)(userdn = "ldap:///anyone");)
aci: (target="ldap:///dc=example,dc=com") (targetattr =
  "*")(version 3.0; acl "allow all Admin group"; allow(all) groupdn =
  "ldap:///cn=Directory Administrators,ou=Groups,dc=example,dc=com";)

dn: dc=example,dc=com
objectclass: top
@@ -50,26 +44,6 @@
objectclass: top
objectclass: organizationalunit
ou: People
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr =
 "userpassword || telephonenumber || facsimiletelephonenumber")(version 3.0;
 acl "Allow self entry modification";allow (write)(userdn = "ldap:///self");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn || sn || uid")(targetfilter ="(ou=Accounting)")(version 3.0;
 acl "Accounting Managers Group Permissions";allow (write) (groupdn =
  "ldap:///cn=Accounting Managers,ou=groups,dc=example,dc=com");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn || sn || uid")(targetfilter ="(ou=Human Resources)")(version 3.0;
 acl "HR Group Permissions";allow (write)(groupdn = "ldap:///cn=HR Managers,
 ou=groups,dc=example,dc=com
 ");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn ||sn || uid")(targetfilter ="(ou=Product Testing)")(version 3.0;
 acl "QA Group Permissions";allow (write)(groupdn = "ldap:///cn=QA Managers,
 ou=groups,dc=example,dc=com");)
aci: (target ="ldap:///ou=People,dc=example,dc=com")(targetattr !=
 "cn || sn || uid")(targetfilter ="(ou=Product Development)")(version 3.0;
 acl "Engineering Group Permissions";allow (write)(groupdn = "ldap:///
 cn=PD Managers,ou=groups,dc=example,dc=com");)

dn: uid=scarter, ou=People, dc=example,dc=com
cn: Sam Carter

 opends/tests/staf-tests/functional-tests/shared/data/groups/entry_acis.ldif

New file
@@ -0,0 +1,41 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License, Version 1.0 only
# (the "License").  You may not use this file except in compliance
# with the License.
#
# You can obtain a copy of the license at
# trunk/opends/resource/legal-notices/OpenDS.LICENSE
# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
# trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
#      Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
#      Copyright 2009 Sun Microsystems, Inc.
#

dn: dc=com
changetype: modify
add: aci
aci: (target="ldap:///dc=groups,dc=com")(targetattr = "*")(version 3.0;acl "access for application"; allow (all)(userdn = "ldap:///uid=my_application,dc=groups,dc=com");)
-
add: aci
aci: (target="ldap:///ou=static,dc=groups,dc=com")(targetattr = "*")(version 3.0;acl "access for application"; deny (all)(groupdn = "ldap:///cn=my_staticgroup1,dc=groups,dc=com");)
-
add: aci
aci: (target="ldap:///ou=static,dc=groups,dc=com")(targetattr = "*")(version 3.0;acl "access for application"; deny (all)(groupdn = "ldap:///cn=my_staticgroup2,dc=groups,dc=com");)
-
add: aci
aci: (target="ldap:///ou=dynamic,dc=groups,dc=com")(targetattr = "*")(version 3.0;acl "access for application"; deny (all)(groupdn = "ldap:///cn=my_dynamicgroup1,dc=groups,dc=com");)
-
add: aci
aci: (target="ldap:///ou=dynamic,dc=groups,dc=com")(targetattr = "*")(version 3.0;acl "access for application"; deny (all)(groupdn = "ldap:///cn=my_dynamicgroup2,dc=groups,dc=com");)

 opends/tests/staf-tests/functional-tests/shared/data/groups/global_acis.ldif

New file
@@ -0,0 +1,41 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License, Version 1.0 only
# (the "License").  You may not use this file except in compliance
# with the License.
#
# You can obtain a copy of the license at
# trunk/opends/resource/legal-notices/OpenDS.LICENSE
# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
# trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
#      Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
#      Copyright 2009 Sun Microsystems, Inc.
#

dn: cn=Access Control Handler,cn=config
changetype: modify
add: ds-cfg-global-aci
ds-cfg-global-aci: (target="ldap:///dc=groups,dc=com")(targetattr = "*")(version 3.0;acl "access for application"; allow (all)(userdn = "ldap:///uid=my_application,dc=groups,dc=com");)
-
add: ds-cfg-global-aci
ds-cfg-global-aci: (target="ldap:///ou=static,dc=groups,dc=com")(targetattr = "*")(version 3.0;acl "access for application"; deny (all)(groupdn = "ldap:///cn=my_staticgroup1,dc=groups,dc=com");)
-
add: ds-cfg-global-aci
ds-cfg-global-aci: (target="ldap:///ou=static,dc=groups,dc=com")(targetattr = "*")(version 3.0;acl "access for application"; deny (all)(groupdn = "ldap:///cn=my_staticgroup2,dc=groups,dc=com");)
-
add: ds-cfg-global-aci
ds-cfg-global-aci: (target="ldap:///ou=dynamic,dc=groups,dc=com")(targetattr = "*")(version 3.0;acl "access for application"; deny (all)(groupdn = "ldap:///cn=my_dynamicgroup1,dc=groups,dc=com");)
-
add: ds-cfg-global-aci
ds-cfg-global-aci: (target="ldap:///ou=dynamic,dc=groups,dc=com")(targetattr = "*")(version 3.0;acl "access for application"; deny (all)(groupdn = "ldap:///cn=my_dynamicgroup2,dc=groups,dc=com");)

 opends/tests/staf-tests/functional-tests/shared/data/groups/groups.ldif

@@ -20,23 +20,13 @@
#
# CDDL HEADER END
#
#      Copyright 2007-2008 Sun Microsystems, Inc.
#      Copyright 2007-2009 Sun Microsystems, Inc.
#

dn: dc=com
objectclass: top
objectclass: domain
dc: com 
aci: (target="ldap:///dc=groups,dc=com")(targetattr = "*")(version 3.0;acl "access for application";
 allow (all)(userdn = "ldap:///uid=my_application,dc=groups,dc=com");)
aci: (target="ldap:///ou=static,dc=groups,dc=com")(targetattr = "*")(version 3.0;acl "access for application";
 deny (all)(groupdn = "ldap:///cn=my_staticgroup1,dc=groups,dc=com");)
aci: (target="ldap:///ou=static,dc=groups,dc=com")(targetattr = "*")(version 3.0;acl "access for application";
 deny (all)(groupdn = "ldap:///cn=my_staticgroup2,dc=groups,dc=com");)
aci: (target="ldap:///ou=dynamic,dc=groups,dc=com")(targetattr = "*")(version 3.0;acl "access for application";
 deny (all)(groupdn = "ldap:///cn=my_dynamicgroup1,dc=groups,dc=com");)
aci: (target="ldap:///ou=dynamic,dc=groups,dc=com")(targetattr = "*")(version 3.0;acl "access for application";
 deny (all)(groupdn = "ldap:///cn=my_dynamicgroup2,dc=groups,dc=com");)

dn: dc=groups,dc=com
objectclass: top

 opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_entry_acis.ldif

New file
@@ -0,0 +1,19 @@
dn: uid=tmorris, ou=People, o=Privileges Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="*")(version 3.0; acl "rep_search_aci_tmorris"; allow (write) userdn="ldap:///uid=auser, o=Privileges Tests,dc=example,dc=com";)
-
dn: uid=abergin, ou=People, o=Privileges Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="*")(version 3.0; acl "del_search_aci_abergin"; allow (search,read) userdn="ldap:///uid=auser, o=Privileges Tests,dc=example,dc=com";)
-
dn: uid=dmiller, ou=People, o=Privileges Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="*")(version 3.0; acl "del_search_aci_dmiller"; allow (write) userdn="ldap:///uid=auser, o=Privileges Tests,dc=example,dc=com";)
-
dn: uid=gfarmer, ou=People, o=Privileges Tests, dc=example,dc=com
changetype: modify
add: aci
aci: (targetattr="*")(version 3.0; acl "del_search_aci_gfarmer"; allow (write) userdn="ldap:///uid=auser, o=Privileges Tests,dc=example,dc=com";)

 opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_global_acis.ldif

New file
@@ -0,0 +1,13 @@
dn: cn=Access Control Handler,cn=config
changetype: modify
add: ds-cfg-global-aci
ds-cfg-global-aci: (targetattr="*")(version 3.0; acl "rep_search_aci_tmorris"; allow (write) userdn="ldap:///uid=auser, o=Privileges Tests,dc=example,dc=com";)
-
add: ds-cfg-global-aci
ds-cfg-global-aci: (targetattr="*")(version 3.0; acl "del_search_aci_abergin"; allow (search,read) userdn="ldap:///uid=auser, o=Privileges Tests,dc=example,dc=com";)
-
add: ds-cfg-global-aci
ds-cfg-global-aci: (targetattr="*")(version 3.0; acl "del_search_aci_dmiller"; allow (write) userdn="ldap:///uid=auser, o=Privileges Tests,dc=example,dc=com";)
-
add: ds-cfg-global-aci
ds-cfg-global-aci: (targetattr="*")(version 3.0; acl "del_search_aci_gfarmer"; allow (write) userdn="ldap:///uid=auser, o=Privileges Tests,dc=example,dc=com";)

 opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_startup.ldif

@@ -20,7 +20,7 @@
#
# CDDL HEADER END
#
#      Copyright 2008 Sun Microsystems, Inc.
#      Copyright 2008-2009 Sun Microsystems, Inc.
#

dn: cn=Aroot Manager,cn=Root DNs,cn=config
@@ -39,6 +39,14 @@
ds-rlim-time-limit: 0
ds-rlim-size-limit: 0

dn: dc=com
dc: com
objectclass: domain

dn: dc=example,dc=com
dc: example
objectclass: domain

dn: o=Privileges Tests, dc=example,dc=com
o: Privileges Tests
objectclass: top
@@ -157,7 +165,6 @@
facsimiletelephonenumber: +1 408 555 8473
roomnumber: 4117
userpassword: irrefutable
aci: (targetattr="*")(version 3.0; acl "rep_search_aci_tmorris"; allow (write) userdn="ldap:///uid=auser, o=Privileges Tests,dc=example,dc=com";)

dn: uid=abergin, ou=People, o=Privileges Tests, dc=example,dc=com
cn: Andy Bergin
@@ -176,7 +183,6 @@
facsimiletelephonenumber: +1 408 555 7472
roomnumber: 3472
userpassword: inflict
aci: (targetattr="*")(version 3.0; acl "del_search_aci_abergin"; allow (search,read) userdn="ldap:///uid=auser, o=Privileges Tests,dc=example,dc=com";)

dn: uid=dmiller, ou=People, o=Privileges Tests, dc=example,dc=com
cn: David Miller
@@ -195,7 +201,6 @@
facsimiletelephonenumber: +1 408 555 0111
roomnumber: 4135
userpassword: gosling
aci: (targetattr="*")(version 3.0; acl "del_search_aci_dmiller"; allow (write) userdn="ldap:///uid=auser, o=Privileges Tests,dc=example,dc=com";)

dn: uid=gfarmer, ou=People, o=Privileges Tests, dc=example,dc=com
cn: Gern Farmer
@@ -217,7 +222,6 @@
title: Engineer
title: architect
title: sweeper
aci: (targetattr="*")(version 3.0; acl "del_search_aci_gfarmer"; allow (write) userdn="ldap:///uid=auser, o=Privileges Tests,dc=example,dc=com";)

dn: uid=kwinters, ou=People, o=Privileges Tests, dc=example,dc=com
cn: Kelly Winters

 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif

@@ -20,9 +20,17 @@
#
# CDDL HEADER END
#
#      Copyright 2006-2008 Sun Microsystems, Inc.
#      Copyright 2006-2009 Sun Microsystems, Inc.
#

dn: dc=com
dc: com
objectclass: domain

dn: dc=example,dc=com
dc: example
objectclass: domain

dn: o=extensible object tests,dc=example,dc=com
o: extensible object tests
objectclass: top

 opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/virtualAttributes.ldif

@@ -20,15 +20,13 @@
#
# CDDL HEADER END
#
#      Copyright 2007-2008 Sun Microsystems, Inc.
#      Copyright 2007-2009 Sun Microsystems, Inc.
#

dn: dc=com
objectclass: top
objectclass: domain
dc: com
aci: (target="ldap:///dc=virtualAttributes,dc=com")(targetattr = "*")(version 3.0;acl "access for application";
 allow (all)(userdn = "ldap:///uid=my_application,dc=virtualAttributes,dc=com");)

dn: dc=virtualAttributes,dc=com
objectclass: top

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

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="main_aci"/>
@@ -33,6 +33,7 @@
    </function-list-args>
    <sequence>

      <try>
      <block name="'aci'">
      
        <sequence>
@@ -72,20 +73,50 @@
            suiteList.append('aci_bindtypes')
            suiteList.append('aci_proxy_auth')
            suiteList.append('aci_effective_rights')
#OOS        suiteList.append('aci_import')
#OOS          #suiteList.append('aci_import')
          </script>

            <!-- Run the test suites -->
          <iterate  var="_suite" in="suiteList">
            <sequence>
                <try>
                  <sequence>                  
              <import machine="STAF_LOCAL_HOSTNAME"
                file="'%s/testcases/aci/%s.xml' % (TESTS_DIR,_suite)"/>
              <call function="'%s' % _suite" />    
            </sequence>
                <catch exception="'STAFException.TestSuite.SetupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Setup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.MainException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Main part of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.CleanupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                </try>
              </sequence>
          </iterate>
                                  
          <call function="'testGroup_Postamble'"/>
        </sequence>
      </block>
      <catch exception="'STAXException.TestGroupException'">
        <sequence>
          <message log="1" level="'fatal'">'Execution of Test Group Failed'</message>
        </sequence>
      </catch>        
      <finally>
        <!-- Test Group postamble -->
        <call function="'testGroup_Postamble'"/>
      </finally>
      </try>

    </sequence>
  </function>
</stax>

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

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

  <defaultcall function="aci_cleanup"/>

  <function name="aci_cleanup">
  <function name="aci_cleanup" scope="local">

    <sequence>

      <block name="'cleanup'">
      <block name="'aci_cleanup'">

        <testcase name="getTestCaseName('ACI Cleanup')">

          <try>
      
        <sequence>
              <call function="'testCase_Preamble'"/>

              <call function="'runFunction'">
                { 'functionName'      : 'ldapDeleteWithScript'                  ,
                  'functionMessage'   : 'Recursive delete of suffix.'           ,
                  'functionException' : 'LDAP.DeleteException'                  ,
                  'functionArguments' : { 'location'        : STAF_REMOTE_HOSTNAME  ,
                                          'dsDeleteSubtree' : 'TRUE'                ,
                                          'dsInstanceHost'  : server.host           ,
                                          'dsInstancePort'  : server.port           ,
                                          'dsInstanceDn'    : server.dn             ,
                                          'dsInstancePswd'  : server.password       ,
                                          'dsDn'            : ['%s' % server.suffix] }
                }
              </call>
      
          <block name="'Block DS Process Stop'">        
          <!--- Stop DS -->
              <call function="'runFunction'">
                { 'functionName'      : 'StopDsWithScript'                      ,
                  'functionMessage'   : 'Stop the Directory Server.'            ,
                  'functionException' : 'Server.StopException'                  ,
                  'functionArguments' : { 'location'    : STAF_REMOTE_HOSTNAME  ,
                                          'dsHost'      : server.host           ,
                                          'dsAdminPort' : server.adminport      ,
                                          'dsBindDN'    : server.dn             ,
                                          'dsBindPwd'   : server.password }
                }
              </call>
              
              <call function="'runFunction'">
                { 'functionName'      : 'removeTopology'                  ,
                  'functionMessage'   : 'Remove DS topology.'             ,
                  'functionException' : 'Server.RemoveTopologyException' 
                }
              </call>
                      
            </sequence> 
                             
            <catch exception="'STAXException.LDAP.DeleteException'" typevar="eType" var="eInfo">
        <sequence>
              <message>
                 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
              <message log="1" level="'fatal'">
                '%s: LDAPDelete failed. eInfo(%s)' % (eType,eInfo)
              </message>

              <call function="'StopDsWithScript'">
                { 'location'    : STAF_REMOTE_HOSTNAME,
                  'dsHost'      : DIRECTORY_INSTANCE_HOST,
                  'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
                  'dsBindDN'    : DIRECTORY_INSTANCE_DN,
                  'dsBindPwd'   : DIRECTORY_INSTANCE_PSWD }
              </call>

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

              <throw exception="'STAFException.TestSuite.CleanupException'" />
        </sequence>        
          <!--- End Block DS Process Stop -->
          </block>
            </catch>
      
                              

      <block name="'Block Remove DS Topology'">
      <!-- Remove  the topology created for the test suite -->
            <catch exception="'STAXException.Server.RemoveTopologyException'" typevar="eType" var="eInfo">
      <sequence>
        
              <message>
                 'Remove DS topology created for the Test Suite'
              <message log="1" level="'fatal'">
                '%s: Remove topology failed. eInfo(%s)' % (eType,eInfo)
              </message>          

        <call function="'removeTopology'"/>
        
        <call function="'checkRC'">
                  { 'returncode' : RC ,
                    'result'     : STAXResult }
              </call>
      
              <throw exception="'STAFException.TestSuite.CleanupException'" />
      </sequence>        
      <!-- End Block Remove DS Topology-->  
      </block>                                  
            </catch>
              
      
            <catch exception="'STAXException.Server.StopException'" typevar="eType" var="eInfo">
              <sequence>
              <message log="1" level="'fatal'">
                '%s: Failed to stop Directory Server. eInfo(%s)' % (eType,eInfo)
              </message>
              <throw exception="'STAFException.TestSuite.CleanupException'" />
        </sequence>        
            </catch>
            <finally>
              <!-- Test Group postamble -->
              <call function="'testCase_Postamble'"/>
            </finally>
  
          </try>        

        </testcase>

      </block>
            
     </sequence>

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

@@ -529,6 +529,7 @@
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />
      
          <call function="'testSuite_Postamble'"/>      
       
        </sequence>
      

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

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

@@ -37,14 +37,6 @@
      
        <sequence>
  
          <script>
            if not CurrentTestPath.has_key('group'):
              CurrentTestPath['group']='aci'                
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 1')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -262,9 +254,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 11')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -254,9 +248,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 12')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -246,9 +240,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 13')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -258,9 +252,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 14')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -244,9 +238,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 15')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -254,9 +248,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 16')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -246,9 +240,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 2')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -252,9 +246,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 21')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -260,9 +254,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 22')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -252,9 +246,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 23')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -264,9 +258,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 24')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -250,9 +244,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 25')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -260,9 +254,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 26')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -252,9 +246,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 3')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -264,9 +258,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 4')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -250,9 +244,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 5')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -260,9 +254,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -37,12 +37,6 @@
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>
          
            <testcase name="getTestCaseName('ACI 6')">
              <sequence>
                <call function="'testCase_Preamble'"/>
@@ -252,9 +246,8 @@
                <call function="'testCase_Postamble'"/>
    
              </sequence>
            </testcase>
     
          <call function="'testSuite_Postamble'"/>
            </testcase>
            
        </sequence>
   

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

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

@@ -80,6 +80,7 @@
                   'ACI: Proxy Auth: Preamble - Removing Search Global ACI'
                </message>
    
                <!-- Remove the global ACI -->    
                <call function="'modifyGlobalAci'">
                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,
                    'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
@@ -88,10 +89,12 @@
                    'opType'                 : 'remove' }
                </call>
            
                <!-- Allow the proxy auth control for all ldap users read only -->            
                <script>
                    allow_aci='(targetcontrol=\"*\") (version 3.0; acl \"allow control access\"; allow(read) userdn=\"ldap:///anyone\";)'
                    allow_aci='(targetcontrol=\"2.16.840.1.113730.3.4.18\") (version 3.0; acl \"allow proxy auth control access\"; allow(read) userdn=\"ldap:///anyone\";)'
                </script>
        
                <!--  Add the ACI under suffix -->        
                <call function="'modifyAnAttribute'">
                  { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,
                    'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,
@@ -107,6 +110,7 @@
                 'ACI: Proxy Auth: Preamble - existing branch, user searching entry that will be targeted in future tests'
                </message>
  
              <!-- Search a users entry as another user. This should return no results -->  
              <call function="'SearchObject'">
                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
@@ -127,10 +131,13 @@
                    'expectedResult'     : '0' }
              </call>
              
              <!-- TODO: Also perform a modify operation - should return insufficient access -->              

              <message>
                 'ACI: Proxy Auth: Preamble - existing branch, user searching entry that will be non-targeted in future tests'
              </message>
  
              <!-- Search a users entry as another user. This should return no results -->  
              <call function="'SearchObject'">
                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
@@ -150,6 +157,8 @@
                    'testString'         : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' }
              </call>
              
              <!-- TODO: Also perform a modify operation - should return insufficient access -->
              
              <call function="'testCase_Postamble'"/>
  
            </sequence>
@@ -184,6 +193,7 @@
                 'ACI: Proxy Auth: one proxied user, user searching targeted entry'
              </message>
  
              <!-- Search a users entry as another user (uid=auser). This should return no results -->  
              <call function="'SearchObject'">
                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
@@ -208,6 +218,7 @@
                 'ACI: Proxy Auth: one proxied user, second user searching targeted entry'
              </message>
  
              <!-- Search a users entry as another user (uid=buser). This should return no results -->  
              <call function="'SearchObject'">
                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
@@ -232,6 +243,7 @@
                 'ACI: Proxy Auth: one proxied user, proxied user searching targeted entry'
              </message>
  
              <!-- Search a users entry as uid=aproxy. This should return no results -->  
              <call function="'SearchObject'">
                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
@@ -252,6 +264,7 @@
                    'expectedResult'     : '0' }
              </call>
              
              <!-- Add the proxi aci for user uid=aproxy under ou=aci branch -->              
              <script>
                  curr_aci_ldif_file = 'add_proxy_aci.ldif'
                  curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
@@ -269,14 +282,11 @@
                  'entryToBeModified'   : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
              </call>
  
              <if expr="RC != 0">
                  <tcstatus result="'fail'"/>
              </if>
  
              <message>
                 'ACI: Proxy Auth: one proxied user, proxy user searching targeted entry'
              </message>
  
              <!-- Search users entry with proxy dn without allowed aci access. This should return no results -->  
              <call function="'SearchObject'">
                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
@@ -298,10 +308,13 @@
                    'expectedResult'     : '0' }
              </call>
              
              <!-- TODO: Also perform a modify operation - should return insufficient access -->
                            
              <message>
                 'ACI: Proxy Auth: one proxied user, admin deleting both acis'
              </message>
  
              <!-- Delete the proxy aci for user uid=aproxy -->  
              <call function="'modifyEntry'">
                { 'dsInstanceHost'      : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'      : DIRECTORY_INSTANCE_PORT ,
@@ -310,14 +323,11 @@
                  'entryToBeModified'   : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
              </call>
  
              <if expr="RC != 0">
                  <tcstatus result="'fail'"/>
              </if>
  
              <message>
                 'ACI: Proxy Auth: one proxied user, user searching targeted entry'
              </message>
  
              <!-- Search a users entry as another user. This should return no results -->  
              <call function="'SearchObject'">
                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
@@ -368,6 +378,7 @@
            <sequence>
              <call function="'testCase_Preamble'"/>

              <!-- Allow user uid=auser access to all entries under ou=aci branch -->
              <script>
                  curr_aci_ldif_file = 'add_user_aci_all.ldif'
                  curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
@@ -385,14 +396,11 @@
                  'entryToBeModified'   : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
              </call>
  
              <if expr="RC != 0">
                  <tcstatus result="'fail'"/>
              </if>
  
              <message>
                 'ACI: Proxy Auth: one user, one proxied user, user searching targeted entry'
              </message>
  
              <!-- Search a users entry under suffix as uid=auser. This should return a result -->  
              <call function="'SearchObject'">
                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
@@ -423,6 +431,7 @@
                 'ACI: Proxy Auth: one user, one proxied user, user searching targeted entry'
              </message>
  
              <!-- Search a users entry as another user. This should return no results -->  
              <call function="'SearchObject'">
                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
@@ -447,6 +456,7 @@
                 'ACI: Proxy Auth: one user, one proxied user, proxied user searching targeted entry'
              </message>
  
              <!-- Search a users entry just as proxy user. This should return no results -->  
              <call function="'SearchObject'">
                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
@@ -467,6 +477,7 @@
                    'expectedResult'     : '0' }
              </call>
              
              <!-- Add the proxi aci for user uid=aproxy under ou=aci branch -->             
              <script>
                  curr_aci_ldif_file = 'add_proxy_aci.ldif'
                  curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
@@ -484,14 +495,11 @@
                  'entryToBeModified'   : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
              </call>
  
              <if expr="RC != 0">
                  <tcstatus result="'fail'"/>
              </if>
  
              <message>
                 'ACI: Proxy Auth: one user, one proxied user, proxied user searching targeted entry'
              </message>
  
              <!-- Search users entry with proxy dn with allowed aci access. This should return results -->  
              <call function="'SearchObject'">
                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
@@ -519,10 +527,13 @@
                    'expectedResult'     : '1' }
              </call>
              
              <!-- TODO: Also perform a modify operation - should return success -->
              
              <message>
                 'ACI: Proxy Auth: one user, one proxied user, proxied second user searching targeted entry'
              </message>
  
              <!-- Search users entry with proxy dn without allowed aci access. This should return no results -->
              <call function="'SearchObject'">
                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
@@ -548,6 +559,7 @@
                 'ACI: Proxy Auth: one user, one proxied user, admin deleting both acis'
              </message>
  
              <!-- Remove aci attribute for uid=auser -->  
              <call function="'modifyEntry'">
                { 'dsInstanceHost'      : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'      : DIRECTORY_INSTANCE_PORT ,
@@ -556,14 +568,11 @@
                  'entryToBeModified'   : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
              </call>
  
              <if expr="RC != 0">
                  <tcstatus result="'fail'"/>
              </if>
  
              <message>
                 'ACI: Proxy Auth: one user, one proxied user, user searching targeted entry'
              </message>
  
              <!-- Search a users entry as a uid=auser. This should return no results -->  
              <call function="'SearchObject'">
                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
@@ -2460,7 +2469,7 @@
              </call>
              
                <script>
                    allow_aci='(targetcontrol=\"*\") (version 3.0; acl \"allow control access\"; allow(read) userdn=\"ldap:///anyone\";)'
                    allow_aci='(targetcontrol=\"2.16.840.1.113730.3.4.18\") (version 3.0; acl \"allow proxy auth control access\"; allow(read) userdn=\"ldap:///anyone\";)'
                </script>
        
                <call function="'modifyAnAttribute'">

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

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

  <defaultcall function="aci_setup"/>

  <function name="aci_setup">
  <function name="aci_setup" scope="local">

    <sequence>

      <block name="'setup'">
      
        <testcase name="getTestCaseName('ACI Setup')">

          <try>      
        
        <sequence>

          <script>
            CurrentTestPath['group']='aci'
          </script>
              <call function="'testCase_Preamble'"/>
              
          
      <block name="'Block Create DS Topology'">
      <!-- Create the topology necessary to the test group/suite -->
        <sequence>
                
              <message>
                 'Create DS topology as described in config.py'
              </message>
          
        <call function="'createTopology'">
          { 'initialiseInstance' : True }
              <call function="'runFunction'">
                { 'functionName'      : 'createTopology'                  ,
                  'functionMessage'   : 'Create DS topology'              ,
                  'functionException' : 'Server.CreateTopologyException'  ,
                  'functionArguments' : { 'initialiseInstance' : True }
                }
        </call>
                    
        <call function="'checkRC'">
                  { 'returncode' : RC ,
                    'result'     : STAXResult }
              </call>
      
            </sequence>      
          <!--- End Block Create DS Topology -->  
          </block>                    


      <block name="'Block DS Process Active'">      
          <!--- Start DS -->
        <sequence>
        
              <message>
                 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
              </message>
  
              <!--- Start DS -->
              <call function="'StartDsWithScript'">
               { 'location'  : STAF_REMOTE_HOSTNAME }
              </call>
  
              <call function="'checkRC'">
                  { 'returncode' : RC ,
                    'result'     : STAXResult }
              <!-- Start the OpenDS Server -->                  
              <call function="'runFunction'">
                { 'functionName'      : 'StartDsWithScript'                   ,
                  'functionMessage'   : 'Start the Directory Server.'         ,
                  'functionException' : 'Server.StartException'               ,
                  'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME }
                }
              </call>
  
              <!--- Check that DS started -->
              <call function="'isAlive'">
                { 'noOfLoops'        : 10 ,
                  'noOfMilliSeconds' : 2000 }
              <call function="'runFunction'">
                { 'functionName'      : 'isAlive'                       ,
                  'functionMessage'   : 'Start the Directory Server.'   ,
                  'functionException' : 'Server.StartException'         ,
                  'functionArguments' : { 'noOfLoops'        : 100      ,
                                          'noOfMilliSeconds' : 3000 }
                }
              </call>      
        
            </sequence>
          <!--- End Block DS Process Active -->
          </block>              
            


      <block name="'Block DS Load Data'">
      <!-- Load the data needed by the test suite -->      
              <call function="'runFunction'">
                { 'functionName'      : 'ldapModifyWithScript' ,
                  'functionMessage'   : 'Adding Initial Entries' ,
                  'functionException' : 'LDAP.ModifyException'  ,
                  'functionArguments' : { 'dsAdd'            : 'TRUE' ,
                                          'dsInstanceHost'   : server.host ,
                                          'dsInstancePort'   : server.port ,
                                          'dsInstanceDn'     : server.dn ,
                                          'dsInstancePswd'   : server.password ,
                                          'dsFilename'       : '%s/aci/aci_startup.ldif' % remote.data }
                }  
              </call>
                 
            </sequence>        

            <catch exception="'STAXException.Server.CreateTopologyException'" typevar="eType" var="eInfo">
        <sequence>
                                        
              <message>
                'ACI: ACI Setup: Adding Initial Entries'
              <message log="1" level="'fatal'">
                '%s: Create topology failed. eInfo(%s)' % (eType,eInfo)
              </message>
    
              <call function="'addEntry'">
                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                  'entryToBeAdded'   : '%s/aci/aci_startup.ldif' % remote.data }
              </call>
    
              <call function="'checkRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
              </call>
    
              <throw exception="'STAFException.TestSuite.SetupException'" />
            </sequence>      
          <!--- End Block DS Load Data -->  
          </block>    
            </catch>
              
              
            <catch exception="'STAXException.Server.StartException'" typevar="eType" var="eInfo">
              <sequence>
              <message log="1" level="'fatal'">
                '%s: Failed to start Directory Server. eInfo(%s)' % (eType,eInfo)
              </message>
              <throw exception="'STAFException.TestSuite.SetupException'" />
        </sequence>        
            </catch>
  
            <catch exception="'STAXException.LDAP.ModifyException'" typevar="eType" var="eInfo">
              <sequence>
              <message log="1" level="'fatal'">
                '%s: LDAPModify failed. eInfo(%s)' % (eType,eInfo)
              </message>
              <throw exception="'STAFException.TestSuite.SetupException'" />
              </sequence>
            </catch>          
  
            <finally>
              <!-- Test Group postamble -->
              <call function="'testCase_Postamble'"/>
            </finally>
  
          </try>

        </testcase>                     

      </block>
            
     </sequence>

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

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

  <defaultcall function="global_acis"/>

  <function name="global_acis">
  <function name="global_acis" scope="local">

    <sequence>

      <block name="'global-acis'">
      
        <try>
              
        <sequence>
  
          <script>
@@ -53,10 +55,12 @@
                #@TestScript                global_acis.xml
          -->


          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
          <call function="'aci_setup'" />
            <call function="'common_setup'">
              {
                'stopServer'     : False,
                'ldifFile'       : '%s/aci/aci_startup.ldif' % remote.data
              }
            </call>

                            
            <!---
@@ -886,16 +890,28 @@
              </sequence>
            </testcase>


          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'aci_cleanup'" />

                            
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
       
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global ACI Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
               
      </block>
       
    </sequence>

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

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2006-2008 Sun Microsystems, Inc.
 !      Copyright 2006-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="main_backends"/>
@@ -32,6 +32,8 @@
      <function-required-arg name="STAXParentID"/>
    </function-list-args>
    <sequence>

      <try>
      <block name="'backends'">
        <sequence>
          
@@ -49,27 +51,58 @@

          <!-- List of backends test suites to run -->
          <script>
            testList = []
            testList.append('import')
            testList.append('import-tasks')
            testList.append('backup')
            testList.append('backup-tasks')
            testList.append('restore')
            testList.append('restore-tasks')
            testList.append('export')
            testList.append('export-tasks')
            suiteList = []
            suiteList.append('import')
            suiteList.append('import-tasks')
            suiteList.append('backup')
            suiteList.append('backup-tasks')
            suiteList.append('restore')
            suiteList.append('restore-tasks')
            suiteList.append('export')
            suiteList.append('export-tasks')
          </script>
          
          <iterate var="_test" in="testList" >
          <!-- Run the test suites -->
          <iterate  var="_suite" in="suiteList">
            <sequence>
              <try>
            <sequence>
              <import machine="STAF_LOCAL_HOSTNAME"
                      file="'%s/testcases/backends/%s.xml' % (TESTS_DIR,_test)"/>
              <call function="'main_%s' % _test" />
                    file="'%s/testcases/backends/%s.xml' % (TESTS_DIR,_suite)"/>
                  <call function="'main_%s' % _suite" />
                </sequence>
              <catch exception="'STAFException.TestSuite.SetupException'">
                <sequence>
                  <message log="1" level="'fatal'">'Setup of test suite %s failed.' % _suite</message>
                </sequence>
              </catch>
              <catch exception="'STAFException.TestSuite.MainException'">
                <sequence>
                  <message log="1" level="'fatal'">'Main part of test suite %s failed.' % _suite</message>
                </sequence>
              </catch>
              <catch exception="'STAFException.TestSuite.CleanupException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite %s failed.' % _suite</message>
                </sequence>
              </catch>
              </try>
            </sequence>
          </iterate>
          <call function="'testGroup_Postamble'"/>

        </sequence>
      </block>
      <catch exception="'STAXException.TestGroupException'">
        <sequence>
          <message log="1" level="'fatal'">'Execution of Test Group Failed'</message>
        </sequence>
      </catch>
      <finally>
        <!-- Test Group postamble -->
        <call function="'testGroup_Postamble'"/>
      </finally>
      </try>

    </sequence>
  </function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/backends/backendsetup.xml

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

<stax>
@@ -74,16 +74,11 @@
              <message>
                'Backend: Backend Setup for Export, Backup, and Restore Tests'
              </message>
              <call function="'importLdif'">
                { 'ldifFile'    : '%s/backends/backend_start.ldif' % remote.data }
              <call function="'ImportLdifWithScript'">
                { 'dsLdifFile' : '%s/backends/backend_start.ldif' % remote.data ,
                  'dsBackEnd'  : DIRECTORY_INSTANCE_BE }
              </call>
    
              <call function="'checktestRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult }
              </call>
    
              
              <call function="'testCase_Postamble'"/>
    
            </sequence>

 opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks.xml

@@ -23,13 +23,14 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="main_backup-tasks"/>
  <function name="main_backup-tasks">
    <sequence>
      <block name="'backup-tasks'">
        <try>
        <sequence>
          <script>
            if not CurrentTestPath.has_key('group'):
@@ -38,9 +39,15 @@
          </script>
          <call function="'testSuite_Preamble'" />
          
          <import machine="STAF_LOCAL_HOSTNAME"
                  file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)" />
          <call function="'backend_setup'"> { 'loadBackend' : True } </call>
            <call function="'common_setup'">
              {
                'quickStart'  : False ,
                'loadData'    : False ,
                'startServer' : True ,
                'stopServer'  : False
              }
            </call>
  
          <testcase name="getTestCaseName('Test 1')">
            <sequence>
              <call function="'testCase_Preamble'"/>
@@ -65,11 +72,28 @@
            </sequence>
          </testcase>
          
          <import machine="STAF_LOCAL_HOSTNAME"
                  file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'backend_cleanup'"/>
          <call function="'testSuite_Postamble'"/>
        </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Backup Cleanup.'</message>
              <try>
                <try>
                  <call function="'common_cleanup'" />
                <catch exception="'STAFException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                  </sequence>
                </catch>
                </try>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
        </try>
      </block>
    </sequence>
  </function>

 opends/tests/staf-tests/functional-tests/testcases/backends/backup.xml

@@ -23,13 +23,16 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="main_backup"/>
  <function name="main_backup">
    <sequence>
      <block name="'backup'">

        <try>

        <sequence>
          <script>
            if not CurrentTestPath.has_key('group'):
@@ -46,13 +49,16 @@
            #@TestScript          backup.xml
            #@TestHTMLLink        http://opends.dev.java.net/
          -->
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
          <call function="'backend_setup'"> 
            { 'startDS' : False,
              'loadBackend' : True

            <call function="'common_setup'">
              {
                'quickStart'  : False ,
                'startServer' : False ,
                'loadData'    : False ,
                'stopServer'  : False
            } 
          </call>

          <!--- Test Case information
            #@TestMarker          Backend Backup Tests
            #@TestName            Export: Backup 1
@@ -209,11 +215,31 @@
              <call function="'testCase_Postamble'" />
            </sequence>
          </testcase>
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'backend_cleanup'"> { 'stopDS' : False } </call>
          <call function="'testSuite_Postamble'" />
  
        </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Backup Cleanup.'</message>
              <try>
                <try>
                  <call function="'common_cleanup'" />
                <catch exception="'STAFException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                  </sequence>
                </catch>
                </try>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>
        
      </block>
    </sequence>
  </function>

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

@@ -23,13 +23,14 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2006-2008 Sun Microsystems, Inc.
 !      Copyright 2006-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="main_export-tasks"/>
  <function name="main_export-tasks">
    <sequence>
      <block name="'export-tasks'">
        <try>
        <sequence>
          <script>
            if not CurrentTestPath.has_key('group'):
@@ -46,9 +47,14 @@
            #@TestScript          export.xml
            #@TestHTMLLink        http://opends.dev.java.net/
          -->
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
          <call function="'backend_setup'"> { 'loadBackend' : True } </call>
            <call function="'common_setup'">
              {
                'quickStart'  : False ,
                'loadData'    : False ,
                'startServer' : True ,
                'stopServer'  : False
              }
            </call>
          <sequence>
            <!--- Test Case information
              #@TestMarker          Backend Export Tasks Tests
@@ -361,11 +367,28 @@
              #@TestResult
            -->
          </sequence>
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'backend_cleanup'"/>
          <call function="'testSuite_Postamble'"/>
  
        </sequence>
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Backup Cleanup.'</message>
              <try>
                <try>
                  <call function="'common_cleanup'" />
                <catch exception="'STAFException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                  </sequence>
                </catch>
                </try>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
        </try>
      </block>
    </sequence>
  </function>

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

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

<stax>
@@ -31,6 +31,7 @@
  <function name="main_export">
    <sequence>
      <block name="'export'">
        <try>
        <sequence>
          <script>
            if not CurrentTestPath.has_key('group'):
@@ -47,11 +48,13 @@
                #@TestScript          export.xml
                #@TestHTMLLink        http://opends.dev.java.net/
          -->
          <import machine="STAF_LOCAL_HOSTNAME"
                  file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
          <call function="'backend_setup'"> 
            { 'startDS' : False,
              'loadBackend' : True

            <call function="'common_setup'">
              {
                'quickStart'  : False ,
                'startServer' : False ,
                'loadData'    : False ,
                'stopServer'  : False
            }
          </call>
          
@@ -2033,12 +2036,28 @@
                #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
          -->
           <!-- Need to know what the error codes are -->
          <import machine="STAF_LOCAL_HOSTNAME"
                  file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'backend_cleanup'"> { 'stopDS' : False } </call>

          <call function="'testSuite_Postamble'"/>
        </sequence>
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Backup Cleanup.'</message>
              <try>
                <try>
                  <call function="'common_cleanup'" />
                <catch exception="'STAFException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                  </sequence>
                </catch>
                </try>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
        </try>
      </block>
    </sequence>
  </function>

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

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

<stax>
@@ -31,6 +31,9 @@
  <function name="main_import-tasks">
    <sequence>
      <block name="'import-tasks'">
      
        <try>

        <sequence>
          <script>
            if not CurrentTestPath.has_key('group'):
@@ -48,9 +51,14 @@
            #@TestScript          import-tasks.xml
            #@TestHTMLLink        http://opends.dev.java.net/
          -->
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
          <call function="'backend_setup'" />      
            <call function="'common_setup'">
              {
                'quickStart'  : False ,
                'loadData'    : False ,
                'startServer' : True ,
                'stopServer'  : False
              }
            </call>      
          <!--- Test Case information
            #@TestMarker          Backend Import Tasks Tests
            #@TestName            Import Tasks: LDIF Default
@@ -1106,11 +1114,30 @@
          -->
          <!-- Need to know what the error codes are -->
          
          <import machine="STAF_LOCAL_HOSTNAME"
                  file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'backend_cleanup'" />
          <call function="'testSuite_Postamble'"/>
        </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Backup Cleanup.'</message>
              <try>
                <try>
                  <call function="'common_cleanup'" />
                <catch exception="'STAFException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                  </sequence>
                </catch>
                </try>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>

      </block>
    </sequence>
  </function>

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

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

<stax>
@@ -36,6 +36,8 @@

      <block name="'import'">
      
        <try>      

        <sequence>
  
          <script>
@@ -56,11 +58,14 @@
          #@TestHTMLLink        http://opends.dev.java.net/
          -->


          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
          <call function="'backend_setup'"> { 'startDS' : False } </call>
        
            <call function="'common_setup'">
              {
                'quickStart'  : False ,
                'startServer' : False ,
                'loadData'    : False ,
                'stopServer'  : False
              }
            </call>
                 
          <!--- Test Case information
          #@TestMarker          Backend Import Tests
@@ -1298,17 +1303,30 @@
    
          <!-- Need to know what the error codes are -->

      

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'backend_cleanup'"> { 'stopDS' : False } </call>          
      
                
          <call function="'testSuite_Postamble'"/>
  
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Backup Cleanup.'</message>
              <try>
                <try>
                  <call function="'common_cleanup'" />
                <catch exception="'STAFException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                  </sequence>
                </catch>
                </try>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
        
      </block>
                  
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks.xml

@@ -23,13 +23,14 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="main_restore-tasks"/>
  <function name="main_restore-tasks">
    <sequence>
      <block name="'restore-tasks'">
        <try>
        <sequence>
          <script>
            if not CurrentTestPath.has_key('group'):
@@ -46,9 +47,14 @@
            #@TestScript          restore-tasks.xml
            #@TestHTMLLink        http://opends.dev.java.net/
          -->
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
          <call function="'backend_setup'"> { 'loadBackend' : True } </call>    
            <call function="'common_setup'">
              {
                'quickStart'  : False ,
                'loadData'    : False ,
                'startServer' : True ,
                'stopServer'  : False
              }
            </call> 
          
          <!--- Test Case information
            #@TestMarker          Backend Restore Tasks Tests
@@ -85,11 +91,28 @@
              <call function="'testCase_Postamble'"/>
              </sequence>
            </testcase>
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'backend_cleanup'"/>
          <call function="'testSuite_Postamble'"/>
  
        </sequence>
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Backup Cleanup.'</message>
              <try>
                <try>
                  <call function="'common_cleanup'" />
                <catch exception="'STAFException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                  </sequence>
                </catch>
                </try>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
        </try>
      </block>
    </sequence>
  </function>

 opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml

@@ -23,13 +23,14 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="main_restore"/>
  <function name="main_restore">
    <sequence>
      <block name="'restore'">
        <try>
        <sequence>
          <script>
            if not CurrentTestPath.has_key('group'):
@@ -47,14 +48,15 @@
            #@TestHTMLLink        http://opends.dev.java.net/
          -->
          
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
          <call function="'backend_setup'"> 
            { 'startDS'     : True,
              'loadBackend' : True
            <call function="'common_setup'">
              {
                'quickStart'  : False ,
                'startServer' : False ,
                'loadData'    : False ,
                'stopServer'  : False
            }
          </call>
          <sequence>
  
            <message>
              'Create a backup of the data in OpenDS to be used in the restore testcase'
            </message>
@@ -67,7 +69,7 @@
                'result'     : STAXResult
              }
            </call>
          </sequence>
  
          <!--- Test Case information
            #@TestMarker          Backend Restore Tests
            #@TestName            Export: Restore 1
@@ -203,11 +205,28 @@
              <call function="'testCase_Postamble'" />
            </sequence>
          </testcase>
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)" />
          <call function="'backend_cleanup'"> { 'stopDS' : True } </call>
          <call function="'testSuite_Postamble'" />

        </sequence>
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Backup Cleanup.'</message>
              <try>
                <try>
                  <call function="'common_cleanup'" />
                <catch exception="'STAFException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                  </sequence>
                </catch>
                </try>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
        </try>
      </block>
    </sequence>
  </function>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml

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

    <sequence>
      
      <try>
            
      <block name="'clu'">
        
        <sequence>
@@ -54,6 +56,7 @@
          -->
          <script>
            CurrentTestPath['group'] = 'clu'
            _group=CurrentTestPath['group']
          </script>
          
          <call function="'testGroup_Preamble'"/>
@@ -68,51 +71,71 @@
               clu_verify-index_checkbehavior and clu_dbtest_checkbehavior            
          -->         
          <script>
            testList = []
            testList.append(['.','clu_setup'])
            testList.append(['.','clu_ldapsearch_checkoptions'])
            testList.append(['.','clu_ldapsearch_checkbehavior'])
            testList.append(['.','clu_ldapmodify_checkoptions'])
            testList.append(['.','clu_ldapmodify_checkbehavior'])
            testList.append(['.','clu_ldapcompare_checkbehavior'])
            testList.append(['.','clu_ldapdelete_checkbehavior'])
            testList.append(['.','clu_base64_checkbehavior'])
            testList.append(['.','clu_status_checkbehavior'])
            testList.append(['.','clu_ldappasswordmodify_checkbehavior'])
            testList.append(['.','clu_ldifsearch_checkbehavior'])
            testList.append(['.','clu_verify-index_checkbehavior'])
            testList.append(['.','clu_rebuild-index_checkbehavior'])
            testList.append(['.','clu_encode-password_checkbehavior'])
            testList.append(['.','clu_make-ldif_checkbehavior'])
            testList.append(['.','clu_list-backends_checkbehavior'])
            testList.append(['.','clu_manage-tasks_checkbehavior'])
            testList.append(['.','clu_dbtest_checkbehavior'])
            testList.append(['.','clu_ldifmodify_checkbehavior'])
            testList.append(['.','clu_ldif-diff_checkbehavior'])
            testList.append(['.','clu_cleanup'])
            suiteList = []
            suiteList.append('clu_ldapsearch_checkoptions')
            suiteList.append('clu_ldapsearch_checkbehavior')
            suiteList.append('clu_ldapmodify_checkoptions')
            suiteList.append('clu_ldapmodify_checkbehavior')
            suiteList.append('clu_ldapcompare_checkbehavior')
            suiteList.append('clu_ldapdelete_checkbehavior')
            suiteList.append('clu_base64_checkbehavior')
            suiteList.append('clu_status_checkbehavior')
            suiteList.append('clu_ldappasswordmodify_checkbehavior')
            suiteList.append('clu_ldifsearch_checkbehavior')
            suiteList.append('clu_verify-index_checkbehavior')
            suiteList.append('clu_rebuild-index_checkbehavior')
            suiteList.append('clu_encode-password_checkbehavior')
            suiteList.append('clu_make-ldif_checkbehavior')
            suiteList.append('clu_list-backends_checkbehavior')
            suiteList.append('clu_manage-tasks_checkbehavior')
            suiteList.append('clu_dbtest_checkbehavior')
            suiteList.append('clu_ldifmodify_checkbehavior')
            suiteList.append('clu_ldif-diff_checkbehavior')
          </script>
          
          <iterate var="_test" in="testList">
            <!-- Data global to this test group  -->

            <!-- Run the test suites -->
            <iterate  var="_suite" in="suiteList">
            <sequence>
              
                <try>
                  <sequence>                  
              <import machine="STAF_LOCAL_HOSTNAME"
                      file="'%s/testcases/clu/%s/%s.xml' % 
                      (TESTS_DIR,_test[0],_test[1])"/>
              
              <call function="'%s' % _test[1]" />
              
                      file="'%s/testcases/%s/%s.xml' % (TESTS_DIR,_group,_suite)"/> 
                    <call function="'%s' % _suite" />
            </sequence>
            
                <catch exception="'STAFException.TestSuite.SetupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Setup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.MainException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Main part of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.CleanupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                </try>
              </sequence>
          </iterate>
          
          <call function="'testGroup_Postamble'"/>
          
        </sequence>
        
      </block>
      <catch exception="'STAXException.TestGroupException'">
        <sequence>
          <message log="1" level="'fatal'">'Execution of Test Group Failed'</message>
        </sequence>
      </catch>        
      <finally>
        <!-- Test Group postamble -->
        <call function="'testGroup_Postamble'"/>
      </finally>
      </try>
      
    </sequence>
    
  </function>
  
</stax>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_base64_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_base64_checkbehavior'">
        
        <try>        

        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,16 @@
          
          <call function="'testSuite_Preamble'"/>
          
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
          
          <!--- Test Case information
            #@TestMarker          base64 check behavior tests
@@ -201,10 +213,28 @@
            
          </testcase>
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>

      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_dbtest_checkbehavior'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,17 @@
          
          <call function="'testSuite_Preamble'"/>
          
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
            
          <!--- Test Case information
            #@TestMarker          dbtest check behavior tests
            #@TestName            dbtest: list root containers
@@ -142,7 +155,7 @@
              <call function="'checktestString'">
                { 
                'returnString'   : returnString ,
                'expectedString' : 'dc=com    dc_com              1208'
                  'expectedString' : 'dc=com    dc_com              1048'
                }
              </call>
              
@@ -278,7 +291,7 @@

              <script>
                msg1 = 'dn2id                      DN2ID'
                msg2 = 'dc_com_dn2id                      1208'
                  msg2 = 'dc_com_dn2id                      1048'
              </script>
              
              <call function="'checktestString'">
@@ -290,7 +303,7 @@
              
              <script>
                msg1 = 'id2entry                   ID2Entry'
                msg2 = 'dc_com_id2entry                   1208'
                  msg2 = 'dc_com_id2entry                   1048'
              </script>
              
              <call function="'checktestString'">
@@ -366,7 +379,7 @@
              <call function="'checktestString'">
                { 
                'returnString'   : returnString ,
                'expectedString' : 'Total Records: 1208'
                  'expectedString' : 'Total Records: 1048'
                }
              </call>

@@ -430,10 +443,28 @@
            
          </testcase>          
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>

      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_encode-password_checkbehavior'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,17 @@
          
          <call function="'testSuite_Preamble'"/>
          
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
            
          <!--- Define default value for clearFile and encodedFile -->
          <script>
            clearFile   = '%s/clu/clear_password.ref' % remote.data
@@ -525,10 +538,28 @@
            
          </testcase>
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>

      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapcompare_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_ldapcompare_checkbehavior'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,17 @@
          
          <call function="'testSuite_Preamble'"/>
                    
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
                      
          <!--- Define default value for dsdn -->
          <script>
            dsdn = 'uid=user.0,ou=ldapcompare,o=clu tests,dc=example,dc=com'
@@ -139,10 +152,28 @@
            
          </testcase> 
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>
        
      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapdelete_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_ldapdelete_checkbehavior'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,17 @@
          
          <call function="'testSuite_Preamble'"/>
          
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>

          <!--- Define default value for basedn, dsfilter and dsdn -->
          <script>
            basedn   = 'ou=ldapdelete,o=clu tests,dc=example,dc=com'
@@ -148,10 +161,28 @@
            
          </testcase> 
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>
        
      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_ldapmodify_checkbehavior'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,17 @@
          
          <call function="'testSuite_Preamble'"/>
          
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
            
          <!--- Define default value for basedn and dsfilename -->
          <script>
            basedn = 'ou=ldapmodify,o=clu tests,dc=example,dc=com'
@@ -147,10 +160,28 @@
            
          </testcase>
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>
        
      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_ldapmodify_checkoptions'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -53,6 +55,17 @@
          
          <call function="'testSuite_Preamble'"/>
          
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>

          <!--- Define default value for dsfilename -->
          <script>
            dsfilename = '%s/clu/ldapmodify_checkoptions.ldif' \
@@ -630,10 +643,28 @@
            
          </testcase>
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>
        
      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldappasswordmodify_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_ldappasswordmodify_checkbehavior'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -53,6 +55,17 @@
          
          <call function="'testSuite_Preamble'"/>
          
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
            
          <!--- Define default value for basedn -->
          <script>
            basedn = 'ou=ldappasswordmodify,o=clu tests,dc=example,dc=com'
@@ -265,10 +278,28 @@
            
          </testcase>
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>
        
      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_ldapsearch_checkbehavior'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,17 @@
          
          <call function="'testSuite_Preamble'"/>
          
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
            
          <!--- Define default value for dsdn -->
          <script>
            basedn      = 'ou=ldapsearch,o=clu tests,dc=example,dc=com'
@@ -174,28 +187,15 @@
                'ldapsearch: import data into this new base dn'
              </message>
              
              <call function="'StopDsWithScript'">
                { 'location' : STAF_REMOTE_HOSTNAME }
              </call>

              <call function="'ImportLdifWithScript'">
                { 
                'location'    : STAF_REMOTE_HOSTNAME ,
                'dsAppend'    : 'True' ,
                'dsLdifFile'  : ldifFile ,
                'dsBackEnd'   : DIRECTORY_INSTANCE_BE
                }
              </call>
         
              <call function="'StartDsWithScript'">
                { 'location' : STAF_REMOTE_HOSTNAME }
              </call>
       
              <!--- Check that DS started -->
              <call function="'isAlive'">
                {
                'noOfLoops'        : 10 ,
                'noOfMilliSeconds' : 2000
                <call function="'ldapModifyWithScript'">
                { 'dsAdd'             : 'True',
                  'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort'    : DIRECTORY_INSTANCE_PORT,
                  'dsInstanceDn'      : DIRECTORY_INSTANCE_DN,
                  'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD,
                  'dsFilename'        : ldifFile,
                  'dsContinueOnError' : 'true',
                  'expectedRC'        : 0
                }
              </call>             

@@ -210,7 +210,7 @@
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'dsCountEntries'   : 'True' ,
                'dsBaseDN'         : 'dc=com' ,
                  'dsBaseDN'         : DIRECTORY_INSTANCE_SFX ,
                'dsFilter'         : 'objectclass=*' ,
                'dsAttributes'     : 'dn' ,
                'expectedRC'       : 'noCheck'
@@ -694,10 +694,28 @@
            
          </testcase>
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>
        
      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml

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

@@ -35,6 +35,8 @@

      <block name="'clu_ldapsearch_checkoptions'">

        <try>  

        <sequence>

          <!--- Test Suite information
@@ -53,6 +55,17 @@

          <call function="'testSuite_Preamble'"/>

            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
  
          <!--- Define default value for basedn and dsfilter -->
          <script>
            basedn   = 'ou=ldapsearch,o=clu tests,dc=example,dc=com'
@@ -1163,10 +1176,28 @@

          </testcase>          
          
          <call function="'testSuite_Postamble'"/>

        </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>
  
      </block>

    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_ldif-diff_checkbehavior'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,17 @@
          
          <call function="'testSuite_Preamble'"/>
          
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
            
          <!--- Define default value for sourceldif -->
          <script>
            sourceldif = '%s/clu/clu_start.ldif' % remote.data
@@ -230,10 +243,28 @@
            
          </testcase>
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>
        
      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_ldifmodify_checkbehavior'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,17 @@
          
          <call function="'testSuite_Preamble'"/>
          
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
            
          <!--- Define default value for sourceldif -->
          <script>
            sourceldif = '%s/clu/clu_start.ldif' % remote.data
@@ -237,10 +250,28 @@
            
          </testcase>           
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>
        
      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Portions Copyright 2008 Sun Microsystems, Inc.
 !      Portions Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_ldifsearch_checkbehavior'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,17 @@
          
          <call function="'testSuite_Preamble'"/>
                    
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
                      
          <!--- Define default value for basedn, dsfilename, filter files -->
          <script>
            basedn = 'ou=ldapsearch,o=clu tests,dc=example,dc=com'
@@ -479,10 +492,28 @@
            
          </testcase>
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
        
      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_list-backends_checkbehavior'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,17 @@
          
          <call function="'testSuite_Preamble'"/>
          
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
            
          <!--- Test Case information
            #@TestMarker          list-backends check behavior tests
            #@TestName            list-backends: without option
@@ -341,10 +354,28 @@
            
          </testcase>
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>
        
      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_make-ldif_checkbehavior'">
        
        <try>
                
        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,17 @@
          
          <call function="'testSuite_Preamble'"/>
          
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
            
          <!--- Define default value for template -->
          <script>
            template = '%s/clu/make-ldif_template.ref' % remote.data
@@ -142,45 +155,18 @@
              </call>

              <message>
                'make-ldif: stop the server'
              </message>    
              
              <call function="'StopDsWithScript'">
                { 'location' : STAF_REMOTE_HOSTNAME }
              </call>

              <message>
                'make-ldif: import the data'
              </message>
              
              <call function="'ImportLdifWithScript'">
                { 
                'dsLdifFile'  : '%s/make-ldif_seed0_2.ldif' % remote.temp ,
                'dsBackEnd'   : DIRECTORY_INSTANCE_BE ,
                'dsAppend'    : 'True'
                }
              </call>

              <call function="'checktestRC'">
                {
                'returncode' : RC ,
                'result'     : STAXResult
                }
              </call>
              
              <message>
                'make-ldif: start the server'
              </message>
              
              <call function="'StartDsWithScript'">
                { 'location' : STAF_REMOTE_HOSTNAME }
              </call>
       
              <!--- Check that DS started -->
              <call function="'isAlive'">
                {
                'noOfLoops'        : 10 ,
                'noOfMilliSeconds' : 2000
                <call function="'ldapModifyWithScript'">
                { 'dsAdd'             : 'True',
                  'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort'    : DIRECTORY_INSTANCE_PORT,
                  'dsInstanceDn'      : DIRECTORY_INSTANCE_DN,
                  'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD,
                  'dsFilename'        : '%s/make-ldif_seed0_2.ldif' % remote.temp,
                  'dsContinueOnError' : 'true',
                  'expectedRC'        : 0
                }
              </call>
              
@@ -336,10 +322,28 @@
            
          </testcase>
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>
        
      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_manage-tasks_checkbehavior'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,17 @@
          
          <call function="'testSuite_Preamble'"/>
          
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
            
          <!--- Define default value for template -->
          <script>
            task = '%s/clu/disconnect.ldif' % remote.data
@@ -417,10 +430,29 @@
            </sequence>
            
          </testcase>          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>
        
      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Portions Copyright 2008 Sun Microsystems, Inc.
 !      Portions Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_rebuild-index_checkbehavior'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,17 @@
          
          <call function="'testSuite_Preamble'"/>
          
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
            
          <!--- Test Case information
            #@TestMarker          rebuild-index check behavior tests
            #@TestName            rebuild-index: check on a single index
@@ -146,7 +159,7 @@
              </script>
              
              <script>
                msg1 = 'Rebuild of index\(es\) uid started with 1047'
                  msg1 = 'Rebuild of index\(es\) uid started with 1048'
                msg2 = 'total records to process' 
              </script>                  
              <call function="'checktestString'">
@@ -159,7 +172,7 @@
              <call function="'checktestString'">
                { 
                'returnString'   : returnString ,
                'expectedString' : 'Rebuild complete. Processed 1047 records'
                  'expectedString' : 'Rebuild complete. Processed 1048 records'
                }
              </call>           
              
@@ -256,7 +269,7 @@
              
              <script>
                msg1 = 'Rebuild of index\(es\) uid, cn started'
                msg2 = 'with 2094 total records to process' 
                  msg2 = 'with 2096 total records to process' 
              </script>                  
              <call function="'checktestString'">
                { 
@@ -268,7 +281,7 @@
              <call function="'checktestString'">
                { 
                'returnString'   : returnString ,
                'expectedString' : 'Rebuild complete. Processed 2094 records'
                  'expectedString' : 'Rebuild complete. Processed 2096 records'
                }
              </call>
              
@@ -439,7 +452,7 @@
              </call>
              
              <script>
                msg1 = 'Rebuild of index\(es\) st started with 1047'
                  msg1 = 'Rebuild of index\(es\) st started with 1048'
                msg2 = 'total records to process' 
              </script>                 
              <call function="'checktestString'">
@@ -450,7 +463,7 @@
              </call>
              
              <script>
                msg = 'Rebuild complete. Processed 1047 records' 
                  msg = 'Rebuild complete. Processed 1048 records' 
              </script>                 
              <call function="'checktestString'">
                { 
@@ -487,7 +500,7 @@
              </call>
              
              <script>
                msg = 'Checked 1047 entries and found 0 error' 
                  msg = 'Checked 1048 entries and found 0 error' 
              </script>                 
              <call function="'checktestString'">
                { 
@@ -524,7 +537,7 @@
              </call>
              
              <script>
                msg1 = 'Rebuild of index\(es\) st started with 1047'
                  msg1 = 'Rebuild of index\(es\) st started with 1048'
                msg2 = 'total records to process' 
              </script>                 
              <call function="'checktestString'">
@@ -535,7 +548,7 @@
              </call>
              
              <script>
                msg = 'Rebuild complete. Processed 1047 records' 
                  msg = 'Rebuild complete. Processed 1048 records' 
              </script>                 
              <call function="'checktestString'">
                { 
@@ -566,10 +579,28 @@
            
          </testcase>          
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>
        
      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_setup.xml

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

@@ -91,45 +91,6 @@

          <!--- Test Case information
            #@TestMarker          setup
            #@TestName            setup: adding initial entries
            #@TestIssue           none
            #@TestPurpose         Load the data needed by the test suite.
            #@TestPreamble        none
            #@TestStep            Load the data needed by the test suite.
            #@TestPostamble       none
            #@TestResult          Success if importLdif returns 0.
          -->
          <testcase name="getTestCaseName('setup: load data')">

            <sequence>
              
              <call function="'testCase_Preamble'"/>
              
              <message>
                'setup: add initial entries'
              </message>

              <call function="'importLdif'">
                { 
                'ldifFile'    : '%s/clu/clu_start.ldif' % remote.data 
                }
              </call>

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

          </testcase>

          <!--- Test Case information
            #@TestMarker          setup
            #@TestName            setup: start DS
            #@TestIssue           none
            #@TestPurpose         Start DS.
@@ -163,6 +124,76 @@
              <!--- Check that DS started -->
              <call function="'isAlive'">
                {
                'noOfLoops'        : 5 ,
                'noOfMilliSeconds' : 2000
                }
              </call>
              
              <call function="'testCase_Postamble'"/>
              
            </sequence>
            
          </testcase>

          <!--- Test Case information
            #@TestMarker          setup
            #@TestName            setup: adding initial entries
            #@TestIssue           none
            #@TestPurpose         Load the data needed by the test suite.
            #@TestPreamble        none
            #@TestStep            Load the data needed by the test suite.
            #@TestPostamble       none
            #@TestResult          Success if importLdif returns 0.
          -->
          <testcase name="getTestCaseName('setup: load data')">

            <sequence>
              
              <call function="'testCase_Preamble'"/>
              
              <message>
                'setup: add initial entries'
              </message>

              <!-- Turn off pre-encoded passwords -->
              <call function="'dsconfigSet'">
                { 
                  'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST,
                  'dsInstanceAdminPort'    : DIRECTORY_INSTANCE_ADMIN_PORT,
                  'dsInstanceDn'           : DIRECTORY_INSTANCE_DN,
                  'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD,
                  'objectName'             : 'password-policy',
                  'propertyType'           : 'policy',
                  'propertyName'           : 'Default Password Policy',
                  'attributeName'          : 'allow-pre-encoded-passwords',
                  'attributeValue'         : 'true',
                  'expectedRC'             : expectedRC
                }
              </call>

              <call function="'ldapModifyWithScript'">
              { 'dsAdd'             : 'True',
                'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST,
                'dsInstancePort'    : DIRECTORY_INSTANCE_PORT,
                'dsInstanceDn'      : DIRECTORY_INSTANCE_DN,
                'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD,
                'dsFilename'        : '%s/clu/clu_start.ldif' \
                                      % remote.data,
                'dsContinueOnError' : 'true',
                'expectedRC'        : 0
              }
              </call>

              <call function="'checktestRC'">
                {
                'returncode' : RC ,
                'result'     : STAXResult
                }
              </call>              
              
              <!--- Check that DS started -->
              <call function="'isAlive'">
                {
                'noOfLoops'        : 10 ,
                'noOfMilliSeconds' : 2000
                }

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_status_checkbehavior'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,17 @@
          
          <call function="'testSuite_Preamble'"/>

            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
  
          <!--- Test Case information
            #@TestMarker          status check behavior tests
            #@TestName            status: authenticated mode
@@ -116,10 +129,28 @@
            
          </testcase> 
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>
        
      </block>
      
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Portions Copyright 2008 Sun Microsystems, Inc.
 !      Portions Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'clu_verify-index_checkbehavior'">
        
        <try>
        
        <sequence>
          
          <!--- Test Suite information
@@ -52,6 +54,17 @@
          
          <call function="'testSuite_Preamble'"/>
          
            <call function="'common_setup'">
              {
                'quickStart'              : False ,
                'loadData'                : True ,
                'ldifFile'                : '%s/clu/clu_start.ldif' % remote.data ,
                'startServer'             : True ,
                'stopServer'              : False ,
                'allowPreEncodePassword'  : True
              }
            </call>
            
          <!--- Test Case information
            #@TestMarker          verify-index check behavior tests
            #@TestName            verify-index: check on a single index
@@ -89,7 +102,7 @@
              <call function="'checktestString'">
                { 
                'returnString'   : returnString ,
                'expectedString' : 'Checked 1047 entries and found 0 error' 
                  'expectedString' : 'Checked 1048 entries and found 0 error' 
                }
              </call>
              
@@ -135,7 +148,7 @@
              <call function="'checktestString'">
                { 
                'returnString'   : returnString ,
                'expectedString' : 'Checked 1047 entries and found 0 error' 
                  'expectedString' : 'Checked 1048 entries and found 0 error' 
                }
              </call>
              
@@ -182,7 +195,7 @@
              <call function="'checktestString'">
                { 
                'returnString'   : returnString ,
                'expectedString' : 'Checked 1047 entries and found 0 error' 
                  'expectedString' : 'Checked 1048 entries and found 0 error' 
                }
              </call>
              
@@ -387,10 +400,28 @@
            
          </testcase>          
          
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global CLU Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>

        </try>

      </block>
      
    </sequence>

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

@@ -59,6 +59,7 @@
              suiteList.append('controls/core_ctrls_assertion')
              suiteList.append('controls/core_ctrls_matched_values')
              suiteList.append('binaryattr/core_binaryattr')

            </script>
    
            <!-- Run the test suites -->

 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml

@@ -23,20 +23,18 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>

  <defaultcall function="main_dsconfig"/>

  <function name="main_dsconfig">
    <function-list-args>
      <function-required-arg name="STAXParentID"/>
    </function-list-args>

    <sequence>

      <try>
      <block name="'dsconfig'">
      
        <sequence>
          <!--- Load the job environment for the test group execution -->
          <import machine="STAF_LOCAL_HOSTNAME"
@@ -44,25 +42,57 @@
          <call function="'loadJobEnvironment'">
               { 'parent' : STAXParentID }
          </call>    

          <script>
            CurrentTestPath['group']='dsconfig'
              _group=CurrentTestPath['group']
            </script>
            <call function="'testGroup_Preamble'" />
            <script>
              suiteList = []
              suiteList.append('dsconfig_list')
              suiteList.append('dsconfig_get')
          </script>
      
            <!-- Run the test suites -->
            <iterate  var="_suite" in="suiteList">
              <sequence>              
                <try>
                  <sequence>                  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/dsconfig/dsconfig_list.xml' % (TESTS_DIR)"/>
          <call function="'dsconfig_list'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/dsconfig/dsconfig_get.xml' % (TESTS_DIR)"/>
          <call function="'dsconfig_get'" />
                      file="'%s/testcases/%s/%s.xml' % (TESTS_DIR,_group,_suite)"/> 
                    <call function="'%s' % _suite" />
                  </sequence>
                <catch exception="'STAFException.TestSuite.SetupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Setup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.MainException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Main part of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.CleanupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                </try>
              </sequence>
            </iterate>
  
        </sequence>
     
      </block>
     
        <catch exception="'STAXException.TestGroupException'">
          <sequence>
            <message log="1" level="'fatal'">'Execution of Test Group Failed'</message>
    </sequence>

        </catch>        
        <finally>
          <!-- Test Group postamble -->
          <call function="'testGroup_Postamble'"/>
        </finally>
      </try>
    </sequence>
  </function>

</stax>

 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml

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

@@ -35,6 +35,7 @@

      <block name="'dsconfig-get'">
      
        <try>      
        <sequence>
  
        <script>
@@ -45,10 +46,13 @@
      
        <call function="'testSuite_Preamble'"/>
          
        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/dsconfig/dsconfig_setup.xml' % (TESTS_DIR)"/>
        <call function="'dsconfig_setup'" />

          <call function="'common_setup'">
            {
              'quickStart'  : False,
              'startServer' : True,
              'stopServer'  : False,
            }
          </call>
                            
        <script>
            componentList = []
@@ -84,9 +88,9 @@
                <if expr="componentList[componentNumber][0] == 'get-local-db-index-prop'">
                  <call function="'dsconfig'">
                  {   
                    'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                    'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD , 
                      'dsInstanceHost' : server.host ,
                      'dsInstanceDn'   : server.dn ,
                      'dsInstancePswd' : server.password , 
                    'subcommand'     :  '%s' % componentList[componentNumber][0] ,
                    'objectType'     :  '%s' % componentList[componentNumber][1] ,
                    'objectName'     :  '%s' % componentList[componentNumber][2] ,
@@ -97,9 +101,9 @@
                <else>
                  <call function="'dsconfig'">
                  {                       
                    'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                    'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD , 
                      'dsInstanceHost' : server.host ,
                      'dsInstanceDn'   : server.dn ,
                      'dsInstancePswd' : server.password , 
                    'subcommand'     :  '%s' % componentList[componentNumber][0] ,
                    'objectType'     :  '%s' % componentList[componentNumber][1] ,
                    'objectName'     :  '%s' % componentList[componentNumber][2] ,
@@ -162,9 +166,9 @@
                
                <call function="'dsconfig'">
                  {   
                    'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                    'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
                      'dsInstanceHost' : server.host ,
                      'dsInstanceDn'   : server.dn ,
                      'dsInstancePswd' : server.password ,
                    'subcommand'     :  '%s' % componentList2[componentNumber][0] ,
                    'expectedRC'     : 0 
                  }
@@ -194,14 +198,28 @@
          </sequence>
        </iterate>
       
        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/dsconfig/dsconfig_cleanup.xml' % (TESTS_DIR)"/>
        <call function="'dsconfig_cleanup'" />

                            
        <call function="'testSuite_Postamble'"/>
        
        </sequence>
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Dsconfig Cleanup.'</message>
              <try>
                <call function="'common_cleanup'">
                  { 'deleteSuffix'  : False }
                </call>
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
      </block>
    </sequence>
  </function>

 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list.xml

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

@@ -35,6 +35,8 @@

      <block name="'dsconfig-list'">
      
        <try>
              
        <sequence>
  
        <script>
@@ -45,10 +47,13 @@
      
        <call function="'testSuite_Preamble'"/>
          
        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/dsconfig/dsconfig_setup.xml' % (TESTS_DIR)"/>
        <call function="'dsconfig_setup'" />

          <call function="'common_setup'">
            {
              'quickStart'  : False,
              'startServer' : True,
              'stopServer'  : False,
            }
          </call>
                            
        <script>
            componentList = []
@@ -77,21 +82,21 @@
                <if expr="componentList[componentNumber][0] == 'list-local-db-indexes'">
                  <call function="'dsconfig'">
                  {
                    'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                    'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD , 
                      'dsInstanceHost' : server.host ,
                      'dsInstanceDn'   : server.dn ,
                      'dsInstancePswd' : server.password , 
                    'subcommand'     :  '%s' % componentList[componentNumber][0] ,
                    'objectType'     :  'backend-name' ,
                    'objectName'     :  DIRECTORY_INSTANCE_BE ,
                      'objectName'     :  server.backend ,
                    'expectedRC'     : 0 
                  }
                  </call>
                <else>
                  <call function="'dsconfig'">
                  {
                    'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                    'dsInstanceDn'   : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD , 
                      'dsInstanceHost' : server.host ,
                      'dsInstanceDn'   : server.dn ,
                      'dsInstancePswd' : server.password , 
                    'subcommand'     :  '%s' % componentList[componentNumber][0] ,
                    'expectedRC'     : 0 
                  }
@@ -123,14 +128,28 @@
          </sequence>
        </iterate>
       
        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/dsconfig/dsconfig_cleanup.xml' % (TESTS_DIR)"/>
        <call function="'dsconfig_cleanup'" />

                            
        <call function="'testSuite_Postamble'"/>
        
        </sequence>
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Dsconfig Cleanup.'</message>
              <try>
                <call function="'common_cleanup'">
                  { 'deleteSuffix'  : False }
                </call>
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
      </block>
    </sequence>
  </function>

 opends/tests/staf-tests/functional-tests/testcases/groups/group_cleanup.xml

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

@@ -46,11 +46,9 @@
        <sequence>

          <if expr="stopDS == True">      
          <block name="'Block DS Process Stop'">        
          <!--- Stop DS -->
        <sequence>
              <message>
                 '------ Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
                 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
              </message>

              <call function="'StopDsWithScript'">
@@ -61,38 +59,16 @@
                  'dsBindPwd'   : DIRECTORY_INSTANCE_PSWD }
              </call>

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

        </sequence>        
          <!--- End Block DS Process Stop -->
          </block>

      </if>
      
                              

      <block name="'Block Remove DS Topology'">
      <!-- Remove  the topology created for the test suite -->
      <sequence>
        
              <message>
                 '------ Remove DS topology created for the Test Suite'
             'Remove DS topology created for the Test Suite'
              </message>          

        <call function="'removeTopology'"/>
        
        <call function="'checkRC'">
                  { 'returncode' : RC ,
                    'result'     : STAXResult }
              </call>
      
      </sequence>        
      <!-- End Block Remove DS Topology-->  
      </block>                                  
              
      
        </sequence>        
      </block>
            

 opends/tests/staf-tests/functional-tests/testcases/groups/group_dynamic.xml

@@ -23,18 +23,20 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->

<stax>

  <defaultcall function="main_dynamicgroup"/>
  <defaultcall function="dynamic"/>

  <function name="main_dynamicgroup">
  <function name="dynamic">

    <sequence>

      <block name="'dynamicgroup'">
      <block name="'dynamic'">

        <try>      
      
        <sequence>
          
@@ -84,8 +86,17 @@
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_lib.xml' % (TESTS_DIR)"/>
                    
          <call function="'group_setup'"> { 'startDS' : True } </call>
            <call function="'common_setup'">
              {
                'quickStart'    : False ,
                'startServer'   : True  ,
                'stopServer'    : False ,
                'loadData'      : True  ,
                'ldifFile'      : '%s/groups/groups.ldif' % remote.data
              }
            </call>

            <call function="'group_setup'"/>
          
          <!--- Test Case information
          #@TestMarker          Dynamic Group Tests
@@ -113,8 +124,8 @@
                '++++ Application add group entry %s' % newDynamicGroupDn
              </message>
              <call function="'addAnEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'DNToAdd'          : newDynamicGroupDn,
@@ -126,8 +137,8 @@
                '++++ Application do a search to check the entry has been created'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : newDynamicGroupDn ,
@@ -163,8 +174,8 @@
                '++++ Delete the group entry %s' % newDynamicGroupDn
              </message>
              <call function="'DeleteEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : newDynamicGroupDn,
@@ -174,8 +185,8 @@
                '++++ Check the group entry %s no more exist' % newDynamicGroup
              </message>              
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : newDynamicGroupDn ,
@@ -210,8 +221,8 @@
                '++++ %s search itself (should PASS as not a member of dynamic group)' % user1
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : user1Dn ,
                'dsInstancePswd'   : user1Pswd ,
                'dsBaseDN'         : user1Dn ,
@@ -247,8 +258,8 @@
                '++++ %s search itself (should be refused as dynamic group does not have the permission)' % user2
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : user2Dn ,
                'dsInstancePswd'   : user2Pswd ,
                'dsBaseDN'         : user2Dn ,
@@ -305,8 +316,8 @@
                listAttr.append('userPassword:%s' % user2AddPswd)
              </script>
              <call function="'addAnEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'DNToAdd'          : user2AddDn,
@@ -318,8 +329,8 @@
                '++++ %s search itself (should be refused as dynamic group does not have permission)' % user2Add
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : user2AddDn ,
                'dsInstancePswd'   : user2AddPswd ,
                'dsBaseDN'         : user2AddDn ,
@@ -366,8 +377,8 @@
              </message>

              <call function="'modifyDn'">
                { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost'  : server.host ,
                  'dsInstancePort'    : server.port ,
                'dsInstanceDn'      : applicationDn ,
                'dsInstancePswd'    : applicationPswd ,
                'DNToModify'        : user2AddDn ,
@@ -381,8 +392,8 @@
                '++++ %s search itself (should be refused as dynamic group does not have permission)' % user2AddRenamed
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : user2AddRenamedDn ,
                'dsInstancePswd'   : user2AddPswd ,
                'dsBaseDN'         : user2AddRenamedDn ,
@@ -429,8 +440,8 @@
                '++++ Application delete user %s' % user2Add
              </message>
              <call function="'DeleteEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : user2AddDn
@@ -441,8 +452,8 @@
                '++++ Check the entry %s no more exist' % user2Add
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : user2AddDn ,
@@ -455,8 +466,8 @@
                '++++ %s do a search (should fail)' % user2Add
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : user2AddDn ,
                'dsInstancePswd'   : user2AddPswd ,
                'dsBaseDN'         : user2AddDn ,
@@ -467,19 +478,28 @@
            </sequence>
          </testcase>          
          
          
          
          
          
          <!-- *********************************************** -->
          <import machine="STAF_LOCAL_HOSTNAME"
              file="'%s/testcases/groups/group_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'group_cleanup'"> { 'stopDS' : True } </call>
          
          <call function="'testSuite_Postamble'"/>
  
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Groups Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
       
      </block>
                  
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/groups/group_setup.xml

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

<stax>
@@ -44,75 +44,49 @@
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </function-arg-def>            
      <function-arg-def name="globalAcis" type="optional" default="True">
        <function-arg-description>
          Specifies whether the test should use global acis.
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </function-arg-def>
    </function-map-args>
      
      
    <sequence>
  
      <block name="'setup'">
        <sequence>

          <block name="'Block Create DS Topology'">
          <!-- Create the topology necessary to the test group/suite -->
            <sequence>
              <message>
                 '------ Create DS topology as described in config.py'
              </message>
              <call function="'createTopology'">
                  { 'initialiseInstance' : False }
              </call>
              <call function="'checkRC'">
                  { 'returncode' : RC ,
                    'result'     : STAXResult }
              </call>
          <if expr="globalAcis == True">
              
            </sequence>      
          <!--- End Block Create DS Topology -->  
          </block>                    

          <if expr="loadBackend == True">
            <block name="'Block DS Load Data'">
            <!-- Load the data needed by the test suite -->
              <sequence>    
                <message>
                  '------ Load LDIF : groups.ldif'
                </message>
                <call function="'importLdif'">
                  { 'ldifFile'    : '%s/groups/groups.ldif' % remote.data }
                </call>
                <call function="'checkRC'">
                  { 'returncode' : RC ,
                    'result'     : STAXResult }
              <message>'Adding global ACIs.'</message>
              <call function="'ldapModifyWithScript'">
                {
                'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'dsFilename'       : '%s/groups/global_acis.ldif' % remote.data
                }
                </call>  
              </sequence>      
            <!--- End Block DS Load Data -->                       
            </block> 
          <else>
            <sequence>
              <message>'Adding entry ACIs.'</message>
              <call function="'ldapModifyWithScript'">
                {
                'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'dsFilename'       : '%s/groups/entry_acis.ldif' % remote.data
                }
              </call>
            </sequence>
          </else>
          </if>
          
          <if expr="startDS == True">
            <block name="'Block DS Process Active'">      
             <!--- Start DS -->
              <sequence>
                <message>
                   '------ Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
                </message>
                <!--- Start DS -->
                <call function="'StartDsWithScript'">
                    { 'location'  : STAF_REMOTE_HOSTNAME }
                </call>
                <call function="'checkRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
                <!--- Check that DS started -->
                <call function="'isAlive'">
                    { 'noOfLoops'        : 10 ,
                      'noOfMilliSeconds' : 2000 }
                </call>      
              </sequence>
            <!--- End Block DS Process Active -->
            </block>              
          </if>
        </sequence>
      </block>
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/groups/group_static_member.xml

@@ -23,19 +23,19 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->

<stax>

  <defaultcall function="main_staticgroup_member"/>
  <defaultcall function="static_member"/>

  <function name="main_staticgroup_member">
  <function name="static_member">

    <sequence>

      <block name="'staticgroup_member'">
      
      <block name="'static_member'">
        <try>      
        <sequence>
          
          <script>
@@ -81,8 +81,17 @@
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_lib.xml' % (TESTS_DIR)"/>
          
          <call function="'group_setup'"> { 'startDS' : True } </call>
            <call function="'common_setup'">
              {
                'quickStart'    : False ,
                'startServer'   : True  ,
                'stopServer'    : False ,
                'loadData'      : True  ,
                'ldifFile'      : '%s/groups/groups.ldif' % remote.data
              }
            </call>

            <call function="'group_setup'"/>  
          
          <!--- Test Case information
          #@TestMarker          Static Group Tests
@@ -110,8 +119,8 @@
                '++++ Application add group entry %s' % newStaticGroup
              </message>
              <call function="'addAnEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'DNToAdd'          : newStaticGroupDn,
@@ -122,8 +131,8 @@
                '++++ Application do a search to check the entry has been created'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : newStaticGroupDn ,
@@ -168,8 +177,8 @@
                '++++ Delete the group entry %s' % newStaticGroup
              </message>
              <call function="'DeleteEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : newStaticGroupDn,
@@ -180,8 +189,8 @@
                '++++ Check the group entry %s no more exist' % newStaticGroup
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : newStaticGroupDn ,
@@ -217,8 +226,8 @@
                '++++ user %s, not member of the group, do a search, should pass' % user11
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : user11Dn ,
                'dsInstancePswd'   : user11Pswd ,
                'dsBaseDN'         : user11Dn ,
@@ -255,8 +264,8 @@
                '++++ user %s, member of the group do a search, should be denied has group have no permission' % user1
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : user1Dn ,
                'dsInstancePswd'   : user1Pswd ,
                'dsBaseDN'         : user1Dn ,
@@ -304,8 +313,8 @@
                '++++ Application do a search on static group, should work'
              </message>                            
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : staticGroup2Dn ,
@@ -349,8 +358,8 @@
                '++++ Application add a new user %s / %s into the static group' % (user11Dn,user11Pswd)
              </message>
              <call function="'modifyAnAttribute'">
                { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost'  : server.host ,
                  'dsInstancePort'    : server.port ,
                'dsInstanceDn'      : applicationDn ,
                'dsInstancePswd'    : applicationPswd ,
                'DNToModify'        : staticGroup2Dn ,
@@ -364,8 +373,8 @@
                '++++ Application search users through the static group'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : staticGroup2Dn ,
@@ -391,8 +400,8 @@
                '++++ Check added user %s has no more privileges' % user11
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : user11Dn ,
                'dsInstancePswd'   : user11Pswd ,
                'dsBaseDN'         : user11Dn ,
@@ -441,8 +450,8 @@
                '++++ Application delete the user entry that belong to the static group'
              </message>
              <call function="'DeleteEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : user11Dn,
@@ -453,8 +462,8 @@
                '++++ Application search users through the static group'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : staticGroup2Dn ,
@@ -501,8 +510,8 @@
                listAttr.append('userPassword:%s' % user11Pswd)
              </script>
              <call function="'addAnEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'DNToAdd'          : user11Dn,
@@ -541,8 +550,8 @@
                '++++ Application delete attribute member:%s from the static group' % user11
              </message>
              <call function="'modifyAnAttribute'">
                { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost'  : server.host ,
                  'dsInstancePort'    : server.port ,
                'dsInstanceDn'      : applicationDn ,
                'dsInstancePswd'    : applicationPswd ,
                'DNToModify'        : staticGroup2Dn ,
@@ -555,8 +564,8 @@
                '++++ Application search users through the static group'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : staticGroup2Dn ,
@@ -581,8 +590,8 @@
                '++++ User %s should now be able to do search' % user11
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : user11Dn ,
                'dsInstancePswd'   : user11Pswd ,
                'dsBaseDN'         : user11Dn ,
@@ -643,8 +652,8 @@
                listAttr.append('member:%s' % user11Dn)
              </script>
              <call function="'addAnEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'DNToAdd'          : newStaticGroupDn,
@@ -662,8 +671,8 @@
                listAttr.append('member:%s' % user11Dn)
              </script>
              <call function="'modifyAnAttribute'">
                { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost'  : server.host ,
                  'dsInstancePort'    : server.port ,
                'dsInstanceDn'      : applicationDn ,
                'dsInstancePswd'    : applicationPswd ,
                'DNToModify'        : newStaticGroupDn ,
@@ -676,8 +685,8 @@
                '++++ Do a search on the group, should return no user entries'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : newStaticGroupDn ,
@@ -713,8 +722,8 @@
                '++++ Delete the group entry created'
              </message>
              <call function="'DeleteEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : newStaticGroupDn
@@ -771,8 +780,8 @@
                '++++ Application do a search on static nesting group'
              </message>                            
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : staticGroup3Dn ,
@@ -804,16 +813,26 @@
            </sequence>
          </testcase>
          
          
          <!-- *********************************************** -->
          <import machine="STAF_LOCAL_HOSTNAME"
              file="'%s/testcases/groups/group_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'group_cleanup'"> { 'stopDS' : True } </call>
          
          <call function="'testSuite_Postamble'"/>
  
        </sequence>
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Groups Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
        
        </try>        
      </block>
                  
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/groups/group_static_uniquemember.xml

@@ -23,14 +23,15 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->

<stax>
  <defaultcall function="main_staticgroup_uniquemember"/>
  <function name="main_staticgroup_uniquemember">
  <defaultcall function="static_uniquemember"/>
  <function name="static_uniquemember">
    <sequence>
      <block name="'staticgroup_uniquemember'">
      <block name="'static_uniquemember'">
        <try>
        <sequence>
          <script>
            applicationDn='uid=my_application,dc=groups,dc=com'
@@ -73,8 +74,17 @@
          <import machine="STAF_LOCAL_HOSTNAME"
                  file="'%s/testcases/groups/group_lib.xml' % (TESTS_DIR)"/>
          
          <call function="'group_setup'"> { 'startDS' : True } </call>
            <call function="'common_setup'">
              {
                'quickStart'    : False ,
                'startServer'   : True  ,
                'stopServer'    : False ,
                'loadData'      : True  ,
                'ldifFile'      : '%s/groups/groups.ldif' % remote.data
              }
            </call>
          
            <call function="'group_setup'"/>          
          
          <!--- Test Case information
          #@TestMarker          Static Group Tests
@@ -102,8 +112,8 @@
                '++++ Application add group entry %s' % newStaticGroup
              </message>
              <call function="'addAnEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost' : server.host,
                    'dsInstancePort' : server.port,
                  'dsInstanceDn'   : applicationDn,
                  'dsInstancePswd' : applicationPswd,
                  'DNToAdd'        : newStaticGroupDn,
@@ -114,8 +124,8 @@
                '++++ Application do a search to check the entry has been created'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost' : server.host,
                    'dsInstancePort' : server.port,
                  'dsInstanceDn'   : applicationDn,
                  'dsInstancePswd' : applicationPswd,
                  'dsBaseDN'       : newStaticGroupDn,
@@ -159,8 +169,8 @@
                '++++ Delete the group entry %s' % newStaticGroup
              </message>
              <call function="'DeleteEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                    'dsInstancePort' : server.port ,
                  'dsInstanceDn'   : applicationDn ,
                  'dsInstancePswd' : applicationPswd ,
                  'dsBaseDN'       : newStaticGroupDn,
@@ -170,8 +180,8 @@
                '++++ Check the group entry %s no more exist' % newStaticGroup
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost' : server.host,
                    'dsInstancePort' : server.port,
                  'dsInstanceDn'   : applicationDn,
                  'dsInstancePswd' : applicationPswd,
                  'dsBaseDN'       : newStaticGroupDn,
@@ -207,8 +217,8 @@
                '++++ user %s, not member of the group, do a search, should pass' % user11
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost' : server.host,
                    'dsInstancePort' : server.port,
                  'dsInstanceDn'   : user11Dn,
                  'dsInstancePswd' : user11Pswd,
                  'dsBaseDN'       : user11Dn,
@@ -244,8 +254,8 @@
                '++++ user %s, member of the group do a search, should be denied has group have no permission' % user1
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost' : server.host,
                    'dsInstancePort' : server.port,
                  'dsInstanceDn'   : user1Dn,
                  'dsInstancePswd' : user1Pswd,
                  'dsBaseDN'       : user1Dn,
@@ -290,8 +300,8 @@
                '++++ Application do a search on static group, should work'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost' : server.host,
                    'dsInstancePort' : server.port,
                  'dsInstanceDn'   : applicationDn,
                  'dsInstancePswd' : applicationPswd,
                  'dsBaseDN'       : staticGroup1Dn,
@@ -334,8 +344,8 @@
                '++++ Application add a new user %s / %s into the static group' % (user11Dn,user11Pswd)
              </message>
              <call function="'modifyAnAttribute'">
                { 'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort'    : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost'    : server.host,
                    'dsInstancePort'    : server.port,
                  'dsInstanceDn'      : applicationDn,
                  'dsInstancePswd'    : applicationPswd,
                  'DNToModify'        : staticGroup1Dn,
@@ -349,8 +359,8 @@
                '++++ Application search users through the static group'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                    'dsInstancePort' : server.port ,
                  'dsInstanceDn'   : applicationDn ,
                  'dsInstancePswd' : applicationPswd ,
                  'dsBaseDN'       : staticGroup1Dn ,
@@ -377,8 +387,8 @@
                '++++ Check added user %s has no more privileges' % user11
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost' : server.host,
                    'dsInstancePort' : server.port,
                  'dsInstanceDn'   : user11Dn,
                  'dsInstancePswd' : user11Pswd,
                  'dsBaseDN'       : user11Dn,
@@ -425,8 +435,8 @@
                '++++ Application delete the user entry that belong to the static group'
              </message>
              <call function="'DeleteEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                    'dsInstancePort' : server.port ,
                  'dsInstanceDn'   : applicationDn ,
                  'dsInstancePswd' : applicationPswd ,
                  'dsBaseDN'       : user11Dn,
@@ -437,8 +447,8 @@
                '++++ Application search users through the static group'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost' : server.host,
                    'dsInstancePort' : server.port,
                  'dsInstanceDn'   : applicationDn,
                  'dsInstancePswd' : applicationPswd,
                  'dsBaseDN'       : staticGroup1Dn,
@@ -487,8 +497,8 @@
                listAttr.append('userPassword:%s' % user11Pswd)
              </script>
              <call function="'addAnEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost' : server.host,
                    'dsInstancePort' : server.port,
                  'dsInstanceDn'   : applicationDn,
                  'dsInstancePswd' : applicationPswd,
                  'DNToAdd'        : user11Dn,
@@ -523,8 +533,8 @@
                '++++ Application delete attribute uniquemember:%s from the static group' % user11
              </message>
              <call function="'modifyAnAttribute'">
                { 'dsInstanceHost'    : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort'    : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost'    : server.host,
                    'dsInstancePort'    : server.port,
                  'dsInstanceDn'      : applicationDn,
                  'dsInstancePswd'    : applicationPswd,
                  'DNToModify'        : staticGroup1Dn,
@@ -538,8 +548,8 @@
                '++++ Application search users through the static group'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost' : server.host,
                    'dsInstancePort' : server.port,
                  'dsInstanceDn'   : applicationDn,
                  'dsInstancePswd' : applicationPswd,
                  'dsBaseDN'       : staticGroup1Dn,
@@ -565,8 +575,8 @@
                '++++ User %s should now be able to do search' % user11
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost' : server.host,
                    'dsInstancePort' : server.port,
                  'dsInstanceDn'   : user11Dn,
                  'dsInstancePswd' : user11Pswd,
                  'dsBaseDN'       : user11Dn,
@@ -623,8 +633,8 @@
                listAttr.append('uniquemember:%s' % user11Dn)
              </script>
              <call function="'addAnEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost' : server.host,
                    'dsInstancePort' : server.port,
                  'dsInstanceDn'   : applicationDn,
                  'dsInstancePswd' : applicationPswd,
                  'DNToAdd'        : newStaticGroupDn,
@@ -642,8 +652,8 @@
                listAttr.append('uniquemember:%s' % user11Dn)
              </script>
              <call function="'modifyAnAttribute'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost' : server.host,
                    'dsInstancePort' : server.port,
                  'dsInstanceDn'   : applicationDn,
                  'dsInstancePswd' : applicationPswd,
                  'DNToModify'     : newStaticGroupDn,
@@ -656,8 +666,8 @@
                '++++ Do a search on the group, should return no user entries'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost' : server.host,
                    'dsInstancePort'   : server.port,
                  'dsInstanceDn'     : applicationDn,
                  'dsInstancePswd'   : applicationPswd,
                  'dsBaseDN'         : newStaticGroupDn,
@@ -695,8 +705,8 @@
                '++++ Delete the group entry created'
              </message>
              <call function="'DeleteEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  { 'dsInstanceHost' : server.host,
                    'dsInstancePort' : server.port,
                  'dsInstanceDn'   : applicationDn,
                  'dsInstancePswd' : applicationPswd,
                  'dsBaseDN'       : newStaticGroupDn
@@ -728,12 +738,26 @@
          </testcase>
          -->
          
          <!-- *********************************************** -->
          <import machine="STAF_LOCAL_HOSTNAME"
                  file="'%s/testcases/groups/group_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'group_cleanup'"> { 'stopDS' : True } </call>
          <call function="'testSuite_Postamble'"/>
        </sequence>
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Groups Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
      </block>
    </sequence>
  </function>

 opends/tests/staf-tests/functional-tests/testcases/groups/group_virtual_static.xml

@@ -23,19 +23,19 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->

<stax>

  <defaultcall function="main_virtualStaticGroup"/>
  <defaultcall function="virtual_static"/>

  <function name="main_virtualStaticGroup">
  <function name="virtual_static">

    <sequence>

      <block name="'virtualStaticGroup'">
      
      <block name="'virtual_static'">
        <try>      
        <sequence>
          
          <script>
@@ -76,8 +76,17 @@
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_lib.xml' % (TESTS_DIR)"/>
                    
          <call function="'group_setup'"> { 'startDS' : True } </call>
            <call function="'common_setup'">
              {
                'quickStart'    : False ,
                'startServer'   : True  ,
                'stopServer'    : False ,
                'loadData'      : True  ,
                'ldifFile'      : '%s/groups/groups.ldif' % remote.data
              }
            </call>

            <call function="'group_setup'"/>  
          
          <!--- Test Case information
          #@TestMarker          Virtual Static Group Tests
@@ -94,10 +103,10 @@
              <call function="'testCase_Preamble'"/>

              <call function="'modifyAnAttribute'">
                { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'      : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'    : DIRECTORY_INSTANCE_PSWD ,
                  { 'dsInstanceHost'  : server.host ,
                  'dsInstancePort'    : server.port ,
                  'dsInstanceDn'      : server.dn ,
                  'dsInstancePswd'    : server.password ,
                'DNToModify'        : 'cn=Virtual Static uniqueMember,cn=Virtual Attributes,cn=config' ,
                'changetype'        : 'replace' ,
                'attributeName'     : 'ds-cfg-allow-retrieving-membership' ,
@@ -138,8 +147,8 @@
                '++++ Application add group entry %s' % newVirtualStaticGroupDn
              </message>
              <call function="'addAnEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'DNToAdd'          : newVirtualStaticGroupDn,
@@ -151,8 +160,8 @@
                '++++ Application do a search to check the entry has been created'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : newVirtualStaticGroupDn ,
@@ -188,8 +197,8 @@
                '++++ Delete the group entry %s' % newVirtualStaticGroupDn
              </message>
              <call function="'DeleteEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : newVirtualStaticGroupDn,
@@ -199,8 +208,8 @@
                '++++ Check the group entry %s no more exist' % newVirtualStaticGroup
              </message>              
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : newVirtualStaticGroupDn ,
@@ -237,8 +246,8 @@
                '++++ Search members of group %s' % virtualStaticGroupDn
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : virtualStaticGroupDn ,
@@ -311,8 +320,8 @@
                listAttr.append('userPassword:%s' % user2AddPswd)
              </script>
              <call function="'addAnEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'DNToAdd'          : user2AddDn,
@@ -324,8 +333,8 @@
                '++++ Application search the new user %s in the virtual static group entry (should be a member)' % user2Add
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : virtualStaticGroupDn ,
@@ -372,8 +381,8 @@
              </message>

              <call function="'modifyDn'">
                { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost'  : server.host ,
                  'dsInstancePort'    : server.port ,
                'dsInstanceDn'      : applicationDn ,
                'dsInstancePswd'    : applicationPswd ,
                'DNToModify'        : user2AddDn ,
@@ -387,8 +396,8 @@
                '++++ Application search the new user %s in the virtual static group entry (should be a member)' % user2Add
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : virtualStaticGroupDn ,
@@ -435,8 +444,8 @@
                '++++ Application delete user %s' % user2Add
              </message>
              <call function="'DeleteEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : user2AddDn
@@ -447,8 +456,8 @@
                '++++ Application search the deleted user %s in the virtual static group entry (should not be in)' % user2Add
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : virtualStaticGroupDn ,
@@ -491,8 +500,8 @@
                '++++ Application set a value %s to ds-target-group-dn attribute for group %s' % (dynamicGroup2Dn,virtualStaticGroupDn)
              </message>
              <call function="'modifyAnAttribute'">
                { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost'  : server.host ,
                  'dsInstancePort'    : server.port ,
                'dsInstanceDn'      : applicationDn ,
                'dsInstancePswd'    : applicationPswd ,
                'DNToModify'        : virtualStaticGroupDn ,
@@ -505,8 +514,8 @@
                '++++ Application search users becoming to the updated virtual static group entry'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : virtualStaticGroupDn ,
@@ -523,8 +532,8 @@
                '++++ Application reset ds-target-group-dn attribute to default value %s' % (dynamicGroupDn)
              </message>
              <call function="'modifyAnAttribute'">
                { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost'  : server.host ,
                  'dsInstancePort'    : server.port ,
                'dsInstanceDn'      : applicationDn ,
                'dsInstancePswd'    : applicationPswd ,
                'DNToModify'        : virtualStaticGroupDn ,
@@ -557,8 +566,8 @@
                '++++ Application set a value %s to ds-target-group-dn attribute for group %s' % (staticGroupDn,virtualStaticGroupDn)
              </message>
              <call function="'modifyAnAttribute'">
                { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost'  : server.host ,
                  'dsInstancePort'    : server.port ,
                'dsInstanceDn'      : applicationDn ,
                'dsInstancePswd'    : applicationPswd ,
                'DNToModify'        : virtualStaticGroupDn ,
@@ -571,8 +580,8 @@
                '++++ Application search users becoming to the updated virtual static group entry'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : virtualStaticGroupDn ,
@@ -589,8 +598,8 @@
                '++++ Application reset ds-target-group-dn attribute to default value %s' % (dynamicGroupDn)
              </message>
              <call function="'modifyAnAttribute'">
                { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost'  : server.host ,
                  'dsInstancePort'    : server.port ,
                'dsInstanceDn'      : applicationDn ,
                'dsInstancePswd'    : applicationPswd ,
                'DNToModify'        : virtualStaticGroupDn ,
@@ -624,8 +633,8 @@
                '++++ Application set a value %s to ds-target-group-dn attribute for group %s' % (staticGroupDn,virtualStaticGroupDn)
              </message>
              <call function="'modifyAnAttribute'">
                { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost'  : server.host ,
                  'dsInstancePort'    : server.port ,
                'dsInstanceDn'      : applicationDn ,
                'dsInstancePswd'    : applicationPswd ,
                'DNToModify'        : virtualStaticGroupDn ,
@@ -638,8 +647,8 @@
                '++++ Application search users becoming to the updated virtual static group entry'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : virtualStaticGroupDn ,
@@ -656,8 +665,8 @@
                '++++ Application reset ds-target-group-dn attribute to default value %s' % (dynamicGroupDn)
              </message>
              <call function="'modifyAnAttribute'">
                { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost'  : server.host ,
                  'dsInstancePort'    : server.port ,
                'dsInstanceDn'      : applicationDn ,
                'dsInstancePswd'    : applicationPswd ,
                'DNToModify'        : virtualStaticGroupDn ,
@@ -687,8 +696,8 @@
                '++++ Application remove ds-target-group-dn attribute'
              </message>
              <call function="'modifyAnAttribute'">
                { 'dsInstanceHost'  : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'    : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost'  : server.host ,
                  'dsInstancePort'    : server.port ,
                'dsInstanceDn'      : applicationDn ,
                'dsInstancePswd'    : applicationPswd ,
                'DNToModify'        : virtualStaticGroupDn ,
@@ -702,8 +711,8 @@
                '++++ Group should not be modified'
              </message>
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  { 'dsInstanceHost' : server.host ,
                  'dsInstancePort'   : server.port ,
                'dsInstanceDn'     : applicationDn ,
                'dsInstancePswd'   : applicationPswd ,
                'dsBaseDN'         : virtualStaticGroupDn ,
@@ -720,20 +729,26 @@
            </sequence>
          </testcase>          
                    
                    
          
          
                             
          
          <!-- *********************************************** -->
          <import machine="STAF_LOCAL_HOSTNAME"
              file="'%s/testcases/groups/group_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'group_cleanup'"> { 'stopDS' : True } </call>
          
          <call function="'testSuite_Postamble'"/>
  
        </sequence>
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Groups Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
        
        </try>        
      </block>
                  
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/groups/groups.xml

@@ -23,61 +23,78 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>

  <defaultcall function="main_groups"/>

  <function name="main_groups">
    <function-list-args>
      <function-required-arg name="STAXParentID"/>
    </function-list-args>

    <sequence>

      <try>
      <block name="'groups'">
      
        <sequence>

          <!--- Load the job environment for the test group execution -->
          <import machine="STAF_LOCAL_HOSTNAME"
                  file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
          <call function="'loadJobEnvironment'">
               { 'parent' : STAXParentID }
          </call>
              
          <script>
            CurrentTestPath['group']='groups'
              _group=CurrentTestPath['group']
            </script>
            <call function="'testGroup_Preamble'" />
            <script>
              suiteList = []
              suiteList.append('static_uniquemember')
              suiteList.append('static_member')
              suiteList.append('dynamic')
              suiteList.append('virtual_static')
          </script>
      
          <call function="'testGroup_Preamble'"/>

            <!-- Run the test suites -->
            <iterate  var="_suite" in="suiteList">
              <sequence>              
                <try>
                  <sequence>                  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_static_uniquemember.xml' % (TESTS_DIR)"/>
          <call function="'main_staticgroup_uniquemember'" />

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_static_member.xml' % (TESTS_DIR)"/>
          <call function="'main_staticgroup_member'" />
          
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_dynamic.xml' % (TESTS_DIR)"/>
          <call function="'main_dynamicgroup'" />

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/groups/group_virtual_static.xml' % (TESTS_DIR)"/>
          <call function="'main_virtualStaticGroup'" />
          
          
          <call function="'testGroup_Postamble'"/>
                      file="'%s/testcases/%s/group_%s.xml' % (TESTS_DIR,_group,_suite)"/> 
                    <call function="'%s' % _suite" />
                  </sequence>
                <catch exception="'STAFException.TestSuite.SetupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Setup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.MainException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Main part of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.CleanupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                </try>
              </sequence>
            </iterate>
        
        </sequence>
      
      </block>
      
        <catch exception="'STAXException.TestGroupException'">
          <sequence>
            <message log="1" level="'fatal'">'Execution of Test Group Failed'</message>
    </sequence>

        </catch>        
        <finally>
          <!-- Test Group postamble -->
          <call function="'testGroup_Postamble'"/>
        </finally>
      </try>
    </sequence>
  </function>

</stax>

 opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml

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

<stax>

 opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml

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

<stax>

 opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml

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

<stax>

 opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml

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

<stax>

 opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml

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

<stax>

 opends/tests/staf-tests/functional-tests/testcases/logging/logging.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
 
<!--
@@ -31,15 +31,15 @@
            #@TestGroupName     Logging
            #@TestGroupPurpose      Test the ability of the server to log information in the appropriated log files
-->

 
<stax>
  <defaultcall function="main_logging"/>
  <function name="main_logging">
    <function-list-args>
      <function-required-arg name="STAXParentID"/>
    </function-list-args>

    <sequence>
      <try>
      <block name="'logging'">
         <sequence>
          <!--- Load the job environment for the test group execution -->
@@ -50,19 +50,59 @@
          </call>
          <script>
            CurrentTestPath['group']='logging'
              _group=CurrentTestPath['group']
          </script>
          <call function="'testGroup_Preamble'" />        
          <!-- 'setup','rotation','retention','writer','properties','retention_properties','rotation_properties','cleanup'-->
          <iterate var="_test" in="['setup','rotation','retention','writer','properties','retention_properties','rotation_properties','cleanup']" >
            <script>
              suiteList = []
              suiteList.append('rotation')
              suiteList.append('retention')
              suiteList.append('writer')
              suiteList.append('properties')
              suiteList.append('retention_properties')
              suiteList.append('rotation_properties')
            </script>
    
            <!-- Run the test suites -->
            <iterate  var="_suite" in="suiteList">
              <sequence>              
                <try>
            <sequence>
              <import machine="STAF_LOCAL_HOSTNAME"
                      file="'%s/testcases/logging/logging_%s.xml' % (TESTS_DIR,_test)"/>
              <call function="'logging_%s' % _test" />
                      file="'%s/testcases/%s/%s_%s.xml' % (TESTS_DIR,_group,_group,_suite)"/> 
                    <call function="'%s_%s' % (_group,_suite)" />
                  </sequence>
                <catch exception="'STAFException.TestSuite.SetupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Setup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.MainException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Main part of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.CleanupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                </try>
            </sequence>
          </iterate>
          <call function="'testGroup_Postamble'" />
                                    
        </sequence>
      </block>
        <catch exception="'STAXException.TestGroupException'">
          <sequence>
            <message log="1" level="'fatal'">'Execution of Test Group Failed'</message>
          </sequence>
        </catch>        
        <finally>
          <!-- Test Group postamble -->
          <call function="'testGroup_Postamble'"/>
        </finally>
      </try>
    </sequence>
  </function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/logging/logging_cleanup.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="logging_cleanup"/>
@@ -31,9 +31,15 @@
    <sequence>
      <block name="'cleanup'">
        <sequence>
          <block name="'Block DS Process Stop'">
          <!--- Stop DS -->

          <call function="'testSuite_Preamble'"/>

          <testcase name="getTestCaseName('Logging Setup')">

            <sequence>

              <call function="'testCase_Preamble'"/>

              <message>
                'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
              </message>
@@ -47,32 +53,18 @@
                }
              </call>
              
              <call function="'checkRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult
                }
              </call>
            </sequence>
            <!--- End Block DS Process Stop -->
          </block>
          <block name="'Block Remove DS Topology'">
          <!-- Remove  the topology created for the test suite -->
            <sequence>
              <message>
                'Remove DS topology created for the Test Suite'
              </message>
              
              <call function="'removeTopology'" />
              
              <call function="'checkRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult
                }
              </call>
              <call function="'testCase_Postamble'"/>
            
            </sequence>
            <!-- End Block Remove DS Topology-->
          </block>

          </testcase>

        </sequence>
      </block>
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/logging/logging_properties.xml

@@ -23,17 +23,27 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
  <defaultcall function="logging_properties"/>
  <function name="logging_properties" scope="local">
    <block name="STAXCurrentFunction">
      <try>
    <sequence>

      <script>
        CurrentTestPath['suite']=STAXCurrentFunction
      </script>
      <call function="'testSuite_Preamble'" />

          <call function="'common_setup'">
            {
              'quickStart'    : True ,
              'startServer'   : True  ,
              'stopServer'    : False
            }
          </call>
      
<!--- Test Suite information
#@TestSuiteName       Log publisher properties Tests
@@ -662,11 +672,30 @@
            'expectedAttributeValue' : '2'
            }
          </call>
          <call function="'testCase_Postamble'"/>
    
        </sequence>
      </testcase>  
      
      <call function="'testSuite_Postamble'" /> 
    </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Global Log Properties Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
    </block>
  </function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml

@@ -23,18 +23,26 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="logging_retention"/>
  <function name="logging_retention" scope="local">
    <block name="STAXCurrentFunction">
      <try>
      <sequence>
        <script>
          CurrentTestPath['suite']=STAXCurrentFunction
        </script>
        <call function="'testSuite_Preamble'" />
        
          <call function="'common_setup'">
            {
              'quickStart'    : True ,
              'startServer'   : True  ,
              'stopServer'    : False
            }
          </call>
  
<!--- Test Suite information
#@TestSuiteName       Retention Policy Tests
@@ -323,8 +331,26 @@
          </sequence>
        </testcase>

        <call function="'testSuite_Postamble'"/>
      </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Global Log Retention Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
    </block>
  </function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention_properties.xml

@@ -23,17 +23,26 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
  <defaultcall function="logging_retention_properties"/>
  <function name="logging_retention_properties" scope="local">
    <block name="STAXCurrentFunction">
      <try>
    <sequence>
      <script>
        CurrentTestPath['suite']=STAXCurrentFunction
      </script>
      <call function="'testSuite_Preamble'" />
  
          <call function="'common_setup'">
            {
              'quickStart'    : True ,
              'startServer'   : True  ,
              'stopServer'    : False
            }
          </call>

<!--- Test Suite information
#@TestSuiteName       Retention Policy Properties Tests
@@ -327,7 +336,27 @@
          <call function="'testCase_Postamble'"/>
        </sequence>
      </testcase>
      <call function="'testSuite_Postamble'" />
    
    </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Global Log Retention Properties Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
    </block>
  </function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml

@@ -23,18 +23,26 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="logging_rotation"/>
  <function name="logging_rotation" scope="local">
    <block name="STAXCurrentFunction"> 
      <try>
    <sequence>
      <script>
        CurrentTestPath['suite']=STAXCurrentFunction
      </script>
      <call function="'testSuite_Preamble'" />
      
          <call function="'common_setup'">
            {
              'quickStart'    : True ,
              'startServer'   : True  ,
              'stopServer'    : False
            }
          </call>

<!--- Test Suite information
#@TestSuiteName       Rotation Policy Tests
@@ -288,8 +296,27 @@
          <call function="'testCase_Postamble'" />
        </sequence>
      </testcase>
      <call function="'testSuite_Postamble'" />
          
    </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Global Log Rotation Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
   </block>
  </function>      
</stax>

 opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation_properties.xml

@@ -23,17 +23,26 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
  <defaultcall function="logging_rotation_properties"/>
  <function name="logging_rotation_properties" scope="local">
    <block name="STAXCurrentFunction">
      <try>
    <sequence>
      <script>
        CurrentTestPath['suite']=STAXCurrentFunction
      </script>
      <call function="'testSuite_Preamble'" />

          <call function="'common_setup'">
            {
              'quickStart'    : True ,
              'startServer'   : True  ,
              'stopServer'    : False
            }
          </call>

<!--- Test Suite information
#@TestSuiteName       Rotation Policy Properties Tests
@@ -315,7 +324,26 @@
        </sequence>
      </testcase>

      <call function="'testSuite_Postamble'" />
    </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Global Log Rotation Properties Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
    </block>
  </function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/logging/logging_setup.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="logging_setup"/>
@@ -31,9 +31,19 @@
    <sequence>
      <block name="'setup'">
        <sequence>
          <block name="'Block Create DS Topology'">
          <!-- Create the topology necessary to the test group/suite -->

          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>

          <call function="'testSuite_Preamble'"/>

          <testcase name="getTestCaseName('Logging Setup')">

            <sequence>

              <call function="'testCase_Preamble'"/>

              <message>
                'Create DS topology as described in config.py'
              </message>
@@ -42,18 +52,6 @@
                { 'initialiseInstance' : True }
              </call>
              
              <call function="'checkRC'">
                { 'returncode' : RC ,
                    'result'   : STAXResult
                }
              </call>
            </sequence>
            <!--- End Block Create DS Topology -->
          </block>
          
          <block name="'Block DS Process Active'">
            <!--- Start DS -->
            <sequence>
              <message>
                'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
              </message>
@@ -63,21 +61,21 @@
                { 'location'  : STAF_REMOTE_HOSTNAME }
              </call>
              
              <call function="'checkRC'">
                { 'returncode' : RC ,
                  'result'     : STAXResult
                }
              </call>
              
              <!--- Check that DS started -->
              <call function="'isAlive'">
                { 'noOfLoops'        : 10 ,
                  'noOfMilliSeconds' : 2000
                }
              </call>

              <call function="'testCase_Postamble'"/>

            </sequence>
            <!--- End Block DS Process Active -->
          </block>

          </testcase>

          <call function="'testSuite_Postamble'"/>

        </sequence>
      </block>
     </sequence>

 opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml

@@ -23,19 +23,26 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="logging_writer"/>
  <function name="logging_writer" scope="local">
   <block name="STAXCurrentFunction">  
    <try>  
    <sequence>
      <script>
        CurrentTestPath['suite']=STAXCurrentFunction
      </script>
      <call function="'testSuite_Preamble'"/>
      
      
      <call function="'common_setup'">
        {
          'quickStart'    : True ,
          'startServer'   : True  ,
          'stopServer'    : False
        }
      </call>

<!--- Test Suite information
#@TestSuiteName       Basic tests on logging
@@ -46,6 +53,7 @@
#@TestScript          logging_writer.xml
#@TestHTMLLink        http://opends.dev.java.net/
-->      

      <!-- #################################### -->
      <!--
        #@TestMarker      Basic tests on logging
@@ -329,8 +337,27 @@
          <call function="'testCase_Postamble'"/>
        </sequence>
      </testcase>
      <call function="'testSuite_Postamble'"/>

    </sequence> 
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Global Log Writer Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
    </block>     
  </function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring.xml

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

<!--
@@ -31,14 +31,15 @@
            #@TestGroupName     Monitoring
            #@TestGroupPurpose      Test the ability of the server to monitor informations
-->

<stax>
  <defaultcall function="main_monitoring"/>
  <function name="main_monitoring">
    <function-list-args>
      <function-required-arg name="STAXParentID"/>
    </function-list-args>

    <sequence>
      <try>
      <block name="'monitoring'">
        <sequence>
          <!--- Load the job environment for the test group execution -->
@@ -49,19 +50,55 @@
          </call>
          <script>
            CurrentTestPath['group']='monitoring'
              _group=CurrentTestPath['group']
            </script>
            <call function="'testGroup_Preamble'" />
            <script>
              suiteList = []
              suiteList.append('provider')
              suiteList.append('componant')
          </script>
          
          <call function="'testGroup_Preamble'" />
          <iterate var="_test" in="['setup','provider','componant','cleanup']" >
            <!-- Run the test suites -->
            <iterate  var="_suite" in="suiteList">
              <sequence>              
                <try>
            <sequence>
              <import machine="STAF_LOCAL_HOSTNAME"
                      file="'%s/testcases/monitoring/monitoring_%s.xml' % (TESTS_DIR,_test)"/>
              <call function="'monitoring_%s' % _test" />
                      file="'%s/testcases/%s/%s_%s.xml' % (TESTS_DIR,_group,_group,_suite)"/> 
                    <call function="'%s_%s' % (_group,_suite)" />
                  </sequence>
                <catch exception="'STAFException.TestSuite.SetupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Setup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.MainException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Main part of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.CleanupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                </try>
            </sequence>
          </iterate>
          <call function="'testGroup_Postamble'" />
                                    
        </sequence>
      </block>
        <catch exception="'STAXException.TestGroupException'">
          <sequence>
            <message log="1" level="'fatal'">'Execution of Test Group Failed'</message>
          </sequence>
        </catch>        
        <finally>
          <!-- Test Group postamble -->
          <call function="'testGroup_Postamble'"/>
        </finally>
      </try>
    </sequence>
  </function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml

@@ -23,18 +23,26 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
! -->
<stax>
  <defaultcall function="monitoring_componant"/>
  <function name="monitoring_componant" scope="local">
    <block name="STAXCurrentFunction">    
      <try>
      <sequence>
        <script>
          CurrentTestPath['suite']=STAXCurrentFunction
        </script>
        <call function="'testSuite_Preamble'" />
        
          <call function="'common_setup'">
            {
              'quickStart'    : True ,
              'startServer'   : True  ,
              'stopServer'    : False
            }
          </call>
        
        <!--- Test Suite information
#@TestSuiteName       Monitoring componants
@@ -134,9 +142,26 @@
          </sequence>
        </testcase>
        
        
        <call function="'testSuite_Postamble'" />
      </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Global Monitoring Component Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
    </block>      
  </function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml

@@ -23,18 +23,26 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
! -->
<stax>
  <defaultcall function="monitoring_provider"/>
  <function name="monitoring_provider" scope="local">
    <block name="STAXCurrentFunction">    
      <try>
      <sequence>
        <script>
          CurrentTestPath['suite']=STAXCurrentFunction
        </script>
        <call function="'testSuite_Preamble'" />
        
          <call function="'common_setup'">
            {
              'quickStart'    : True ,
              'startServer'   : True  ,
              'stopServer'    : False
            }
          </call>
 
<!--- Test Suite information
#@TestSuiteName       Monitoring Provider Tests
@@ -491,8 +499,26 @@
          </sequence>
        </testcase>
        
        <call function="'testSuite_Postamble'" />
      </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Global Monitoring Component Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
    </block>      
  </function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/plugins/plugins.xml

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


@@ -38,7 +38,9 @@
    <function-list-args>
      <function-required-arg name="STAXParentID"/>
    </function-list-args>

    <sequence>
      <try>
      <block name="'plugins'">
        <sequence>
          <!--- Load the job environment for the test group execution -->
@@ -49,20 +51,58 @@
          </call>
          <script>
            CurrentTestPath['group']='plugins'
              _group=CurrentTestPath['group']
            </script>
            <call function="'testGroup_Preamble'" />
            <script>
              suiteList = []
              suiteList.append('7bit')
              suiteList.append('uniqueness')
              suiteList.append('lastmod')
              suiteList.append('entryUUID')
              suiteList.append('refint')
          </script>
          
          <call function="'testGroup_Preamble'" />
          <!-- 'setup','7bit','uniqueness','lastmod','entryUUID','refint','cleanup' -->
          <iterate var="_test" in="['setup','7bit','uniqueness','lastmod','entryUUID','refint','cleanup']" >
            <!-- Run the test suites -->
            <iterate  var="_suite" in="suiteList">
              <sequence>              
                <try>
            <sequence>
              <import machine="STAF_LOCAL_HOSTNAME"
                      file="'%s/testcases/plugins/plugins_%s.xml' % (TESTS_DIR,_test)"/>
              <call function="'plugins_%s' % _test" />
                      file="'%s/testcases/%s/%s_%s.xml' % (TESTS_DIR,_group,_group,_suite)"/> 
                    <call function="'%s_%s' % (_group,_suite)" />
                  </sequence>
                <catch exception="'STAFException.TestSuite.SetupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Setup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.MainException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Main part of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.CleanupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                </try>
            </sequence>
          </iterate>
          <call function="'testGroup_Postamble'" />
                                    
        </sequence>
      </block>
        <catch exception="'STAXException.TestGroupException'">
          <sequence>
            <message log="1" level="'fatal'">'Execution of Test Group Failed'</message>
          </sequence>
        </catch>        
        <finally>
          <!-- Test Group postamble -->
          <call function="'testGroup_Postamble'"/>
        </finally>
      </try>
    </sequence>
  </function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_7bit.xml

@@ -23,18 +23,27 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="plugins_7bit"/>
  <function name="plugins_7bit" scope="local">
    <block name="STAXCurrentFunction">    
      <try>   
    <sequence>
      <script>
        CurrentTestPath['suite']=STAXCurrentFunction
      </script>
      <call function="'testSuite_Preamble'" />
      
          <call function="'common_setup'">
            {
              'quickStart'    : True ,
              'startServer'   : True  ,
              'stopServer'    : False
            }
          </call>
          
      <!--- Test Suite information
#@TestSuiteName       Plugin 7bit
#@TestSuitePurpose    Verify the plugin 7bit
@@ -279,9 +288,26 @@
  </sequence>
 </testcase>     
 
 
 <call function="'testSuite_Postamble'" />
 </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Global 7 Bit Plugin Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
 </block>      
</function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_entryUUID.xml

@@ -23,18 +23,27 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="plugins_entryUUID"/>
  <function name="plugins_entryUUID" scope="local">
    <block name="STAXCurrentFunction">    
      <try>
    <sequence>
      <script>
        CurrentTestPath['suite']=STAXCurrentFunction
      </script>
      <call function="'testSuite_Preamble'" />

          <call function="'common_setup'">
            {
              'quickStart'    : True ,
              'startServer'   : True  ,
              'stopServer'    : False
            }
          </call>
    
<!--- Test Suite information
#@TestSuiteName       Plugin entryUUID
#@TestSuitePurpose    Verify the plugin entryUUID
@@ -280,8 +289,26 @@
  </sequence>
 </testcase>            
      
 <call function="'testSuite_Postamble'" />
 </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Global UUID Plugin Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
 </block>      
</function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_lastmod.xml

@@ -23,19 +23,26 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="plugins_lastmod"/>
  <function name="plugins_lastmod" scope="local">
   <block name="STAXCurrentFunction">    
    <try>
    <sequence>
      <script>
        CurrentTestPath['suite']=STAXCurrentFunction
      </script>
      <call function="'testSuite_Preamble'" />


      <call function="'common_setup'">
        {
          'quickStart'    : True ,
          'startServer'   : True  ,
          'stopServer'    : False
        }
      </call>
    
 <testcase name="getTestCaseName('Plugins lastmod enabled  for add operations')">
  <sequence>
@@ -376,8 +383,27 @@
  </sequence>
 </testcase>                        
                  
 <call function="'testSuite_Postamble'" />

 </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Global Last Mod Plugin Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
 </block>     
</function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml

@@ -23,19 +23,26 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="plugins_refint"/>
  <function name="plugins_refint" scope="local">
    <block name="STAXCurrentFunction">    
      <try>
    <sequence>
      <script>
        CurrentTestPath['suite']=STAXCurrentFunction
      </script>
      <call function="'testSuite_Preamble'" />


        <call function="'common_setup'">
          {
            'quickStart'    : True ,
            'startServer'   : True  ,
            'stopServer'    : False
          }
        </call>

      
<!--- Test Suite information
@@ -807,8 +814,26 @@
  </sequence>
 </testcase>

 <call function="'testSuite_Postamble'" />
 </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Global Referential Integrety Plugin Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
 </block>
</function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_uniqueness.xml

@@ -23,18 +23,26 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="plugins_uniqueness"/>
  <function name="plugins_uniqueness" scope="local">
    <block name="STAXCurrentFunction">    
      <try>
    <sequence>
      <script>
        CurrentTestPath['suite']=STAXCurrentFunction
      </script>
      <call function="'testSuite_Preamble'" />

      <call function="'common_setup'">
        {
          'quickStart'    : True ,
          'startServer'   : True  ,
          'stopServer'    : False
        }
      </call>
 
<!--- Test Suite information
#@TestSuiteName       Plugin uniqueness
@@ -824,8 +832,26 @@


                
 <call function="'testSuite_Postamble'" />
 </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Global Uniqueness Plugin Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
 </block>      
</function>
</stax>

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

@@ -23,78 +23,84 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>

  <defaultcall function="main_privileges"/>

  <function name="main_privileges">
    <function-list-args>
      <function-required-arg name="STAXParentID"/>
    </function-list-args>
    <sequence>

    <sequence>
      <try>
      <block name="'privileges'">
      
        <sequence>

          <!--- Load the job environment for the test group execution -->
          <import machine="STAF_LOCAL_HOSTNAME"
                  file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
          <call function="'loadJobEnvironment'">
               { 'parent' : STAXParentID }
          </call>
    
          <script>
            CurrentTestPath['group']='privileges'
              _group=CurrentTestPath['group']
              
            GLOBAL_ACI_SEARCH="(targetattr!=\"userPassword||authPassword\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"
          </script>
      
          <call function="'testGroup_Preamble'"/>
            <script>
              suiteList = []
              suiteList.append('users')
              suiteList.append('directory_manager')
              suiteList.append('new_root_user')
              suiteList.append('unindexed_searches')
              suiteList.append('import_task')
              suiteList.append('export_task')
              suiteList.append('backup_task')
              suiteList.append('restore_task')
            </script>
                                    
          
            <!-- Run the test suites -->
            <iterate  var="_suite" in="suiteList">
              <sequence>              
                <try>
                  <sequence>                  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_users.xml' % (TESTS_DIR)"/>
          <call function="'privileges_users'" />
  
         <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_directory_manager.xml' % (TESTS_DIR)"/>
          <call function="'privileges_directory_manager'" />
  
         <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_new_root_user.xml' % (TESTS_DIR)"/>
          <call function="'privileges_new_root_user'" />
          
         <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_unindexed_searches.xml' % (TESTS_DIR)"/>
          <call function="'privileges_unindexed_searches'" />
          
         <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_import_task.xml' % (TESTS_DIR)"/>
          <call function="'privileges_import_task'" />
  
         <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_export_task.xml' % (TESTS_DIR)"/>
          <call function="'privileges_export_task'" />
  
         <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_backup_task.xml' % (TESTS_DIR)"/>
          <call function="'privileges_backup_task'" />
  
         <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_restore_task.xml' % (TESTS_DIR)"/>
          <call function="'privileges_restore_task'" />
          
                               
          <call function="'testGroup_Postamble'"/>
                      file="'%s/testcases/%s/%s_%s.xml' % (TESTS_DIR,_group,_group,_suite)"/> 
                    <call function="'%s_%s' % (_group,_suite)" />
                  </sequence>
                <catch exception="'STAFException.TestSuite.SetupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Setup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.MainException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Main part of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.CleanupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                </try>
              </sequence>
            </iterate>
        
        </sequence>
     
      </block>
     
        <catch exception="'STAXException.TestGroupException'">
          <sequence>
            <message log="1" level="'fatal'">'Execution of Test Group Failed'</message>
    </sequence>

        </catch>        
        <finally>
          <!-- Test Group postamble -->
          <call function="'testGroup_Postamble'"/>
        </finally>
      </try>
    </sequence>
  </function>

</stax>

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

New file
@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "../../../shared/stax.dtd">
<!--
 ! CDDL HEADER START
 !
 ! The contents of this file are subject to the terms of the
 ! Common Development and Distribution License, Version 1.0 only
 ! (the "License").  You may not use this file except in compliance
 ! with the License.
 !
 ! You can obtain a copy of the license at
 ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
 ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
 ! See the License for the specific language governing permissions
 ! and limitations under the License.
 !
 ! When distributing Covered Code, include this CDDL HEADER in each
 ! file and include the License file at
 ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 ! add the following below this CDDL HEADER, with the fields enclosed
 ! by brackets "[]" replaced with your own identifying information:
 !      Portions Copyright [yyyy] [name of copyright owner]
 !
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 ! -->
<stax>

  <defaultcall function="privileges_acis"/>

  <function name="privileges_acis">
    <function-map-args>
      <function-arg-def name="globalAcis" type="optional" default="False">
        <function-arg-description>
          Specifies whether the test should use global acis.
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </function-arg-def>
    </function-map-args>
      
    <sequence>
  
      <block name="'privileges_acis'">
        <sequence>

          <if expr="globalAcis == True">

            <sequence>
              <message>'Adding global ACIs.'</message>
              <call function="'ldapModifyWithScript'">
                {
                'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'dsFilename'       : '%s/privileges/privileges_global_acis.ldif' % remote.data
                }
              </call>
            </sequence>
          <else>
            <sequence>
              <message>'Adding entry ACIs.'</message>
              <call function="'ldapModifyWithScript'">
                {
                'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                'dsFilename'       : '%s/privileges/privileges_entry_acis.ldif' % remote.data
                }
              </call>
            </sequence>
          </else>
          </if>
 
        </sequence>
      </block>
    </sequence>
  </function>

</stax>

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

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

@@ -35,6 +35,8 @@

      <block name="'privileges-backup-task'">
      
        <try>
      
        <sequence>
  
          <script>
@@ -53,10 +55,19 @@
                #@TestScript                privileges_backup_task.xml
          -->

            <call function="'common_setup'">
              {
                'quickStart'    : False ,
                'startServer'   : True  ,
                'loadData'      : True  ,
                'ldifFile'      : '%s/privileges/privileges_startup.ldif' % remote.data ,
                'stopServer'    : False
              }
            </call>

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_setup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_setup'" />
                    file="'%s/testcases/privileges/privileges_acis.xml' % (TESTS_DIR)"/>
            <call function="'privileges_acis'"/>

      <!---
                Place test-specific test information here.
@@ -429,15 +440,28 @@
            </sequence>
          </testcase>
      
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_cleanup'" />

              
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
       
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Privileges Backup Task Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
        
        </try>
       
      </block>
       
    </sequence>

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

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

@@ -35,6 +35,8 @@

      <block name="'privileges-directory-manager'">
      
        <try>
      
        <sequence>
  
          <script>
@@ -54,10 +56,19 @@
          -->


          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_setup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_setup'" />
            <call function="'common_setup'">
              {
                'quickStart'    : False ,
                'startServer'   : True  ,
                'loadData'      : True  ,
                'ldifFile'      : '%s/privileges/privileges_startup.ldif' % remote.data ,
                'stopServer'    : False
              }
            </call>

            <import machine="STAF_LOCAL_HOSTNAME"
                    file="'%s/testcases/privileges/privileges_acis.xml' % (TESTS_DIR)"/>  
            <call function="'privileges_acis'"/>
                            
            <!---
                Place test-specific test information here.
@@ -1912,18 +1923,28 @@
            </sequence>
          </testcase>
        
           
         
            
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_cleanup'" />

              
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
       
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Privileges Directory Manager Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
        
        </try>
       
      </block>
       
    </sequence>

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

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

@@ -35,6 +35,8 @@

      <block name="'privileges-export-task'">
      
        <try>
      
        <sequence>
  
          <script>
@@ -54,10 +56,19 @@
          -->


          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_setup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_setup'" />
            <call function="'common_setup'">
              {
                'quickStart'    : False ,
                'startServer'   : True  ,
                'loadData'      : True  ,
                'ldifFile'      : '%s/privileges/privileges_startup.ldif' % remote.data ,
                'stopServer'    : False
              }
            </call>

            <import machine="STAF_LOCAL_HOSTNAME"
                    file="'%s/testcases/privileges/privileges_acis.xml' % (TESTS_DIR)"/>  
            <call function="'privileges_acis'"/>
                            
            <!---
                Place test-specific test information here.
@@ -431,15 +442,28 @@
            </sequence>
          </testcase>
      
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_cleanup'" />

              
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
       
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Privileges Export Task Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
        
        </try>
       
      </block>
       
    </sequence>

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

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

@@ -35,6 +35,8 @@

      <block name="'privileges-import-task'">
      
        <try>
      
        <sequence>
  
          <script>
@@ -54,9 +56,19 @@
          -->


            <call function="'common_setup'">
              {
                'quickStart'    : False ,
                'startServer'   : True  ,
                'loadData'      : True  ,
                'ldifFile'      : '%s/privileges/privileges_startup.ldif' % remote.data ,
                'stopServer'    : False
              }
            </call>

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_setup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_setup'" />
                    file="'%s/testcases/privileges/privileges_acis.xml' % (TESTS_DIR)"/>
            <call function="'privileges_acis'"/>

      <!---
                Place test-specific test information here.
@@ -451,15 +463,28 @@
            </sequence>
          </testcase>
      
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_cleanup'" />

              
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
       
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Privileges Import Task Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
        
        </try>
       
      </block>
       
    </sequence>

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

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

@@ -35,6 +35,8 @@

      <block name="'privileges-new-root-user'">
      
        <try>
      
        <sequence>
  
          <script>
@@ -54,10 +56,19 @@
          -->


          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_setup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_setup'" />
            <call function="'common_setup'">
              {
                'quickStart'    : False ,
                'startServer'   : True  ,
                'loadData'      : True  ,
                'ldifFile'      : '%s/privileges/privileges_startup.ldif' % remote.data ,
                'stopServer'    : False
              }
            </call>

            <import machine="STAF_LOCAL_HOSTNAME"
                    file="'%s/testcases/privileges/privileges_acis.xml' % (TESTS_DIR)"/>  
            <call function="'privileges_acis'"/>
                            
            <!---
                Place test-specific test information here.
@@ -1893,16 +1904,28 @@
            </sequence>
          </testcase>
       
            
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_cleanup'" />

              
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
       
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Privileges Root User Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
        
        </try>
       
      </block>
       
    </sequence>

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

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

@@ -35,6 +35,8 @@

      <block name="'privileges-restore-task'">
      
        <try>
      
        <sequence>
  
          <script>
@@ -54,10 +56,19 @@
          -->


          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_setup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_setup'" />
            <call function="'common_setup'">
              {
                'quickStart'    : False ,
                'startServer'   : True  ,
                'loadData'      : True  ,
                'ldifFile'      : '%s/privileges/privileges_startup.ldif' % remote.data ,
                'stopServer'    : False
              }
            </call>

            <import machine="STAF_LOCAL_HOSTNAME"
                    file="'%s/testcases/privileges/privileges_acis.xml' % (TESTS_DIR)"/>  
            <call function="'privileges_acis'"/>
                            
            <!---
                Place test-specific test information here.
@@ -605,15 +616,28 @@
            </sequence>
          </testcase>
      
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_cleanup'" />

              
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
       
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Privileges Restore Task Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
        
        </try>
       
      </block>
       
    </sequence>

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

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
@@ -35,6 +35,8 @@
      
      <block name="'privileges-unindexed-searches'">
        
        <try>
        
        <sequence>
          
          <script>
@@ -63,10 +65,19 @@
            #@TestScript          privileges_unindexed_searches.xml
          -->

            <call function="'common_setup'">
              {
                'quickStart'    : False ,
                'startServer'   : True  ,
                'loadData'      : True  ,
                'ldifFile'      : '%s/privileges/privileges_startup.ldif' % remote.data ,
                'stopServer'    : False
              }
            </call>

          <import machine="STAF_LOCAL_HOSTNAME"
                  file="'%s/testcases/privileges/privileges_setup.xml' % 
                  (TESTS_DIR)"/>
          <call function="'privileges_setup'" />
                    file="'%s/testcases/privileges/privileges_acis.xml' % (TESTS_DIR)"/>
            <call function="'privileges_acis'"/>
          
          <!---
            Place test-specific test information here.
@@ -678,15 +689,28 @@
            
          </testcase>
          
          <import machine="STAF_LOCAL_HOSTNAME"
                  file="'%s/testcases/privileges/privileges_cleanup.xml'% 
                  (TESTS_DIR)"/>
          <call function="'privileges_cleanup'" />
         
          <call function="'testSuite_Postamble'"/>
          
        </sequence>
        
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Privileges Unindexed Searches Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
        
        </try>
        
      </block>
      
    </sequence>

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

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

@@ -35,6 +35,8 @@

      <block name="'privileges-users'">
      
        <try>
      
        <sequence>
  
          <script>
@@ -54,9 +56,19 @@
          -->


            <call function="'common_setup'">
              {
                'quickStart'    : False ,
                'startServer'   : True  ,
                'loadData'      : True  ,
                'ldifFile'      : '%s/privileges/privileges_startup.ldif' % remote.data ,
                'stopServer'    : False
              }
            </call>

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_setup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_setup'" />
                    file="'%s/testcases/privileges/privileges_acis.xml' % (TESTS_DIR)"/>
            <call function="'privileges_acis'"/>

          <!---
                Place test-specific test information here.
@@ -3253,16 +3265,28 @@
            </sequence>
          </testcase>
        
           
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/privileges/privileges_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'privileges_cleanup'" />

              
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
       
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Privileges Users Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
        
        </try>
       
      </block>
       
    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2006-2008 Sun Microsystems, Inc.
 !      Copyright 2006-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="main_quickstart"/>
@@ -41,8 +41,8 @@
        
        <!--- Check that DS started -->
        <call function="'isAlive'">
          { 'noOfLoops'        : 10 ,
            'noOfMilliSeconds' : 2000 }
          { 'noOfLoops'        : 100 ,
            'noOfMilliSeconds' : 3000 }
        </call>
        
        <message>

 opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="main_schema_dynamic"/>
@@ -54,12 +54,20 @@
            <try>
              <sequence> 
 
                <call function="'common_setup'">
                  {
                    'quickStart'    : False ,
                    'startServer'   : True  ,
                    'loadData'      : True  ,
                    'ldifFile'      : '%s/schema/ldifs/schema_start.ldif' % remote.data ,
                    'stopServer'    : False
                  }
                </call>
 
                <!-- List of Import of Test Functions -->
                <script>
                  importList=[]
                  importList.append('schema_setup')
                  importList.append('dynamic/schema_dynamic_tests')
                  importList.append('schema_cleanup')
                </script>

                <!-- Import the files for this test suite -->
@@ -68,9 +76,6 @@
                    file="'%s/%s.xml' % (__groupdir,__import)"/>
                </iterate>                                                                       

                <!-- Test Suite Setup -->
                <call function="'%s_setup' % __group"/>
                                                    
                <!-- List of Test Cases -->
                <script>
                  testsList=[]
@@ -108,9 +113,18 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Example Cleanup.'</message>
              <call function="'%s_cleanup' % __group"/>
              <message>'Finally: Global Schema Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
              <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 

 opends/tests/staf-tests/functional-tests/testcases/schema/rfc/schema_rfc.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="main_schema_rfc"/>
@@ -54,12 +54,20 @@
            <try>
              <sequence> 
 
                <call function="'common_setup'">
                  {
                    'quickStart'    : False ,
                    'startServer'   : True  ,
                    'loadData'      : True  ,
                    'ldifFile'      : '%s/schema/ldifs/schema_start.ldif' % remote.data ,
                    'stopServer'    : False
                  }
                </call>
 
                <!-- List of Import of Test Functions -->
                <script>
                  importList=[]
                  importList.append('schema_setup')
                  importList.append('rfc/schema_rfc_tests')
                  importList.append('schema_cleanup')
                </script>

                <!-- Import the files for this test suite -->
@@ -68,9 +76,6 @@
                    file="'%s/%s.xml' % (__groupdir,__import)"/>
                </iterate>                                                                       

                <!-- Test Suite Setup -->
                <call function="'%s_setup' % __group"/>

                <!-- Specific to rfc tests -->
                <script>
                  __baseDN='o=rfc tests, dc=example,%s' % server.suffix
@@ -148,9 +153,18 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Example Cleanup.'</message>
              <call function="'%s_cleanup' % __group"/>
              <message>'Finally: Global Schema Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
              <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 

 opends/tests/staf-tests/functional-tests/testcases/schema/schema.xml

@@ -27,38 +27,27 @@
 ! -->
<stax>
  <defaultcall function="main_schema"/>

  <function name="main_schema" scope="local">
  <function name="main_schema">
    <function-list-args>
      <function-required-arg name="STAXParentID"/>
    </function-list-args>

    <sequence>
      <try>
        <block name="'main_schema'">
        <block name="'schema'">
          <sequence>

            <message log="1" level="'Info'">'STAXParentID= %s' % STAXParentID</message>
            
            <!--- Load the job environment for the test group execution -->
            <import machine="STAF_LOCAL_HOSTNAME"
                    file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
            <call function="'loadJobEnvironment'">
                 { 'parent' : STAXParentID }
            </call>

            <script>
              _group='schema'
              CurrentTestPath={ 'group' : '%s' % _group }
              CurrentTestPath['group']='schema'
              _group=CurrentTestPath['group']
              
            </script>

            <!--- Test Group information
            #@TestGroupName       Schema Test
            #@TestGroupPurpose    Verify that schema is working correctly
            -->
            <call function="'testGroup_Preamble'"/>            

            <!-- List of test suites to run -->
            <script>
              suiteList=[]
              suiteList.append('rfc')
@@ -66,45 +55,28 @@
              suiteList.append('solaris')
            </script>
                
            <!-- Data global to this test group  -->
            <!-- LDAP Server Object -->
            <script>
              server=directory_server()
              server.location   = STAF_REMOTE_HOSTNAME
              server.host       = DIRECTORY_INSTANCE_HOST
              server.port       = DIRECTORY_INSTANCE_PORT
              server.adminport  = DIRECTORY_INSTANCE_ADMIN_PORT
              server.dn         = DIRECTORY_INSTANCE_DN
              server.password   = DIRECTORY_INSTANCE_PSWD
              server.suffix     = DIRECTORY_INSTANCE_SFX
            </script>

            <!-- Run the test suites -->
            <iterate  var="_suite" in="suiteList">
              <sequence>              
                <try>
                  <sequence>                  
                    <import machine="STAF_LOCAL_HOSTNAME"
                            file="'%s/testcases/%s/%s/%s_%s.xml' % 
                              (TESTS_DIR,_group,_suite,_group,_suite)"/>
                      file="'%s/testcases/%s/%s/%s_%s.xml' % (TESTS_DIR,_group,_suite,_group,_suite)"/> 
                    <call function="'main_%s_%s' % (_group,_suite)" />
                  </sequence>
                <catch exception="'STAFException.TestSuite.SetupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Setup of test suite %s failed.' % _suite</message>
                    <throw exception="'STAXException.TestGroupException'" />
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.MainException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Main part of test suite %s failed.' % _suite</message>
                    <throw exception="'STAXException.TestGroupException'" />
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.CleanupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite %s failed.' % _suite</message>
                    <throw exception="'STAXException.TestGroupException'" />
                  </sequence>
                </catch>
                </try>
@@ -113,6 +85,11 @@

          </sequence>
        </block>
        <catch exception="'STAXException.TestGroupException'">
          <sequence>
            <message log="1" level="'fatal'">'Execution of Test Group Failed'</message>
          </sequence>
        </catch>        
      <finally>
        <!-- Test Group postamble -->
        <call function="'testGroup_Postamble'"/>

 opends/tests/staf-tests/functional-tests/testcases/schema/schema_cleanup.xml

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

@@ -39,6 +39,9 @@

        <sequence>

            <!-- Subtree delete all entries under suffix -->
            
            <!-- Stop Directory Server -->
            <call function="'runFunction'">
              { 'functionName'      : 'StopDsWithScript'                      ,
                'functionMessage'   : 'Stop the Directory Server.'             ,
@@ -51,6 +54,7 @@
              }
            </call>
            
            <!-- Remove topology -->            
            <call function="'runFunction'">
              { 'functionName'      : 'removeTopology'                  ,
                'functionMessage'   : 'Remove DS topology.'             ,

 opends/tests/staf-tests/functional-tests/testcases/schema/solaris/schema_solaris.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2008 Sun Microsystems, Inc.
 !      Copyright 2008-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="main_schema_solaris"/>
@@ -54,12 +54,20 @@
            <try>
              <sequence> 
 
                <call function="'common_setup'">
                  {
                    'quickStart'    : False ,
                    'startServer'   : True  ,
                    'loadData'      : True  ,
                    'ldifFile'      : '%s/schema/ldifs/schema_start.ldif' % remote.data ,
                    'stopServer'    : False
                  }
                </call>
 
                <!-- List of Import of Test Functions -->
                <script>
                  importList=[]
                  importList.append('schema_setup')
                  importList.append('solaris/schema_solaris_tests')
                  importList.append('schema_cleanup')
                </script>

                <!-- Import the files for this test suite -->
@@ -68,9 +76,6 @@
                    file="'%s/%s.xml' % (__groupdir,__import)"/>
                </iterate>                                                                       

                <!-- Test Suite Setup -->
                <call function="'%s_setup' % __group"/>

                <!-- Specific to solaris schema tests -->
                <script>
                  __baseDN='o=Solaris schema tests, dc=example,%s' % server.suffix
@@ -111,9 +116,18 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Solaris Schema Cleanup.'</message>
              <call function="'%s_cleanup' % __group"/>
              <message>'Finally: Global Schema Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
              <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 

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

@@ -23,71 +23,78 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2006-2008 Sun Microsystems, Inc.
 !      Copyright 2006-2009 Sun Microsystems, Inc.
 ! -->
<stax>

  <defaultcall function="security_account_activation"/>

  <function name="security_account_activation">
  <function name="security_account_activation" scope="local">

    <sequence>

      <block name="'account-activation'">
      <block name="'account_activation'">

        <try>      
      
        <sequence>
          
        <!--- Test Group information
            #@TestGroupName          Security
            #@TestGroupPurpose       To test the security functionality.
            #@TestSubgroupName       Account Activation
        -->
          <script>
            securityPath = '%s/testcases/security' % (TESTS_DIR)
            securityAcc = '%s/account_activation' % securityPath
          </script>
          
          <script>
            if not CurrentTestPath.has_key('group'):
              CurrentTestPath['group']='security'                                  
            CurrentTestPath['suite']=STAXCurrentBlock
              _group=CurrentTestPath['group']
              _suite='account_activation'
          </script>

          <call function="'testSuite_Preamble'"/>

            <call function="'common_setup'">
              {
                'quickStart'    : True ,
                'startServer'   : True  ,
                'stopServer'    : False
              }
            </call>

            <script>
              testList = []
              testList.append('setup_account_activation')
              testList.append('test_account')
              testList.append('account_expiration')
              testList.append('teardown_account_activation')
            </script>
  
            <iterate  var="_test" in="testList">
              <sequence>              

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>

                                  
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_setup_account_activation.xml' % securityAcc"/>
          <call function="'setup_account_activation'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_test_account.xml' % securityAcc"/>
          <call function="'test_account'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_account_expiration.xml' % securityAcc"/>
          <call function="'account_expiration'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_teardown_account_activation.xml' % securityAcc"/>
          <call function="'teardown_account_activation'" />

      

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>

                    
          <call function="'testSuite_Postamble'"/>
                  file="'%s/testcases/%s/%s/security_%s.xml' % (TESTS_DIR,_group,_suite,_test)"/> 
                <call function="'%s' % _test" />
        
        </sequence>
            </iterate>
  
          </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Account Activation Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
     
      </block>
     

 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml

@@ -23,76 +23,82 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>

  <defaultcall function="security_auth_pwd_syntax"/>

  <function name="security_auth_pwd_syntax">
  <function name="security_auth_pwd_syntax" scope="local">

     <sequence>

      <block name="'auth-pwd-syntax'">
      <block name="'auth_pwd_syntax'">

        <try>      
      
        <sequence>
  
          <script>
            if not CurrentTestPath.has_key('group'):
              CurrentTestPath['group']='security'                                          
            CurrentTestPath['suite']=STAXCurrentBlock
              _group=CurrentTestPath['group']
              _suite='auth_pwd_syntax'
          </script>
        
          <call function="'testSuite_Preamble'"/>

            <call function="'common_setup'">
              {
                'quickStart'    : True ,
                'startServer'   : True  ,
                'stopServer'    : False
              }
            </call>

            <script>
              testList = []
              testList.append('setup_auth_pwd_syntax')
              testList.append('auth_pwd_syntax_MD5_policy')
              testList.append('auth_pwd_syntax_SHA256_policy')
              testList.append('auth_pwd_syntax_SHA384_policy')
              testList.append('auth_pwd_syntax_SHA512_policy')
              testList.append('auth_pwd_syntax_SHA1_policy')
              testList.append('auth_pwd_syntax_def_policy')
              testList.append('teardown_auth_pwd_syntax')
            </script>
  
            <iterate  var="_test" in="testList">
              <sequence>              

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>
                                  

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml' % (TESTS_DIR)"/>
          <call function="'setup_auth_pwd_syntax'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml' % (TESTS_DIR)"/>
          <call function="'auth_pwd_syntax_MD5_policy'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml' % (TESTS_DIR)"/>
          <call function="'auth_pwd_syntax_SHA256_policy'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml' % (TESTS_DIR)"/>
          <call function="'auth_pwd_syntax_SHA384_policy'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml' % (TESTS_DIR)"/>
          <call function="'auth_pwd_syntax_SHA512_policy'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml' % (TESTS_DIR)"/>
          <call function="'auth_pwd_syntax_SHA1_policy'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml' % (TESTS_DIR)"/>
          <call function="'auth_pwd_syntax_def_policy'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml' % (TESTS_DIR)"/>
          <call function="'teardown_auth_pwd_syntax'" />
  

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>


                        
          <call function="'testSuite_Postamble'"/>
                  file="'%s/testcases/%s/%s/security_%s.xml' % (TESTS_DIR,_group,_suite,_test)"/> 
                <call function="'%s' % _test" />
        
        </sequence>
            </iterate>
  
          </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Auth Password Syntax Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
     
      </block>
     

 opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml

@@ -23,56 +23,77 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2006-2008 Sun Microsystems, Inc.
 !      Copyright 2006-2009 Sun Microsystems, Inc.
 ! -->
<stax>

  <defaultcall function="security_bind_no_pwd"/>

  <function name="security_bind_no_pwd">
  <function name="security_bind_no_pwd" scope="local">

    <sequence>

      <block name="'bind-no-pwd'">
      <block name="'bind_no_pwd'">

        <try>      
      
        <sequence>
  
          <script>
            if not CurrentTestPath.has_key('group'):
              CurrentTestPath['group']='security'                                          
            CurrentTestPath['suite']=STAXCurrentBlock
              _group=CurrentTestPath['group']
              _suite='bind_no_pwd'
          </script>
              
          <call function="'testSuite_Preamble'"/>

            <call function="'common_setup'">
              {
                'quickStart'    : True ,
                'startServer'   : True  ,
                'stopServer'    : False
              }
            </call>

            <script>
              testList = []
              testList.append('setup_bind_no_pwd')
              testList.append('pwd_null')
              testList.append('teardown_bind_no_pwd')
            </script>
  
            <iterate  var="_test" in="testList">
              <sequence>              

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>


        
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml' % (TESTS_DIR)"/>
          <call function="'setup_bind_no_pwd'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/bind_no_pwd/security_pwd_null.xml' % (TESTS_DIR)"/>
          <call function="'pwd_null'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml' % (TESTS_DIR)"/>
          <call function="'teardown_bind_no_pwd'" />


          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>

                        
          <call function="'testSuite_Postamble'"/>
                  file="'%s/testcases/%s/%s/security_%s.xml' % (TESTS_DIR,_group,_suite,_test)"/> 
                <call function="'%s' % _test" />
        
        </sequence>
            </iterate>
  
          </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Bind No Password Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
     
      </block>
     

 opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth.xml

@@ -23,77 +23,83 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>

  <defaultcall function="client_auth"/>

  <function name="client_auth">
  <function name="client_auth" scope="local">

    <sequence>

      <block name="'client_auth'">
      
        <try>      

        <sequence>
  
          <script>
            CurrentTestPath['group']='security'
            CurrentTestPath['suite']=STAXCurrentBlock
              _group=CurrentTestPath['group']
              _suite='client_auth'
          </script>

          <call function="'testSuite_Preamble'"/>

        <import machine="STAF_LOCAL_HOSTNAME"
           file="'%s/testcases/security/client_auth/client_auth_lib.xml' % (TESTS_DIR)" />
               file="'%s/testcases/%s/%s/client_auth_lib.xml' % (TESTS_DIR,_group,_suite)"/>
  
            <call function="'common_setup'">
              {
                'quickStart'    : True ,
                'startServer'   : True  ,
                'stopServer'    : False
              }
            </call>

            <script>
              testList = []
              testList.append('client_auth_setup')
              testList.append('fingerprint_mapper')
              testList.append('subject_dn_mapper')
              testList.append('subject_attribute_mapper')
              testList.append('equal_dn_mapper')
              testList.append('client_auth_teardown')
            </script>
  
            <iterate  var="_test" in="testList">
              <sequence>              

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>         
  
      <!--  client authentication setup -->
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/client_auth/client_auth_setup.xml' % (TESTS_DIR)"/>
          <call function="'client_auth_setup'" />

        
      <!-- fingerprint certificates mapper -->
      
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/client_auth/fingerprint_mapper.xml' % (TESTS_DIR)"/>
          <call function="'fingerprint_mapper'" />

  
          <!-- subject DN to user attribut certificate mapper -->
  
       <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/client_auth/subject_dn_mapper.xml' % (TESTS_DIR)"/>
          <call function="'subject_dn_mapper'" />
      
      <!-- subject attribute  to user attribut certificate mapper -->
    
       <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/client_auth/subject_attribute_mapper.xml' % (TESTS_DIR)"/>
          <call function="'subject_attribute_mapper'" />
    
      <!-- subject equals dn certificate mapper -->    
       <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/client_auth/equal_dn_mapper.xml' % (TESTS_DIR)"/>
          <call function="'equal_dn_mapper'" />
      
      <!--  client authentication teardown -->
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/client_auth/client_auth_teardown.xml' % (TESTS_DIR)"/>
          <call function="'client_auth_teardown'" />  

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>                      

      
          <call function="'testSuite_Postamble'"/>
                  file="'%s/testcases/%s/%s/%s.xml' % (TESTS_DIR,_group,_suite,_test)"/> 
                <call function="'%s' % _test" />

        </sequence>
            </iterate>
  
          </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Client Auth Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
   
      </block>
   

 opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  <defaultcall function="client_auth_setup"/>
@@ -353,7 +353,7 @@
            listAttr.append('objectclass:person')
            listAttr.append('objectclass:ds-certificate-user')
            listAttr.append('objectclass:strongAuthenticationUser')
            listAttr.append('userCertificate;binary:  bad_certificate')
            listAttr.append('userCertificate;binary:: YmFkX2NlcnRpZmljYXRlCgoK')
            listAttr.append('givenname:%s' % USER_1_CERT)
            listAttr.append('sn:%s' % USER_1_CERT)
            listAttr.append('cn:%s' % USER_1_CERT)
@@ -440,7 +440,7 @@
            listAttr.append('objectclass:person')
            listAttr.append('objectclass:ds-certificate-user')        
            listAttr.append('objectclass:strongAuthenticationUser')
            listAttr.append('userCertificate;binary:  bad_certificate')       
            listAttr.append('userCertificate;binary:: YmFkX2NlcnRpZmljYXRlCgoK')       
            listAttr.append('givenname:%s' % USER_2_CERT)
            listAttr.append('sn:%s' % USER_2_CERT)
            listAttr.append('cn:%s' % USER_2_CERT)

 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml

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

  <defaultcall function="bob_custom_jks"/>
  <defaultcall function="security_bob_custom_jks"/>

  <function name="bob_custom_jks">
  <function name="security_bob_custom_jks">
      <!---
            Place suite-specific test information here.
            #@TestSuiteName             JKS Tests

 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml

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

  <defaultcall function="bob_jks"/>
  <defaultcall function="security_bob_jks"/>

  <function name="bob_jks">
  <function name="security_bob_jks">
      <!---
            Place suite-specific test information here.
            #@TestSuiteName             JKS Tests

 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_jks.xml

@@ -23,53 +23,76 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2006-2008 Sun Microsystems, Inc.
 !      Copyright 2006-2009 Sun Microsystems, Inc.
 ! -->
<stax>

  <defaultcall function="security_jks"/>

  <function name="security_jks">
  <function name="security_jks" scope="local">

    <sequence>

      <block name="'jks'">
      
        <try>      

        <sequence>
  
          <script>
            if not CurrentTestPath.has_key('group'):
              CurrentTestPath['group']='security'                                          
            CurrentTestPath['suite']=STAXCurrentBlock
              _group=CurrentTestPath['group']
              _suite='jks'
          </script>
       
          <call function="'testSuite_Preamble'"/>

            <call function="'common_setup'">
              {
                'quickStart'    : True ,
                'startServer'   : True  ,
                'stopServer'    : False
              }
            </call>

            <script>
              testList = []
              testList.append('security_bob_jks')
              testList.append('security_bob_custom_jks')
            </script>
  
            <iterate  var="_test" in="testList">
              <sequence>              

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>

                              
     
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/jks/security_bob_jks.xml' % (TESTS_DIR)"/>
          <call function="'bob_jks'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/jks/security_bob_custom_jks.xml' % (TESTS_DIR)"/>
          <call function="'bob_custom_jks'" />
  

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>

                        
    
          <call function="'testSuite_Postamble'"/>
                  file="'%s/testcases/%s/%s/%s.xml' % (TESTS_DIR,_group,_suite,_test)"/> 
                <call function="'%s' % _test" />

        </sequence>
            </iterate>
  
          </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global JKS Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
   
      </block>
   

 opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml

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

  <defaultcall function="bob_pkcs12"/>
  <defaultcall function="security_bob_pkcs12"/>

  <function name="bob_pkcs12">
  <function name="security_bob_pkcs12">

      <!---
            Place suite-specific test information here.

 opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml

@@ -23,57 +23,77 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2006-2008 Sun Microsystems, Inc.
 !      Copyright 2006-2009 Sun Microsystems, Inc.
 ! -->
<stax>

  <defaultcall function="security_pkcs12"/>

  <function name="security_pkcs12">
  <function name="security_pkcs12" scope="local">

    <sequence>

      <block name="'pkcs12'">
      
        <try>      

        <sequence>
  
          <script>
            if not CurrentTestPath.has_key('group'):
              CurrentTestPath['group']='security'                                          
            CurrentTestPath['suite']=STAXCurrentBlock
              _group=CurrentTestPath['group']
              _suite='pkcs12'
          </script>
            
          <call function="'testSuite_Preamble'"/>

            <call function="'common_setup'">
              {
                'quickStart'    : True ,
                'startServer'   : True  ,
                'stopServer'    : False
              }
            </call>

            <script>
              testList = []
              testList.append('security_setup_pkcs12')
              testList.append('security_bob_pkcs12')
              testList.append('security_teardown_pkcs12')
            </script>
  
            <iterate  var="_test" in="testList">
              <sequence>              

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>

                         
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pkcs12/security_setup_pkcs12.xml' % (TESTS_DIR)"/>
          <call function="'setup_pkcs12'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pkcs12/security_bob_pkcs12.xml' % (TESTS_DIR)"/>
          <call function="'bob_pkcs12'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pkcs12/security_teardown_pkcs12.xml' % (TESTS_DIR)"/>
          <call function="'teardown_pkcs12'" />



          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>

                          
          <call function="'testSuite_Postamble'"/>
                  file="'%s/testcases/%s/%s/%s.xml' % (TESTS_DIR,_group,_suite,_test)"/> 
                <call function="'%s' % _test" />
    
        </sequence>
            </iterate>
  
          </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global PKCS#12 Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
    
      </block>
    

 opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml

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

  <defaultcall function="setup_pkcs12"/>
  <defaultcall function="security_setup_pkcs12"/>

  <function name="setup_pkcs12">
  <function name="security_setup_pkcs12">
      <!---
            Place group-specific test information here.
            #@TestGroupName             Security

 opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml

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

  <defaultcall function="teardown_pkcs12"/>
  <defaultcall function="security_teardown_pkcs12"/>

  <function name="teardown_pkcs12">
  <function name="security_teardown_pkcs12">

        <!---
            Place suite-specific test information here.

 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml

@@ -23,120 +23,88 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2006-2008 Sun Microsystems, Inc.
 !      Copyright 2006-2009 Sun Microsystems, Inc.
 ! -->
<stax>

  <defaultcall function="security_pwd_policy"/>

  <function name="security_pwd_policy">
  <function name="security_pwd_policy" scope="local">

    <sequence>

      <block name="'pwd-policy'">
      <block name="'pwd_policy'">

        <try>      
      
        <sequence>
  
          <script>
            if not CurrentTestPath.has_key('group'):
              CurrentTestPath['group']='security'
            CurrentTestPath['suite']=STAXCurrentBlock
              _group=CurrentTestPath['group']
              _suite='pwd_policy'
          </script>
          
       <!---
            Place group-specific test information here.
            #@TestGroupName             Security
            #@TestGroupPurpose          To test the security functionality.
            #@TestSubgroupName          Password Policy
        -->
      
          <call function="'testSuite_Preamble'"/>

            <call function="'common_setup'">
              {
                'quickStart'    : True ,
                'startServer'   : True  ,
                'stopServer'    : False
              }
            </call>

            <script>
              testList = []
              testList.append('setup_pwd_policy')
              testList.append('user_pwd_policy')
              testList.append('force_pwd_change')
              testList.append('force_pwd_change_all_users')
# DISABLED    testList.append('enable_max_pwd_age')
# DISABLED    testList.append('disable_max_pwd_age')
              testList.append('min_pwd_age')
              testList.append('lockout_fail_cnt')
              testList.append('grace_login')
              testList.append('mult_pwd_policies')
              testList.append('preencoded_pwds')
              testList.append('lockout_duration')
              testList.append('last_login')
              testList.append('teardown_pwd_policy')
            </script>
  
            <iterate  var="_test" in="testList">
              <sequence>              

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>

                                      

          <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_policy/security_setup_pwd_policy.xml'
          % (TESTS_DIR)"/>
          <call function="'setup_pwd_policy'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_policy/security_user_pwd_policy.xml'
          % (TESTS_DIR)"/>
          <call function="'user_pwd_policy'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_policy/security_force_pwd_change.xml'
          % (TESTS_DIR)"/>
          <call function="'force_pwd_change'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
file="'%s/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml'
% (TESTS_DIR)"/>
          <call function="'force_pwd_change_all_users'" />
          <!--
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_enable_max_pwd_age.xml' % (TESTS_DIR)"/>
          <call function="'enable_max_pwd_age'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_disable_max_pwd_age.xml' % (TESTS_DIR)"/>
          <call function="'disable_max_pwd_age'" />
          -->
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_min_pwd_age.xml'
            % (TESTS_DIR)"/>
          <call function="'min_pwd_age'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_policy/security_lockout_fail_cnt.xml'
          % (TESTS_DIR)"/>
          <call function="'lockout_fail_cnt'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_grace_login.xml'
            % (TESTS_DIR)"/>
          <call function="'grace_login'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
         file="'%s/testcases/security/pwd_policy/security_mult_pwd_policies.xml'
         % (TESTS_DIR)"/>
          <call function="'mult_pwd_policies'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_policy/security_preencoded_pwds.xml'
          % (TESTS_DIR)"/>
          <call function="'preencoded_pwds'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
          file="'%s/testcases/security/pwd_policy/security_lockout_duration.xml'
          % (TESTS_DIR)"/>
          <call function="'lockout_duration'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy/security_last_login.xml'
            % (TESTS_DIR)"/>
          <call function="'last_login'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
       file="'%s/testcases/security/pwd_policy/security_teardown_pwd_policy.xml'
       % (TESTS_DIR)"/>
          <call function="'teardown_pwd_policy'" />
  

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>

                  
    
          <call function="'testSuite_Postamble'"/>
                  file="'%s/testcases/%s/%s/security_%s.xml' % (TESTS_DIR,_group,_suite,_test)"/> 
                <call function="'%s' % _test" />
    
        </sequence>
            </iterate>
  
          </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Password Policy Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
    
      </block>
    

 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml

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

  <defaultcall function="security_pwd_policy_root"/>

  <function name="security_pwd_policy_root">
  <function name="security_pwd_policy_root" scope="local">

    <sequence>

      <block name="'pwd-policy-root'">
      <block name="'pwd_policy_root'">

        <try>      
      
        <sequence>
  
          <script>
            if not CurrentTestPath.has_key('group'):
              CurrentTestPath['group']='security'                                          
            CurrentTestPath['suite']=STAXCurrentBlock
              _group=CurrentTestPath['group']
              _suite='pwd_policy_root'
          </script>
      
          <call function="'testSuite_Preamble'"/>

            <call function="'common_setup'">
              {
                'quickStart'    : True ,
                'startServer'   : True  ,
                'stopServer'    : False
              }
            </call>

            <script>
              testList = []
              testList.append('root_user_tests')
              testList.append('root_auth')
            </script>
  
            <iterate  var="_test" in="testList">
              <sequence>              

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>


  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy_root/security_root_user_tests.xml' % (TESTS_DIR)"/>
          <call function="'root_user_tests'" />

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_policy_root/security_root_auth.xml' % (TESTS_DIR)"/>
          <call function="'security_root_auth'" />



          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>

                            
          <call function="'testSuite_Postamble'"/>
                  file="'%s/testcases/%s/%s/security_%s.xml' % (TESTS_DIR,_group,_suite,_test)"/> 
                <call function="'%s' % _test" />
    
        </sequence>
            </iterate>
  
          </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Start TLS Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
    
      </block>
    

 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml

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

  <defaultcall function="security_root_auth"/>
  <defaultcall function="root_auth"/>

  <function name="security_root_auth">
  <function name="root_auth">

    <sequence>
      

 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml

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


 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml

@@ -23,115 +23,92 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2006-2008 Sun Microsystems, Inc.
 !      Copyright 2006-2009 Sun Microsystems, Inc.
 ! -->
<stax>

  <defaultcall function="security_pwd_storage"/>

  <function name="security_pwd_storage">
  <function name="security_pwd_storage" scope="local">

    <sequence>

      <block name="'pwd-storage'">
      <block name="'pwd_storage'">

        <try>      
      
        <sequence>
  
          <script>
            if not CurrentTestPath.has_key('group'):
              CurrentTestPath['group']='security'                                          
            CurrentTestPath['suite']=STAXCurrentBlock
              _group=CurrentTestPath['group']
              _suite='pwd_storage'
          </script>

          <call function="'testSuite_Preamble'"/>

            <call function="'common_setup'">
              {
                'quickStart'    : True ,
                'startServer'   : True  ,
                'stopServer'    : False
              }
            </call>

            <script>
              testList = []
              testList.append('setup_pwd_storage')
              testList.append('pwd_SSHA')
              testList.append('pwd_SHA')
              testList.append('pwd_SSHA256')
              testList.append('pwd_SSHA384')
              testList.append('pwd_SSHA512')
              testList.append('pwd_MD5')
              testList.append('pwd_SMD5')
              testList.append('pwd_BASE64')
              testList.append('pwd_3DES')
              testList.append('pwd_AES')
              testList.append('pwd_RC4')
              testList.append('pwd_BLOWFISH')
              testList.append('pwd_CLEAR')
              testList.append('pwd_CRYPT')
# DISABLED    testList.append('multiple_schemes')
              testList.append('deprecated_schemes')
              testList.append('teardown_pwd_storage')
            </script>
  
            <iterate  var="_test" in="testList">
              <sequence>              

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>
                          

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_setup_pwd_storage.xml' % (TESTS_DIR)"/>
          <call function="'setup_pwd_storage'" />
          
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_SSHA.xml' % (TESTS_DIR)"/>
          <call function="'pwd_SSHA'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_SHA.xml' % (TESTS_DIR)"/>
          <call function="'pwd_SHA'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_SSHA256.xml' % (TESTS_DIR)"/>
          <call function="'pwd_SSHA256'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_SSHA384.xml' % (TESTS_DIR)"/>
          <call function="'pwd_SSHA384'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_SSHA512.xml' % (TESTS_DIR)"/>
          <call function="'pwd_SSHA512'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_MD5.xml' % (TESTS_DIR)"/>
          <call function="'pwd_MD5'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_SMD5.xml' % (TESTS_DIR)"/>
          <call function="'pwd_SMD5'" />
          
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_BASE64.xml' % (TESTS_DIR)"/>
          <call function="'pwd_BASE64'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_3DES.xml' % (TESTS_DIR)"/>
          <call function="'pwd_3DES'" />
          
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_AES.xml' % (TESTS_DIR)"/>
          <call function="'pwd_AES'" />
          
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_RC4.xml' % (TESTS_DIR)"/>
          <call function="'pwd_RC4'" />
          
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_blowfish.xml' % (TESTS_DIR)"/>
          <call function="'pwd_BLOWFISH'" />
          
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_CLEAR.xml' % (TESTS_DIR)"/>
          <call function="'pwd_CLEAR'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_pwd_CRYPT.xml' % (TESTS_DIR)"/>
          <call function="'pwd_CRYPT'" />
          <!--
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_multiple_schemes.xml' % (TESTS_DIR)"/>
          <call function="'multiple_schemes'" />
          -->
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_deprecated_schemes.xml' % (TESTS_DIR)"/>
          <call function="'deprecated_schemes'" />
          
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/pwd_storage/security_teardown_pwd_storage.xml' % (TESTS_DIR)"/>
          <call function="'teardown_pwd_storage'" />


          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>
                    

          <call function="'testSuite_Postamble'"/>
                  file="'%s/testcases/%s/%s/security_%s.xml' % (TESTS_DIR,_group,_suite,_test)"/> 
                <call function="'%s' % _test" />
    
        </sequence>
            </iterate>
  
          </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Password Storage Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
     
      </block>
     

 opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml

@@ -23,103 +23,86 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2006-2008 Sun Microsystems, Inc.
 !      Copyright 2006-2009 Sun Microsystems, Inc.
 ! -->
<stax>

  <defaultcall function="security_pwd_validator"/>

  <function name="security_pwd_validator">
  <function name="security_pwd_validator" scope="local">

    <sequence>

      <block name="'pwd-validator'">
      <block name="'pwd_validator'">

        <try>      
      
        <sequence>
          
          
          <!--- Test Group information
            #@TestGroupName          Security
            #@TestGroupPurpose       To test the security functionality.
            #@TestSubgroupName       Password Validator
          -->
          <script>
            if not CurrentTestPath.has_key('group'):
              CurrentTestPath['group']='security'
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
          
          <script>
          securityPath = '%s/testcases/security/pwd_validator' % TESTS_DIR
              _group=CurrentTestPath['group']
              _suite='pwd_validator'
          </script>
          
        <call function="'testSuite_Preamble'"/>

            <call function="'common_setup'">
              {
                'quickStart'    : True ,
                'startServer'   : True  ,
                'stopServer'    : False
              }
            </call>

            <script>
              testList = []
              testList.append('setup_pwd_validator')
              testList.append('pwd_length')
              testList.append('attribute_value')
              testList.append('character_set')
              testList.append('history_based')
              testList.append('similarity_based')
              testList.append('dictionary')
              testList.append('unique_chars')
              testList.append('repeat_chars')
              testList.append('mult_validators')
              testList.append('skip_val_for_admins')
              testList.append('teardown_pwd_validator')
            </script>
  
            <iterate  var="_test" in="testList">
              <sequence>              

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>

                                  

        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_setup_pwd_validator.xml' % securityPath"/>
        <call function="'setup_pwd_validator'" />

        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_pwd_length.xml' % securityPath"/>
        <call function="'pwd_length'" />

        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_attribute_value.xml' % securityPath"/>
        <call function="'attribute_value'" />

        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_character_set.xml' % securityPath"/>
        <call function="'character_set'" />

        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_history_based.xml' % securityPath"/>
        <call function="'history_based'" />
        
        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_similarity_based.xml' % securityPath"/>
        <call function="'similarity_based'" />
        
        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_dictionary.xml' % securityPath"/>
        <call function="'dictionary'" />

        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_unique_chars.xml' % securityPath"/>
        <call function="'unique_chars'" />

        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_repeat_chars.xml' % securityPath"/>
        <call function="'repeat_chars'" />

        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_mult_validators.xml' % securityPath"/>
        <call function="'mult_validators'" />

        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_skip_val_for_admins.xml' % securityPath"/>
        <call function="'skip_val_for_admins'" />

        <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/security_teardown_pwd_validator.xml' % securityPath"/>
        <call function="'teardown_pwd_validator'" />



          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>

                            
          <call function="'testSuite_Postamble'"/>
                  file="'%s/testcases/%s/%s/security_%s.xml' % (TESTS_DIR,_group,_suite,_test)"/> 
                <call function="'%s' % _test" />
          
        </sequence>
            </iterate>
  
          </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Password Validator Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
    
      </block>
    

 opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl.xml

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

  <defaultcall function="security_sasl"/>

  <function name="security_sasl">
  <function name="security_sasl" scope="local">

    <sequence>

      <block name="'sasl'">
      
        <try>      

        <sequence>
  
          <script>
            if not CurrentTestPath.has_key('group'):
              CurrentTestPath['group']='security'                                          
            CurrentTestPath['suite']=STAXCurrentBlock
              _group=CurrentTestPath['group']
              _suite='sasl'
          </script>
      
          <call function="'testSuite_Preamble'"/>

            <call function="'common_setup'">
              {
                'quickStart'    : True ,
                'startServer'   : True  ,
                'stopServer'    : False
              }
            </call>

            <script>
              testList = []
              testList.append('setup_sasl')
              testList.append('sasl_anon')
              testList.append('sasl_plain')
              testList.append('sasl_cram-md5')
              testList.append('sasl_digest-md5')
              testList.append('sasl_new')
              testList.append('teardown_sasl')
            </script>
  
            <iterate  var="_test" in="testList">
              <sequence>              

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>

                                    
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/sasl/security_setup_sasl.xml' % (TESTS_DIR)"/>
          <call function="'setup_sasl'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/sasl/security_sasl_anon.xml' % (TESTS_DIR)"/>
          <call function="'sasl_anon'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/sasl/security_sasl_plain.xml' % (TESTS_DIR)"/>
          <call function="'sasl_plain'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/sasl/security_sasl_cram-md5.xml' % (TESTS_DIR)"/>
          <call function="'sasl_cram-md5'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/sasl/security_sasl_digest-md5.xml' % (TESTS_DIR)"/>
          <call function="'sasl_digest-md5'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/sasl/security_sasl_new.xml' % (TESTS_DIR)"/>
          <call function="'sasl_new'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/sasl/security_teardown_sasl.xml' % (TESTS_DIR)"/>
          <call function="'teardown_sasl'" />



          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>

                            
          <call function="'testSuite_Postamble'"/>
                  file="'%s/testcases/%s/%s/security_%s.xml' % (TESTS_DIR,_group,_suite,_test)"/> 
                <call function="'%s' % _test" />
            
        </sequence>
            </iterate>
  
          </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global SASL Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>
    
      </block>
    

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

@@ -23,69 +23,86 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2006-2008 Sun Microsystems, Inc.
 !      Copyright 2006-2009 Sun Microsystems, Inc.
 ! -->
<stax>
  
  <defaultcall function="main_security"/>
  
  <function name="main_security">
    <function-list-args>
      <function-required-arg name="STAXParentID"/>
    </function-list-args>
    
    <sequence>
      
      <try>
      <block name="'security'">
        
        <sequence>

          <!--- Load the job environment for the test group execution -->
          <import machine="STAF_LOCAL_HOSTNAME"
                  file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
          <call function="'loadJobEnvironment'">
               { 'parent' : STAXParentID }
          </call>
                    
          <!--- Test Group information
            #@TestGroupName          Security tests
            #@TestGroupPurpose       Test the security.
          -->
          <script>
          CurrentTestPath['group']='security'
              _group=CurrentTestPath['group']
        </script>
        
        <call function="'testGroup_Preamble'"/>
        
        <script>
            testList = []
            testList.append(['client_auth','client_auth'])
            testList.append(['jks','security_jks'])
            testList.append(['pkcs12','security_pkcs12'])
            testList.append(['startTLS','security_startTLS'])
            testList.append(['sasl','security_sasl'])
            testList.append(['pwd_policy','security_pwd_policy'])
            testList.append(['pwd_policy_root','security_pwd_policy_root'])
            testList.append(['auth_pwd_syntax','security_auth_pwd_syntax'])
            testList.append(['pwd_validator','security_pwd_validator'])
            testList.append(['pwd_storage','security_pwd_storage'])
            testList.append(['bind_no_pwd','security_bind_no_pwd'])
            testList.append(['account_activation','security_account_activation'])
              suiteList = []
              suiteList.append(['client_auth','client_auth'])
              suiteList.append(['jks','security_jks'])
              suiteList.append(['pkcs12','security_pkcs12'])
              suiteList.append(['startTLS','security_startTLS'])
              suiteList.append(['sasl','security_sasl'])
              suiteList.append(['pwd_policy','security_pwd_policy'])
              suiteList.append(['pwd_policy_root','security_pwd_policy_root'])
              suiteList.append(['auth_pwd_syntax','security_auth_pwd_syntax'])
              suiteList.append(['pwd_validator','security_pwd_validator'])
              suiteList.append(['pwd_storage','security_pwd_storage'])
              suiteList.append(['bind_no_pwd','security_bind_no_pwd'])
              suiteList.append(['account_activation','security_account_activation'])
        </script>
        <iterate var="_test" in="testList">
    
            <!-- Run the test suites -->
            <iterate  var="_suite" in="suiteList">
              <sequence>              
                <try>
          <sequence>
            <import machine="STAF_LOCAL_HOSTNAME"
                    file="'%s/testcases/security/%s/%s.xml' % 
                    (TESTS_DIR,_test[0],_test[1])"/>
            <call function="'%s' % _test[1]" />
                      file="'%s/testcases/%s/%s/%s.xml' % (TESTS_DIR,_group,_suite[0],_suite[1])"/> 
                    <call function="'%s' % _suite[1]" />
                  </sequence>
                <catch exception="'STAFException.TestSuite.SetupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Setup of test suite %s failed.' % _suite[0]</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.MainException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Main part of test suite %s failed.' % _suite[0]</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.CleanupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite %s failed.' % _suite[0]</message>
                  </sequence>
                </catch>
                </try>
          </sequence>
        </iterate>
        
        
        <call function="'testGroup_Postamble'"/>
      
      </sequence>
    </block>
        <catch exception="'STAXException.TestGroupException'">
          <sequence>
            <message log="1" level="'fatal'">'Execution of Test Group Failed'</message>
          </sequence>
        </catch>        
        <finally>
          <!-- Test Group postamble -->
          <call function="'testGroup_Postamble'"/>
        </finally>
      </try>
   </sequence>
  </function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml

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

  <defaultcall function="bob_startTLS"/>
  <defaultcall function="security_bob_startTLS"/>

  <function name="bob_startTLS">
  <function name="security_bob_startTLS">

      <sequence>


 opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml

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

  <defaultcall function="force_pwd_change_startTLS"/>
  <defaultcall function="security_force_pwd_change_startTLS"/>

  <function name="force_pwd_change_startTLS">
  <function name="security_force_pwd_change_startTLS">

      <sequence>


 opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml

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

  <defaultcall function="setup_startTLS"/>
  <defaultcall function="security_setup_startTLS"/>

  <function name="setup_startTLS">
  <function name="security_setup_startTLS">

      <sequence>


 opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_startTLS.xml

@@ -23,63 +23,78 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2006-2008 Sun Microsystems, Inc.
 !      Copyright 2006-2009 Sun Microsystems, Inc.
 ! -->
<stax>

  <defaultcall function="security_startTLS"/>

  <function name="security_startTLS">
  <function name="security_startTLS" scope="local">

    <sequence>

      <block name="'start-tls'">
      <block name="'startTLS'">

        <try>      
      
        <sequence>
              
          <script>
            if not CurrentTestPath.has_key('group'):
              CurrentTestPath['group']='security'                                          
            CurrentTestPath['suite']=STAXCurrentBlock
              _group=CurrentTestPath['group']
              _suite='startTLS'
          </script>
      
          <call function="'testSuite_Preamble'"/>

            <call function="'common_setup'">
              {
                'quickStart'    : True ,
                'startServer'   : True  ,
                'stopServer'    : False
              }
            </call>

            <script>
              testList = []
              testList.append('security_setup_startTLS')
              testList.append('security_bob_startTLS')
              testList.append('security_force_pwd_change_startTLS')
              testList.append('security_teardown_startTLS')
            </script>
  
            <iterate  var="_test" in="testList">
              <sequence>              

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>

                        


          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/startTLS/security_setup_startTLS.xml' % (TESTS_DIR)"/>
          <call function="'setup_startTLS'" />

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/startTLS/security_bob_startTLS.xml' % (TESTS_DIR)"/>
          <call function="'bob_startTLS'" />
    
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/startTLS/security_force_pwd_change_startTLS.xml' % (TESTS_DIR)"/>
          <call function="'force_pwd_change_startTLS'" />

          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/startTLS/security_teardown_startTLS.xml' % (TESTS_DIR)"/>
          <call function="'teardown_startTLS'" />
 


          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>

                

          <call function="'testSuite_Postamble'"/>
                  file="'%s/testcases/%s/%s/%s.xml' % (TESTS_DIR,_group,_suite,_test)"/> 
                <call function="'%s' % _test" />

        </sequence>
            </iterate>
  
          </sequence>

          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Start TLS Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
                </sequence>
              </catch>
              <finally>
                <call function="'testSuite_Postamble'"/>
              </finally>
              </try>
            </sequence>
          </finally>
 
        </try>

      </block>
        

 opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml

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

  <defaultcall function="teardown_startTLS"/>
  <defaultcall function="security_teardown_startTLS"/>

  <function name="teardown_startTLS">
  <function name="security_teardown_startTLS">

      <sequence>


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

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

@@ -109,38 +109,6 @@

              <!--- Test Case information
               #@TestMarker          setup
               #@TestName            setup: add initial entries
               #@TestIssue           none
               #@TestPurpose         Load the data needed by the test suite.
               #@TestPreamble        none
               #@TestStep            Load the data needed by the test suite.
               #@TestPostamble       none
               #@TestResult          Success if importLdif returns 0.
              -->
              <testcase name="getTestCaseName('setup: add initial entries')">

                <sequence>

                  <call function="'testCase_Preamble'"/>

                  <message>
                    'setup: add initial entries'
                  </message>

                  <call function="'importLdif'">
                    {
                    'ldifFile' : '%s/snmp/snmp_start.ldif' % remote.data
                    }
                  </call>

                  <call function="'testCase_Postamble'"/>

                </sequence>

              </testcase>

              <!--- Test Case information
                #@TestMarker          setup
                #@TestName            setup: start DS
                #@TestIssue           none
                #@TestPurpose         Start DS.
@@ -182,6 +150,57 @@

              <!--- Test Case information
                #@TestMarker          setup
               #@TestName            setup: add initial entries
               #@TestIssue           none
               #@TestPurpose         Load the data needed by the test suite.
               #@TestPreamble        none
               #@TestStep            Load the data needed by the test suite.
               #@TestPostamble       none
               #@TestResult          Success if importLdif returns 0.
              -->
              <testcase name="getTestCaseName('setup: add initial entries')">

                <sequence>

                  <call function="'testCase_Preamble'"/>

                  <message>
                    'setup: add initial entries'
                  </message>

                  <call function="'dsconfigSet'">
                    {
                      'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST,
                      'dsInstanceAdminPort'    : DIRECTORY_INSTANCE_ADMIN_PORT,
                      'dsInstanceDn'           : DIRECTORY_INSTANCE_DN,
                      'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD,
                      'objectName'             : 'password-policy',
                      'propertyType'           : 'policy',
                      'propertyName'           : 'Default Password Policy',
                      'attributeName'          : 'allow-pre-encoded-passwords',
                      'attributeValue'         : 'true'
                    }
                  </call>

                  <call function="'addEntry'">
                    { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                      'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                      'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
                      'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
                      'entryToBeAdded' : '%s/snmp/snmp_start.ldif'
                                         % remote.data,
                      'verbose'        : False
                    }
                  </call>

                  <call function="'testCase_Postamble'"/>

                </sequence>

              </testcase>

              <!--- Test Case information
                #@TestMarker          setup
                #@TestName            setup: get default SNMP connection handler
                                      properties
                #@TestIssue           none

 opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml

@@ -23,19 +23,19 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
  <defaultcall function="allowed-tasks"/>
  <function name="allowed-tasks" scope="local">
    <block name="STAXCurrentFunction">    
      <try>
      <sequence>
        <script>
          CurrentTestPath['suite']=STAXCurrentFunction
        </script>
        <call function="'testSuite_Preamble'" />        
        

        <!--- Test Suite information
          #@TestSuiteName      Allowed tasks
          #@TestSuitePurpose   Control which tasks are allowed
@@ -46,7 +46,13 @@
          #@TestHTMLLink       http://opends.dev.java.net/
          -->
          

          <call function="'common_setup'">
            {
              'quickStart'    : True ,
              'startServer'   : True  ,
              'stopServer'    : False
            }
          </call>
         
                         
        <!--- Test Case information
@@ -100,10 +106,27 @@
            <call function="'testCase_Postamble'"/>
          </sequence>
        </testcase>
        
        
        <call function="'testSuite_Postamble'" />
      </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Tasks Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>

    </block>      
  </function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml

@@ -29,6 +29,7 @@
  <defaultcall function="backup_db"/>
  <function name="backup_db" scope="local">
    <block name="STAXCurrentFunction">    
      <try>
      <sequence>
        <script>
          CurrentTestPath['suite']=STAXCurrentFunction
@@ -46,6 +47,14 @@
          #@TestHTMLLink       http://opends.dev.java.net/
          -->

          <call function="'common_setup'">
            {
              'quickStart'    : True ,
              'startServer'   : True  ,
              'stopServer'    : False
            }
          </call>
  
          <!--- Test Case information
          #@TestMarker      Backup tasks
          #@TestName        Schedule a recurring Backup task
@@ -520,9 +529,25 @@
          </sequence>
        </testcase>

        
        <call function="'testSuite_Postamble'" />
      </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Tasks Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      </try>
    </block>      
  </function>
</stax>

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

@@ -29,6 +29,7 @@
  <defaultcall function="export-ldif"/>
  <function name="export-ldif" scope="local">
    <block name="STAXCurrentFunction">    
      <try>
      <sequence>
        <script>
          CurrentTestPath['suite']=STAXCurrentFunction
@@ -45,7 +46,13 @@
          #@TestHTMLLink       http://opends.dev.java.net/
          -->

          
          <call function="'common_setup'">
            {
              'quickStart'    : True ,
              'startServer'   : True  ,
              'stopServer'    : False
            }
          </call>            
                         
        <!--- Test Case information
          #@TestMarker       Export tasks
@@ -381,10 +388,26 @@
          </sequence>
        </testcase>

        
        
        <call function="'testSuite_Postamble'" />
      </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Tasks Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
    </block>      
  </function>
</stax>

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

@@ -29,6 +29,7 @@
  <defaultcall function="import-ldif"/>
  <function name="import-ldif" scope="local">
    <block name="STAXCurrentFunction">    
      <try>
      <sequence>
        <script>
          CurrentTestPath['suite']=STAXCurrentFunction
@@ -46,6 +47,13 @@
          #@TestHTMLLink        http://opends.dev.java.net/
          -->

            <call function="'common_setup'">
              {
                'quickStart'    : True ,
                'startServer'   : True  ,
                'stopServer'    : False
              }
            </call>
                   
        <!--- Test Case information
          #@TestMarker           Import Tasks
@@ -372,9 +380,26 @@
          </sequence>
        </testcase>

        
        <call function="'testSuite_Postamble'" />
      </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Tasks Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
    </block>      
  </function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml

@@ -29,6 +29,7 @@
  <defaultcall function="restart_db"/>
  <function name="restart_db" scope="local">
    <block name="STAXCurrentFunction">
      <try>
      <sequence>
        <script>
          CurrentTestPath['suite']=STAXCurrentFunction
@@ -46,6 +47,13 @@
          #@TestHTMLLink       http://opends.dev.java.net/
          -->

          <call function="'common_setup'">
            {
              'quickStart'    : True ,
              'startServer'   : True  ,
              'stopServer'    : False
            }
          </call>  

        <!--- Test Case information
          #@TestMarker          Restart tasks
@@ -136,9 +144,26 @@
          </sequence>
        </testcase>
        
        
        <call function="'testSuite_Postamble'" />
      </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Tasks Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
    </block>
  </function>
</stax>

 opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml

@@ -29,6 +29,7 @@
  <defaultcall function="restore_db"/>
  <function name="restore_db" scope="local">
    <block name="STAXCurrentFunction">    
      <try>
      <sequence>
        <script>
          CurrentTestPath['suite']=STAXCurrentFunction
@@ -46,6 +47,14 @@
          #@TestHTMLLink       http://opends.dev.java.net/
          -->
                         
          <call function="'common_setup'">
            {
              'quickStart'    : True ,
              'startServer'   : True  ,
              'stopServer'    : False
            }
          </call>
                           
        <!--- Test Case information
          #@TestMarker          Restore tasks
          #@TestName            Restore task in asynchronous mode
@@ -307,9 +316,26 @@
          </sequence>
        </testcase>


        <call function="'testSuite_Postamble'" />
      </sequence>
        <finally>
          <sequence>
            <!-- Test Suite Cleanup -->
            <message>'Finally: Tasks Cleanup.'</message>
            <try>
              <call function="'common_cleanup'" />
            <catch exception="'STAFException'">
              <sequence>
                <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
              </sequence>
            </catch>
            <finally>
              <call function="'testSuite_Postamble'"/>
            </finally>
            </try>
          </sequence>
        </finally>
      
      </try>
    </block>      
  </function>
</stax>

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

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

<!--
@@ -38,7 +38,9 @@
    <function-list-args>
      <function-required-arg name="STAXParentID"/>
    </function-list-args>

    <sequence>
      <try>
      <block name="'tasks'">
        <sequence>
          <!--- Load the job environment for the test group execution -->
@@ -49,30 +51,59 @@
          </call>
          <script>
            CurrentTestPath['group']='tasks'
              _group=CurrentTestPath['group']
          </script>
          
          <call function="'testGroup_Preamble'" />
          <script>
            testList = []
            testList.append('setup')
            testList.append('restart_db')
            testList.append('export-ldif')
            testList.append('import-ldif')
            testList.append('backup_db')
            testList.append('restore_db')
            testList.append('allowed-tasks')
            testList.append('cleanup')
              suiteList = []
              suiteList.append('restart_db')
              suiteList.append('export-ldif')
              suiteList.append('import-ldif')
              suiteList.append('backup_db')
              suiteList.append('restore_db')
              suiteList.append('allowed-tasks')
          </script>
          <iterate var="__test" in="testList" >
    
            <!-- Run the test suites -->
            <iterate  var="_suite" in="suiteList">
              <sequence>              
                <try>
            <sequence>
              <import machine="STAF_LOCAL_HOSTNAME"
                      file="'%s/testcases/tasks/%s.xml' % (TESTS_DIR,__test)"/>
              <call function="'%s' % __test" />
                      file="'%s/testcases/%s/%s.xml' % (TESTS_DIR,_group,_suite)"/> 
                    <call function="'%s' % (_suite)" />
                  </sequence>
                <catch exception="'STAFException.TestSuite.SetupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Setup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.MainException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Main part of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.CleanupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                </try>
            </sequence>
          </iterate>
          <call function="'testGroup_Postamble'" />
                                    
        </sequence>
      </block>
        <catch exception="'STAXException.TestGroupException'">
          <sequence>
            <message log="1" level="'fatal'">'Execution of Test Group Failed'</message>
          </sequence>
        </catch>        
        <finally>
          <!-- Test Group postamble -->
          <call function="'testGroup_Postamble'"/>
        </finally>
      </try>
    </sequence>
  </function>
</stax>

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

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

  <!-- This function sets up DS using the setup script -->
  <function name="SetUpDsWithScript">
  <function name="SetUpDsWithScript" scope="local">
    <function-prolog>
      This function sets up a Directory Server using a script
    </function-prolog>    
@@ -135,6 +135,12 @@
        </function-arg-description>
        <function-arg-property name="help" value="option"/>
      </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.
@@ -197,7 +203,7 @@
          'command'   : STAFCmd,
          'arguments' : STAFCmdParams,
          'path'      : dsPath,
          'expectedRC': 'noCheck',
          'expectedRC': expectedRC,
          'knownIssue': knownIssue
        }
      </call>
@@ -2893,7 +2899,9 @@
        </script>
        
        <!-- Copy the schema-task ldif to remote host -->
        <message>'Copy schema task ldif file.'</message>
        <message>
          'Copy schema task ldif file %s to %s.' % (tmpTaskLdif,taskLdif)
        </message>
        <call function="'copyFile'">
          { 'location'   : STAXServiceMachine,
            'srcfile'    : tmpTaskLdif,

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

@@ -147,6 +147,19 @@
          pathSeparator=':'
          newLine='\n'
      </script>

      <!-- Default LDAP Server Object -->
      <script>
        server=directory_server()
        server.location   = STAF_REMOTE_HOSTNAME
        server.host       = DIRECTORY_INSTANCE_HOST
        server.port       = DIRECTORY_INSTANCE_PORT
        server.adminport  = DIRECTORY_INSTANCE_ADMIN_PORT
        server.dn         = DIRECTORY_INSTANCE_DN
        server.password   = DIRECTORY_INSTANCE_PSWD
        server.suffix     = DIRECTORY_INSTANCE_SFX
        server.backend    = DIRECTORY_INSTANCE_BE
      </script>
      
      <!-- Default LDAP Server Object -->
      <script>

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

@@ -1693,7 +1693,7 @@
        <function-arg-property name="type" value="string" />
      </function-arg-def>
      
      <function-arg-def name="Help" type="optional">
      <function-arg-def name="dsHelp" type="optional">
        <function-arg-description>
          Help option
        </function-arg-description>

 opends/tests/staf-tests/shared/python/common.py

@@ -256,6 +256,7 @@
    self.port=''
    self.dn=''
    self.password=''
    self.suffix=''
    self.backend=''

  def location(self,location):