From edc0b026e35ca3a205bf2d037d7aa834cc87b183 Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Mon, 26 Sep 2011 15:48:31 +0000
Subject: [PATCH] Increase user load in LDAP PTA failover tests
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_postamble.xml | 65 ++++++
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta_setup.xml | 17 +
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic_tests.xml | 488 +++++++++++++++++++++++++++++------------------
3 files changed, 379 insertions(+), 191 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic_tests.xml
index f83eb3d..1f10d74 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic_tests.xml
@@ -1145,21 +1145,23 @@
#@TestPreamble Setup PTA
#@TestStep Configure LDAP PTA Policy using mapped-search-bind credentials
#@TestStep Read back the "authentication policy" object
- #@TestStep Add ds-pwp-password-policy-dn to users entry
- #@TestStep Search users entry as Directory Manager for operational attributes
- #@TestStep First search users entry as self
+ #@TestStep Add ds-pwp-password-policy-dn to users entries
+ #@TestStep Search users entries as Directory Manager for ds-pwp-password-policy-dn
+ #@TestStep First search users entries as self
#@TestStep Stop the primary remote ldap server
- #@TestStep Second search users entry as self.
- #@TestStep Modify the users entry
+ #@TestStep Second search users entries as self.
+ #@TestStep Modify the users entries
#@TestStep Restart the primary remote ldap server
- #@TestStep ds-pwp-password-policy-dn from users entry
- #@TestStep Remove LDAP PTA Authentication Policy
+ #@TestStep Wait for monitor heartbeat to primary remote ldap server
+ #@TestStep Third search users entries as self
+ #@TestStep Stop the secondary remote ldap server.
+ #@TestStep Fourth search users entries as self
#@TestPostamble Cleanup PTA
#@TestResult Test is successful if the result code is 0
-->
<function name="basic_pta_007" scope="local">
<testcase name="getTestCaseName('PTA failover')">
- <sequence>
+ <sequence>
<try>
<sequence>
<call function="'testCase_Preamble'"/>
@@ -1222,33 +1224,56 @@
</call>
<call function="'testStep'">
- { 'stepMessage' : 'Add ds-pwp-password-policy-dn to users entry.' }
+ { 'stepMessage' : 'Add ds-pwp-password-policy-dn to users entries.' }
</call>
+ <call function="'ldapSearchWithScript'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname() ,
+ 'dsInstancePort' : local_ldap_server.getPort(),
+ 'dsInstanceDn' : local_ldap_server.getRootDn(),
+ 'dsInstancePswd' : local_ldap_server.getRootPwd(),
+ 'dsBaseDN' : 'cn=PTA Remote Users,ou=groups,o=example' ,
+ 'dsScope' : 'base' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'uniquemember'
+ }
+ </call>
+
+ <message>
+ 'Result= %s' % STAXResult
+ </message>
+
<script>
- remotePTAuserName='uid=jvedder, ou=People, o=example'
- remotePTAuserPSWD='befitting'
ldapObject=[]
ldapObject.append('ds-pwp-password-policy-dn: %s' \
% ldapPtaPolicyDn)
</script>
- <call function="'modifyAnAttribute'">
- { 'location' : local_ldap_server.getHostname(),
- 'dsPath' : '%s/%s' \
- % (local_ldap_server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : local_ldap_server.getHostname() ,
- 'dsInstancePort' : local_ldap_server.getPort(),
- 'dsInstanceDn' : local_ldap_server.getRootDn(),
- 'dsInstancePswd' : local_ldap_server.getRootPwd(),
- 'DNToModify' : remotePTAuserName ,
- 'listAttributes' : ldapObject ,
- 'changetype' : 'add'
- }
- </call>
+ <iterate var="remotePTAuserName"
+ in="remotePTAuserDict.keys()"
+ indexvar="usernum">
+
+ <call function="'modifyAnAttribute'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname() ,
+ 'dsInstancePort' : local_ldap_server.getPort(),
+ 'dsInstanceDn' : local_ldap_server.getRootDn(),
+ 'dsInstancePswd' : local_ldap_server.getRootPwd(),
+ 'DNToModify' : remotePTAuserName ,
+ 'listAttributes' : ldapObject ,
+ 'changetype' : 'add'
+ }
+ </call>
+
+ </iterate>
<call function="'testStep'">
- { 'stepMessage' : 'Search users entry as Directory Manager for operational attributes.' }
+ { 'stepMessage' : 'Search users entries as Directory Manager for ds-pwp-password-policy-dn.' }
</call>
<call function="'ldapSearchWithScript'">
@@ -1259,28 +1284,34 @@
'dsInstancePort' : local_ldap_server.getPort(),
'dsInstanceDn' : local_ldap_server.getRootDn(),
'dsInstancePswd' : local_ldap_server.getRootPwd(),
- 'dsBaseDN' : remotePTAuserName ,
+ 'dsBaseDN' : remotePTAuserSuffix ,
'dsFilter' : 'objectclass=*' ,
- 'dsAttributes' : '+'
+ 'dsAttributes' : 'ds-pwp-password-policy-dn'
}
</call>
<call function="'testStep'">
- { 'stepMessage' : 'First search users entry as self.' }
+ { 'stepMessage' : 'First search users entries as self.' }
</call>
- <call function="'ldapSearchWithScript'">
- { 'location' : local_ldap_server.getHostname(),
- 'dsPath' : '%s/%s' \
- % (local_ldap_server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : local_ldap_server.getHostname() ,
- 'dsInstancePort' : local_ldap_server.getPort(),
- 'dsInstanceDn' : remotePTAuserName,
- 'dsInstancePswd' : remotePTAuserPSWD ,
- 'dsBaseDN' : remotePTAuserName ,
- 'dsFilter' : 'objectclass=*'
- }
- </call>
+ <iterate var="remotePTAuserName"
+ in="remotePTAuserDict.keys()"
+ indexvar="usernum">
+
+ <call function="'ldapSearchWithScript'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname() ,
+ 'dsInstancePort' : local_ldap_server.getPort(),
+ 'dsInstanceDn' : remotePTAuserName,
+ 'dsInstancePswd' : remotePTAuserDict[remotePTAuserName] ,
+ 'dsBaseDN' : remotePTAuserName ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+
+ </iterate>
<call function="'testStep'">
{ 'stepMessage' : 'Stop the primary remote ldap server.' }
@@ -1291,24 +1322,30 @@
</call>
<call function="'testStep'">
- { 'stepMessage' : 'Second search users entry as self.' }
+ { 'stepMessage' : 'Second search users entries as self.' }
</call>
- <call function="'ldapSearchWithScript'">
- { 'location' : local_ldap_server.getHostname(),
- 'dsPath' : '%s/%s' \
- % (local_ldap_server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : local_ldap_server.getHostname() ,
- 'dsInstancePort' : local_ldap_server.getPort(),
- 'dsInstanceDn' : remotePTAuserName,
- 'dsInstancePswd' : remotePTAuserPSWD ,
- 'dsBaseDN' : remotePTAuserName ,
- 'dsFilter' : 'objectclass=*'
- }
- </call>
+ <iterate var="remotePTAuserName"
+ in="remotePTAuserDict.keys()"
+ indexvar="usernum">
+
+ <call function="'ldapSearchWithScript'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname() ,
+ 'dsInstancePort' : local_ldap_server.getPort(),
+ 'dsInstanceDn' : remotePTAuserName,
+ 'dsInstancePswd' : remotePTAuserDict[remotePTAuserName] ,
+ 'dsBaseDN' : remotePTAuserName ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+
+ </iterate>
<call function="'testStep'">
- { 'stepMessage' : 'Modify the users entry.' }
+ { 'stepMessage' : 'Modify the users entries.' }
</call>
<script>
@@ -1316,19 +1353,25 @@
ldapObject.append('description: i am now a remote LDAP PTA user')
</script>
- <call function="'modifyAnAttribute'">
- { 'location' : local_ldap_server.getHostname(),
- 'dsPath' : '%s/%s' \
- % (local_ldap_server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : local_ldap_server.getHostname() ,
- 'dsInstancePort' : local_ldap_server.getPort(),
- 'dsInstanceDn' : remotePTAuserName,
- 'dsInstancePswd' : remotePTAuserPSWD,
- 'DNToModify' : remotePTAuserName ,
- 'listAttributes' : ldapObject ,
- 'changetype' : 'replace'
- }
- </call>
+ <iterate var="remotePTAuserName"
+ in="remotePTAuserDict.keys()"
+ indexvar="usernum">
+
+ <call function="'modifyAnAttribute'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname() ,
+ 'dsInstancePort' : local_ldap_server.getPort(),
+ 'dsInstanceDn' : remotePTAuserName,
+ 'dsInstancePswd' : remotePTAuserDict[remotePTAuserName],
+ 'DNToModify' : remotePTAuserName ,
+ 'listAttributes' : ldapObject ,
+ 'changetype' : 'replace'
+ }
+ </call>
+
+ </iterate>
<call function="'testStep'">
{ 'stepMessage' : 'Restart the primary remote ldap server.' }
@@ -1346,21 +1389,27 @@
</call>
<call function="'testStep'">
- { 'stepMessage' : 'Third search users entry as self.' }
+ { 'stepMessage' : 'Third search users entries as self.' }
</call>
- <call function="'ldapSearchWithScript'">
- { 'location' : local_ldap_server.getHostname(),
- 'dsPath' : '%s/%s' \
- % (local_ldap_server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : local_ldap_server.getHostname() ,
- 'dsInstancePort' : local_ldap_server.getPort(),
- 'dsInstanceDn' : remotePTAuserName,
- 'dsInstancePswd' : remotePTAuserPSWD ,
- 'dsBaseDN' : remotePTAuserName ,
- 'dsFilter' : 'objectclass=*'
- }
- </call>
+ <iterate var="remotePTAuserName"
+ in="remotePTAuserDict.keys()"
+ indexvar="usernum">
+
+ <call function="'ldapSearchWithScript'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname() ,
+ 'dsInstancePort' : local_ldap_server.getPort(),
+ 'dsInstanceDn' : remotePTAuserName,
+ 'dsInstancePswd' : remotePTAuserDict[remotePTAuserName] ,
+ 'dsBaseDN' : remotePTAuserName ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+
+ </iterate>
<call function="'testStep'">
{ 'stepMessage' : 'Stop the secondary remote ldap server.' }
@@ -1371,21 +1420,27 @@
</call>
<call function="'testStep'">
- { 'stepMessage' : 'Fourth search users entry as self.' }
+ { 'stepMessage' : 'Fourth search users entries as self.' }
</call>
- <call function="'ldapSearchWithScript'">
- { 'location' : local_ldap_server.getHostname(),
- 'dsPath' : '%s/%s' \
- % (local_ldap_server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : local_ldap_server.getHostname() ,
- 'dsInstancePort' : local_ldap_server.getPort(),
- 'dsInstanceDn' : remotePTAuserName,
- 'dsInstancePswd' : remotePTAuserPSWD ,
- 'dsBaseDN' : remotePTAuserName ,
- 'dsFilter' : 'objectclass=*'
- }
- </call>
+ <iterate var="remotePTAuserName"
+ in="remotePTAuserDict.keys()"
+ indexvar="usernum">
+
+ <call function="'ldapSearchWithScript'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname() ,
+ 'dsInstancePort' : local_ldap_server.getPort(),
+ 'dsInstanceDn' : remotePTAuserName,
+ 'dsInstancePswd' : remotePTAuserDict[remotePTAuserName] ,
+ 'dsBaseDN' : remotePTAuserName ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+
+ </iterate>
<call function="'testStep'">
{ 'stepMessage' : 'Start the secondary remote ldap server.' }
@@ -1404,7 +1459,7 @@
</catch>
<finally>
<sequence>
- <call function="'pta_postamble1'"/>
+ <call function="'pta_postamble3'"/>
<call function="'testCase_Postamble'"/>
</sequence>
</finally>
@@ -1421,21 +1476,23 @@
#@TestPreamble Setup PTA
#@TestStep Configure LDAP PTA Policy using mapped-search-bind credentials over ssl
#@TestStep Read back the "authentication policy" object
- #@TestStep Add ds-pwp-password-policy-dn to users entry
- #@TestStep Search users entry as Directory Manager for operational attributes
- #@TestStep First search users entry as self
+ #@TestStep Add ds-pwp-password-policy-dn to users entries
+ #@TestStep Search users entries as Directory Manager for ds-pwp-password-policy-dn
+ #@TestStep First search users entries as self
#@TestStep Stop the primary remote ldap server
- #@TestStep Second search users entry as self.
- #@TestStep Modify the users entry
+ #@TestStep Second search users entries as self.
+ #@TestStep Modify the users entries
#@TestStep Restart the primary remote ldap server
- #@TestStep ds-pwp-password-policy-dn from users entry
- #@TestStep Remove LDAP PTA Authentication Policy
+ #@TestStep Wait for monitor heartbeat to primary remote ldap server
+ #@TestStep Third search users entries as self
+ #@TestStep Stop the secondary remote ldap server.
+ #@TestStep Fourth search users entries as self
#@TestPostamble Cleanup PTA
#@TestResult Test is successful if the result code is 0
-->
<function name="basic_pta_008" scope="local">
<testcase name="getTestCaseName('PTA failover use-ssl')">
- <sequence>
+ <sequence>
<try>
<sequence>
<call function="'testCase_Preamble'"/>
@@ -1444,7 +1501,7 @@
</message>
<call function="'testStep'">
- { 'stepMessage' : 'Configure LDAP PTA Policy using mapped-search-bind credentials.' }
+ { 'stepMessage' : 'Configure LDAP PTA Policy using mapped-search-bind credentials over ssl.' }
</call>
<script>
@@ -1500,33 +1557,56 @@
</call>
<call function="'testStep'">
- { 'stepMessage' : 'Add ds-pwp-password-policy-dn to users entry.' }
+ { 'stepMessage' : 'Add ds-pwp-password-policy-dn to users entries.' }
</call>
+ <call function="'ldapSearchWithScript'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname() ,
+ 'dsInstancePort' : local_ldap_server.getPort(),
+ 'dsInstanceDn' : local_ldap_server.getRootDn(),
+ 'dsInstancePswd' : local_ldap_server.getRootPwd(),
+ 'dsBaseDN' : 'cn=PTA Remote Users,ou=groups,o=example' ,
+ 'dsScope' : 'base' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'uniquemember'
+ }
+ </call>
+
+ <message>
+ 'Result= %s' % STAXResult
+ </message>
+
<script>
- remotePTAuserName='uid=jvedder, ou=People, o=example'
- remotePTAuserPSWD='befitting'
ldapObject=[]
ldapObject.append('ds-pwp-password-policy-dn: %s' \
% ldapPtaPolicyDn)
</script>
- <call function="'modifyAnAttribute'">
- { 'location' : local_ldap_server.getHostname(),
- 'dsPath' : '%s/%s' \
- % (local_ldap_server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : local_ldap_server.getHostname() ,
- 'dsInstancePort' : local_ldap_server.getPort(),
- 'dsInstanceDn' : local_ldap_server.getRootDn(),
- 'dsInstancePswd' : local_ldap_server.getRootPwd(),
- 'DNToModify' : remotePTAuserName ,
- 'listAttributes' : ldapObject ,
- 'changetype' : 'add'
- }
- </call>
+ <iterate var="remotePTAuserName"
+ in="remotePTAuserDict.keys()"
+ indexvar="usernum">
+
+ <call function="'modifyAnAttribute'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname() ,
+ 'dsInstancePort' : local_ldap_server.getPort(),
+ 'dsInstanceDn' : local_ldap_server.getRootDn(),
+ 'dsInstancePswd' : local_ldap_server.getRootPwd(),
+ 'DNToModify' : remotePTAuserName ,
+ 'listAttributes' : ldapObject ,
+ 'changetype' : 'add'
+ }
+ </call>
+
+ </iterate>
<call function="'testStep'">
- { 'stepMessage' : 'Search users entry as Directory Manager for operational attributes.' }
+ { 'stepMessage' : 'Search users entries as Directory Manager for ds-pwp-password-policy-dn.' }
</call>
<call function="'ldapSearchWithScript'">
@@ -1537,28 +1617,34 @@
'dsInstancePort' : local_ldap_server.getPort(),
'dsInstanceDn' : local_ldap_server.getRootDn(),
'dsInstancePswd' : local_ldap_server.getRootPwd(),
- 'dsBaseDN' : remotePTAuserName ,
+ 'dsBaseDN' : remotePTAuserSuffix ,
'dsFilter' : 'objectclass=*' ,
- 'dsAttributes' : '+'
+ 'dsAttributes' : 'ds-pwp-password-policy-dn'
}
</call>
<call function="'testStep'">
- { 'stepMessage' : 'First search users entry as self.' }
+ { 'stepMessage' : 'First search users entries as self.' }
</call>
- <call function="'ldapSearchWithScript'">
- { 'location' : local_ldap_server.getHostname(),
- 'dsPath' : '%s/%s' \
- % (local_ldap_server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : local_ldap_server.getHostname() ,
- 'dsInstancePort' : local_ldap_server.getPort(),
- 'dsInstanceDn' : remotePTAuserName,
- 'dsInstancePswd' : remotePTAuserPSWD ,
- 'dsBaseDN' : remotePTAuserName ,
- 'dsFilter' : 'objectclass=*'
- }
- </call>
+ <iterate var="remotePTAuserName"
+ in="remotePTAuserDict.keys()"
+ indexvar="usernum">
+
+ <call function="'ldapSearchWithScript'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname() ,
+ 'dsInstancePort' : local_ldap_server.getPort(),
+ 'dsInstanceDn' : remotePTAuserName,
+ 'dsInstancePswd' : remotePTAuserDict[remotePTAuserName] ,
+ 'dsBaseDN' : remotePTAuserName ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+
+ </iterate>
<call function="'testStep'">
{ 'stepMessage' : 'Stop the primary remote ldap server.' }
@@ -1569,24 +1655,30 @@
</call>
<call function="'testStep'">
- { 'stepMessage' : 'Second search users entry as self.' }
+ { 'stepMessage' : 'Second search users entries as self.' }
</call>
- <call function="'ldapSearchWithScript'">
- { 'location' : local_ldap_server.getHostname(),
- 'dsPath' : '%s/%s' \
- % (local_ldap_server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : local_ldap_server.getHostname() ,
- 'dsInstancePort' : local_ldap_server.getPort(),
- 'dsInstanceDn' : remotePTAuserName,
- 'dsInstancePswd' : remotePTAuserPSWD ,
- 'dsBaseDN' : remotePTAuserName ,
- 'dsFilter' : 'objectclass=*'
- }
- </call>
+ <iterate var="remotePTAuserName"
+ in="remotePTAuserDict.keys()"
+ indexvar="usernum">
+
+ <call function="'ldapSearchWithScript'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname() ,
+ 'dsInstancePort' : local_ldap_server.getPort(),
+ 'dsInstanceDn' : remotePTAuserName,
+ 'dsInstancePswd' : remotePTAuserDict[remotePTAuserName] ,
+ 'dsBaseDN' : remotePTAuserName ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+
+ </iterate>
<call function="'testStep'">
- { 'stepMessage' : 'Modify the users entry.' }
+ { 'stepMessage' : 'Modify the users entries.' }
</call>
<script>
@@ -1594,19 +1686,25 @@
ldapObject.append('description: i am now a remote LDAP PTA user')
</script>
- <call function="'modifyAnAttribute'">
- { 'location' : local_ldap_server.getHostname(),
- 'dsPath' : '%s/%s' \
- % (local_ldap_server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : local_ldap_server.getHostname() ,
- 'dsInstancePort' : local_ldap_server.getPort(),
- 'dsInstanceDn' : remotePTAuserName,
- 'dsInstancePswd' : remotePTAuserPSWD,
- 'DNToModify' : remotePTAuserName ,
- 'listAttributes' : ldapObject ,
- 'changetype' : 'replace'
- }
- </call>
+ <iterate var="remotePTAuserName"
+ in="remotePTAuserDict.keys()"
+ indexvar="usernum">
+
+ <call function="'modifyAnAttribute'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname() ,
+ 'dsInstancePort' : local_ldap_server.getPort(),
+ 'dsInstanceDn' : remotePTAuserName,
+ 'dsInstancePswd' : remotePTAuserDict[remotePTAuserName],
+ 'DNToModify' : remotePTAuserName ,
+ 'listAttributes' : ldapObject ,
+ 'changetype' : 'replace'
+ }
+ </call>
+
+ </iterate>
<call function="'testStep'">
{ 'stepMessage' : 'Restart the primary remote ldap server.' }
@@ -1624,21 +1722,27 @@
</call>
<call function="'testStep'">
- { 'stepMessage' : 'Third search users entry as self.' }
+ { 'stepMessage' : 'Third search users entries as self.' }
</call>
- <call function="'ldapSearchWithScript'">
- { 'location' : local_ldap_server.getHostname(),
- 'dsPath' : '%s/%s' \
- % (local_ldap_server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : local_ldap_server.getHostname() ,
- 'dsInstancePort' : local_ldap_server.getPort(),
- 'dsInstanceDn' : remotePTAuserName,
- 'dsInstancePswd' : remotePTAuserPSWD ,
- 'dsBaseDN' : remotePTAuserName ,
- 'dsFilter' : 'objectclass=*'
- }
- </call>
+ <iterate var="remotePTAuserName"
+ in="remotePTAuserDict.keys()"
+ indexvar="usernum">
+
+ <call function="'ldapSearchWithScript'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname() ,
+ 'dsInstancePort' : local_ldap_server.getPort(),
+ 'dsInstanceDn' : remotePTAuserName,
+ 'dsInstancePswd' : remotePTAuserDict[remotePTAuserName] ,
+ 'dsBaseDN' : remotePTAuserName ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+
+ </iterate>
<call function="'testStep'">
{ 'stepMessage' : 'Stop the secondary remote ldap server.' }
@@ -1649,21 +1753,27 @@
</call>
<call function="'testStep'">
- { 'stepMessage' : 'Fourth search users entry as self.' }
+ { 'stepMessage' : 'Fourth search users entries as self.' }
</call>
- <call function="'ldapSearchWithScript'">
- { 'location' : local_ldap_server.getHostname(),
- 'dsPath' : '%s/%s' \
- % (local_ldap_server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : local_ldap_server.getHostname() ,
- 'dsInstancePort' : local_ldap_server.getPort(),
- 'dsInstanceDn' : remotePTAuserName,
- 'dsInstancePswd' : remotePTAuserPSWD ,
- 'dsBaseDN' : remotePTAuserName ,
- 'dsFilter' : 'objectclass=*'
- }
- </call>
+ <iterate var="remotePTAuserName"
+ in="remotePTAuserDict.keys()"
+ indexvar="usernum">
+
+ <call function="'ldapSearchWithScript'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname() ,
+ 'dsInstancePort' : local_ldap_server.getPort(),
+ 'dsInstanceDn' : remotePTAuserName,
+ 'dsInstancePswd' : remotePTAuserDict[remotePTAuserName] ,
+ 'dsBaseDN' : remotePTAuserName ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+
+ </iterate>
<call function="'testStep'">
{ 'stepMessage' : 'Start the secondary remote ldap server.' }
@@ -1682,7 +1792,7 @@
</catch>
<finally>
<sequence>
- <call function="'pta_postamble1'"/>
+ <call function="'pta_postamble3'"/>
<call function="'testCase_Postamble'"/>
</sequence>
</finally>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_postamble.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_postamble.xml
index 25c62f5..0675097 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_postamble.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_postamble.xml
@@ -115,5 +115,68 @@
</call>
</sequence>
- </function>
+ </function>
+
+ <function name="pta_postamble3">
+ <function-prolog>
+ Performs postamble for multi-user PTA tests
+ </function-prolog>
+ <function-no-args />
+ <sequence>
+
+ <call function="'testStep'">
+ { 'stepMessage' : 'Delete ds-pwp-password-policy-dn from users entry.' }
+ </call>
+
+ <script>
+ ldapObject=[]
+ ldapObject.append('ds-pwp-password-policy-dn: %s' \
+ % ldapPtaPolicyDn)
+ </script>
+
+ <iterate var="remotePTAuserName"
+ in="remotePTAuserDict.keys()"
+ indexvar="usernum">
+
+ <call function="'modifyAnAttribute'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname() ,
+ 'dsInstancePort' : local_ldap_server.getPort(),
+ 'dsInstanceDn' : local_ldap_server.getRootDn(),
+ 'dsInstancePswd' : local_ldap_server.getRootPwd(),
+ 'DNToModify' : remotePTAuserName ,
+ 'listAttributes' : ldapObject ,
+ 'changetype' : 'delete'
+ }
+ </call>
+
+ </iterate>
+
+ <call function="'testStep'">
+ { 'stepMessage' : 'Remove LDAP PTA Authentication Policy.' }
+ </call>
+
+ <script>
+ options=[]
+ options.append('--policy-name "%s"' % ldapPtaPolicyName)
+ dsconfigOptions=' '.join(options)
+ </script>
+
+ <call function="'dsconfig'">
+ { 'location' : local_ldap_server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (local_ldap_server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : local_ldap_server.getHostname(),
+ 'dsInstanceAdminPort' : local_ldap_server.getAdminPort(),
+ 'dsInstanceDn' : local_ldap_server.getRootDn(),
+ 'dsInstancePswd' : local_ldap_server.getRootPwd(),
+ 'subcommand' : 'delete-password-policy',
+ 'optionsString' : dsconfigOptions
+ }
+ </call>
+ </sequence>
+ </function>
+
</stax>
\ No newline at end of file
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta_setup.xml
index 2d0d276..a8347b2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta_setup.xml
@@ -50,7 +50,7 @@
<try>
<sequence>
-
+
<call function="'testCase_Preamble'"/>
<message>
@@ -86,6 +86,21 @@
secondaryHost = secondary_remote_ldap_server.getHostname()
secondaryPort = secondary_remote_ldap_server.getPort()
secondarySslPort = secondary_remote_ldap_server.getSslPort()
+
+ remotePTAuserDict = {}
+ remotePTAuserSuffix = 'ou=People, o=example'
+
+ # List of Remote LDAP PTA Users and Passwords
+ remotePTAuserDict['uid=jvedder, %s' % remotePTAuserSuffix] = 'befitting'
+ remotePTAuserDict['uid=tmorris, %s' % remotePTAuserSuffix] = 'irrefutable'
+ remotePTAuserDict['uid=ealexand, %s' % remotePTAuserSuffix] = 'galactose'
+ remotePTAuserDict['uid=tjames, %s' % remotePTAuserSuffix] = 'turtle'
+ remotePTAuserDict['uid=alangdon, %s' % remotePTAuserSuffix] = 'muzzle'
+ remotePTAuserDict['uid=pchassin, %s' % remotePTAuserSuffix] = 'barbital'
+ remotePTAuserDict['uid=aknutson, %s' % remotePTAuserSuffix] = 'maltose'
+ remotePTAuserDict['uid=pworrell, %s' % remotePTAuserSuffix] = 'solicitous'
+ remotePTAuserDict['uid=mtalbot, %s' % remotePTAuserSuffix] = 'currant'
+ remotePTAuserDict['uid=bwalker, %s' % remotePTAuserSuffix] = 'interruptible'
</script>
<!-- Get the local server store password from keystore.pin -->
--
Gitblit v1.10.0