From 09402f9c4cc2dcc66b2d40bd9aba6660813e5fa1 Mon Sep 17 00:00:00 2001
From: smaguin <smaguin@localhost>
Date: Fri, 06 Jul 2007 16:24:09 +0000
Subject: [PATCH] WS modification to use checktestRC
---
opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml | 20 -
opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml | 51 ---
opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml | 52 ---
opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml | 4
opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml | 60 ++-
opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml | 49 +--
opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml | 4
opends/tests/functional-tests/testcases/security/client_auth/client_auth.xml | 7
opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml | 37 +-
opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml | 44 --
opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml | 81 +++--
opends/tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml | 22 +
opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml | 70 +---
opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml | 32 +-
opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml | 11
opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml | 4
opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml | 20 -
opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml | 70 +---
opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml | 54 ---
opends/tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml | 50 ++-
opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml | 33 +
opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml | 33 +-
opends/tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml | 15
opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml | 4
24 files changed, 313 insertions(+), 514 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
index 4bfcf7a..34e1eb2 100755
--- a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
+++ b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
@@ -65,12 +65,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_policy.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_policy.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 0 }
</call>
<call function="'testCase_Postamble'"/>
@@ -107,12 +103,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_users.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_users.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 0 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: MD5 Policy - New User Binding with authPassword'
@@ -125,13 +119,10 @@
'dsInstancePswd' : 'gosling' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 0 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Auth Pwd Syntax: MD5 Policy - Old User Binding by userPassword'
</message>
@@ -143,14 +134,10 @@
'dsInstancePswd' : 'forsook' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -183,12 +170,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_user1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_user1.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 65 }
</call>
- <if expr="RC != 65">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: MD5 Policy - New User Binding with authPassword'
@@ -201,14 +186,10 @@
'dsInstancePswd' : 'hairball' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
@@ -242,12 +223,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_user2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_MD5_user2.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 21 }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: MD5 Policy - New User Binding with authPassword'
@@ -260,14 +239,10 @@
'dsInstancePswd' : 'hairball' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -300,12 +275,10 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'ou=MD5 auth tests,o=Auth Pwd Syntax Tests,dc=example,dc=com' ,
- 'extraParams' : '-x'}
+ 'extraParams' : '-x',
+ 'expectedRC' : 0 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: MD5 Policy Postamble - Admin deleting MD5 password policy'
@@ -316,13 +289,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
index fc3f37d..c63dcb8 100755
--- a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
+++ b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
@@ -65,13 +65,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -105,13 +102,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_users.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_users.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 0 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Auth Pwd Syntax: SHA1 Policy - New User Binding with authPassword'
</message>
@@ -123,12 +117,10 @@
'dsInstancePswd' : 'gosling' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 0 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: SHA1 Policy - Old User Binding by userPassword'
@@ -141,13 +133,10 @@
'dsInstancePswd' : 'forsook' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -180,12 +169,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 65 }
</call>
- <if expr="RC != 65">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: SHA1 Policy - New User Binding with authPassword'
@@ -198,14 +185,10 @@
'dsInstancePswd' : 'hairball' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -238,13 +221,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 21 }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Auth Pwd Syntax: SHA1 Policy - New User Binding with authPassword'
</message>
@@ -256,14 +236,10 @@
'dsInstancePswd' : 'hairball' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -295,13 +271,10 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'ou=SHA1 auth tests,o=Auth Pwd Syntax Tests,dc=example,dc=com' ,
- 'extraParams' : '-x'}
+ 'extraParams' : '-x',
+ 'expectedRC' : 0 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Auth Pwd Syntax: SHA1 Policy Postamble - Admin deleting SHA1 password policy'
</message>
@@ -311,13 +284,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
index 6726c64..8d023f1 100755
--- a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
+++ b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
@@ -68,10 +68,6 @@
'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -108,9 +104,6 @@
'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA256_users.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: SHA256 Policy - New User Binding with authPassword'
@@ -126,10 +119,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Auth Pwd Syntax: SHA256 Policy - Old User Binding by userPassword'
</message>
@@ -144,10 +133,7 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -180,12 +166,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 65 }
</call>
- <if expr="RC != 65">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: SHA256 Policy - New User Binding with authPassword'
@@ -198,14 +182,10 @@
'dsInstancePswd' : 'hairball' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -238,12 +218,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 21 }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: SHA256 Policy - New User Binding with authPassword'
@@ -256,14 +234,10 @@
'dsInstancePswd' : 'hairball' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -299,9 +273,6 @@
'extraParams' : '-x'}
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: SHA256 Policy Postamble - Admin deleting SHA256 password policy'
@@ -315,10 +286,6 @@
'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
index 3f214f7..21ca2a4 100755
--- a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
+++ b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
@@ -68,10 +68,6 @@
'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -108,9 +104,7 @@
'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA384_users.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
+
<message>
'Security: Auth Pwd Syntax: SHA384 Policy - New User Binding with authPassword'
@@ -126,9 +120,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: SHA384 Policy - Old User Binding by userPassword'
@@ -144,10 +135,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -180,12 +167,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 65 }
</call>
- <if expr="RC != 65">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: SHA384 Policy - New User Binding with authPassword'
@@ -198,14 +183,10 @@
'dsInstancePswd' : 'hairball' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -238,13 +219,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 21 }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Auth Pwd Syntax: SHA384 Policy - New User Binding with authPassword'
</message>
@@ -256,14 +234,11 @@
'dsInstancePswd' : 'hairball' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -299,9 +274,6 @@
'extraParams' : '-x'}
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: SHA384 Policy Postamble - Admin deleting SHA384 password policy'
@@ -315,10 +287,6 @@
'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
index 042d790..1f4bec8 100755
--- a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
+++ b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
@@ -68,10 +68,6 @@
'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -108,9 +104,6 @@
'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA512_users.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: SHA512 Policy - New User Binding with authPassword'
@@ -126,10 +119,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Auth Pwd Syntax: SHA512 Policy - Old User Binding by userPassword'
</message>
@@ -144,11 +133,7 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -181,12 +166,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 65 }
</call>
- <if expr="RC != 65">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: SHA512 Policy - New User Binding with authPassword'
@@ -199,14 +182,10 @@
'dsInstancePswd' : 'hairball' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
@@ -240,13 +219,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 21 }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Auth Pwd Syntax: SHA512 Policy - New User Binding with authPassword'
</message>
@@ -258,14 +234,10 @@
'dsInstancePswd' : 'hairball' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -301,10 +273,6 @@
'extraParams' : '-x'}
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Auth Pwd Syntax: SHA512 Policy Postamble - Admin deleting SHA512 password policy'
</message>
@@ -317,10 +285,6 @@
'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_del_new_policy.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
index 9d28c36..edcef63 100755
--- a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
+++ b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
@@ -64,13 +64,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/auth_pwd_syntax/admin_mod_def_policy.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/auth_pwd_syntax/admin_mod_def_policy.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -108,12 +105,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_def_users.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/auth_pwd_syntax/admin_add_def_users.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 0 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: New Policy - New User Binding with authPassword'
@@ -126,13 +121,10 @@
'dsInstancePswd' : 'gosling' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 0 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Auth Pwd Syntax: New Policy - Old User Binding by userPassword'
</message>
@@ -144,14 +136,10 @@
'dsInstancePswd' : 'forsook' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
@@ -185,12 +173,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/auth_pwd_syntax/admin_mod_def_policy2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/auth_pwd_syntax/admin_mod_def_policy2.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 0 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Auth Pwd Syntax: New Policy - New User Binding with authPassword'
@@ -203,13 +189,10 @@
'dsInstancePswd' : 'gosling' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Auth Pwd Syntax: New Policy - Old User Binding by userPassword'
</message>
@@ -221,12 +204,8 @@
'dsInstancePswd' : 'forsook' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 0 }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
index 9558f9c..f4ce85e 100755
--- a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
+++ b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
@@ -72,10 +72,6 @@
'entryToBeAdded' : '%s/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml
index 90221aa..86a3e1f 100755
--- a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml
+++ b/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml
@@ -69,10 +69,6 @@
'extraParams' : '-x'}
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml b/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
index 1e2dfcf..dae80e3 100755
--- a/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
+++ b/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
@@ -50,10 +50,6 @@
'extraParams' : '-s base -j %s/security/bind_no_pwd/bhall.pwd' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -72,14 +68,10 @@
'dsInstanceDn' : 'uid=bhall, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir }
+ 'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir,
+ 'expectedRC' : 53 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 53 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -100,10 +92,6 @@
'entryToBeModified' : '%s/security/bind_no_pwd/enable_bind_no_pwd.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -125,10 +113,6 @@
'extraParams' : '-s base -j %s/security/bind_no_pwd/bhall.pwd' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -150,10 +134,6 @@
'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -175,10 +155,7 @@
'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -200,10 +177,6 @@
'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -224,9 +197,6 @@
'entryToBeModified' : '%s/security/bind_no_pwd/disable_bind_no_pwd.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Bind No Pwd: Reset - Step 2. Check Reset'
@@ -238,14 +208,10 @@
'dsInstanceDn' : 'uid=bhall, ou=People, ou=password tests, o=Bind No Pwd Tests, dc=example,dc=com' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir }
+ 'extraParams' : '-s base -j %s/security/bind_no_pwd/null.pwd' % logsRemoteDataDir,
+ 'expectedRC' : 53 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 53 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml b/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
index 0214248..9ec5642 100755
--- a/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
+++ b/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
@@ -49,10 +49,6 @@
'entryToBeAdded' : '%s/security/bind_no_pwd/bind_no_pwd_startup.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml b/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml
index d3507f0..bb18948 100755
--- a/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml
+++ b/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml
@@ -51,10 +51,6 @@
'extraParams' : '-x'}
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/client_auth.xml b/opends/tests/functional-tests/testcases/security/client_auth/client_auth.xml
index a01ef46..4c9e6de 100755
--- a/opends/tests/functional-tests/testcases/security/client_auth/client_auth.xml
+++ b/opends/tests/functional-tests/testcases/security/client_auth/client_auth.xml
@@ -58,17 +58,20 @@
<!-- fingerprint certificates mapper -->
+
<import machine="'%s' % 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="'%s' % 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="'%s' % STAF_LOCAL_HOSTNAME"
file="'%s/testcases/security/client_auth/subject_attribute_mapper.xml' % (TESTS_DIR)"/>
<call function="'subject_attribute_mapper'" />
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml b/opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
index 112ca08..5f3ab13 100755
--- a/opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
+++ b/opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
@@ -313,7 +313,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/client_auth/setup/enable_key_mgr_provider.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/security/client_auth/setup/enable_key_mgr_provider.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
</call>
@@ -327,7 +328,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/client_auth/setup/enable_trust_mgr_provider.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/security/client_auth/setup/enable_trust_mgr_provider.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
</call>
@@ -341,7 +343,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/ldaps_port.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/security/ldaps_port.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
</call>
<!-- Enabling LDAPS Connection Handler - Keystore type -->
@@ -354,7 +357,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/client_auth/setup/enable_ldaps_conn_handler.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/security/client_auth/setup/enable_ldaps_conn_handler.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
</call>
@@ -368,7 +372,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/client_auth/setup/enable_startTLS.ldif' % (logsRemoteDataDir) }
+ 'entryToBeAdded' : '%s/security/client_auth/setup/enable_startTLS.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
</call>
@@ -386,7 +391,8 @@
'dsScope' : 'base',
'dsFilter' : 'objectclass=*' ,
'dsUseSSL' : ' ',
- 'dsTrustAll' : ' ' }
+ 'dsTrustAll' : ' ',
+ 'expectedRC' : 0 }
</call>
@@ -404,7 +410,8 @@
'dsScope' : 'base',
'dsFilter' : 'objectclass=*' ,
'dsUseStartTLS' : ' ',
- 'dsTrustAll' : ' ' }
+ 'dsTrustAll' : ' ',
+ 'expectedRC' : 0 }
</call>
@@ -460,7 +467,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'DNToAdd' : USER_1_DN,
- 'listAttributes' : listAttr }
+ 'listAttributes' : listAttr,
+ 'expectedRC' : 0 }
</call>
@@ -506,7 +514,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % remoteUser1LdifFile }
+ 'entryToBeModified' : '%s' % remoteUser1LdifFile,
+ 'expectedRC' : 0 }
</call>
<!-- Create USER_2_DN : this used contains the objectclass ds-certificate-user -->
@@ -534,7 +543,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'DNToAdd' : USER_2_DN,
- 'listAttributes' : listAttr }
+ 'listAttributes' : listAttr,
+ 'expectedRC' : 0 }
</call>
@@ -584,7 +594,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % remoteUser2LdifFile }
+ 'entryToBeModified' : '%s' % remoteUser2LdifFile,
+ 'expectedRC' : 0 }
</call>
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml b/opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
index d4280fa..656dd4f 100755
--- a/opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
+++ b/opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
@@ -77,7 +77,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/client_auth/teardown/disable_ldaps_conn_handler.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/security/client_auth/teardown/disable_ldaps_conn_handler.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
</call>
@@ -89,7 +90,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/client_auth/teardown/disable_trust_mgr_provider.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/security/client_auth/teardown/disable_trust_mgr_provider.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
</call>
@@ -104,7 +106,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/client_auth/teardown/disable_key_mgr_provider.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/security/client_auth/teardown/disable_key_mgr_provider.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
</call>
@@ -120,7 +123,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/client_auth/teardown/disable_startTLS.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/security/client_auth/teardown/disable_startTLS.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
</call>
@@ -144,7 +148,7 @@
'filename' : '%s/../config/keystore' % OPENDS_BINPATH }
</call>
- <call function="'checkRC'">
+ <call function="'checktestRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -161,7 +165,8 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : DIRECTORY_INSTANCE_SFX ,
'dsScope' : 'base',
- 'dsFilter' : 'objectclass=*' }
+ 'dsFilter' : 'objectclass=*' ,
+ 'expectedRC' : 0 }
</call>
<call function="'DeleteEntry'">
@@ -169,25 +174,20 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : USER_1_DN}
+ 'dsBaseDN' : USER_1_DN,
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'DeleteEntry'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : USER_2_DN}
+ 'dsBaseDN' : USER_2_DN,
+ 'expectedRC' : 0 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml b/opends/tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml
index 3e12a24..f773560 100755
--- a/opends/tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml
+++ b/opends/tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml
@@ -62,7 +62,8 @@
'DNToModify' : 'cn=EXTERNAL,cn=SASL Mechanisms,cn=config',
'attributeName' : 'ds-cfg-certificate-mapper-dn',
'newAttributeValue' : 'cn=Subject Equals DN,cn=Certificate Mappers,cn=config',
- 'changetype' : 'replace' }
+ 'changetype' : 'replace',
+ 'expectedRC' : 0 }
</call>
@@ -108,7 +109,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -135,7 +137,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -163,7 +166,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -190,7 +194,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
STAXCode = RC
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml b/opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
index b7fbe48..a925770 100755
--- a/opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
+++ b/opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
@@ -63,7 +63,8 @@
'DNToModify' : 'cn=EXTERNAL,cn=SASL Mechanisms,cn=config',
'attributeName' : 'ds-cfg-certificate-mapper-dn',
'newAttributeValue' : 'cn=Fingerprint Mapper,cn=Certificate Mappers,cn=config',
- 'changetype' : 'replace' }
+ 'changetype' : 'replace',
+ 'expectedRC' : 0 }
</call>
<call function="'testCase_Postamble'"/>
@@ -159,7 +160,8 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'DNToModify' : 'cn=Fingerprint Mapper,cn=Certificate Mappers,cn=config',
'listAttributes' : listAttr,
- 'changetype' : 'replace' }
+ 'changetype' : 'replace',
+ 'expectedRC' : 0 }
</call>
<!-- configure the user entries -->
@@ -175,7 +177,8 @@
'DNToModify' : USER_1_DN,
'attributeName' : 'ds-certificate-fingerprint',
'newAttributeValue' : MD5_fingerprint_cert1,
- 'changetype' : 'add' }
+ 'changetype' : 'add',
+ 'expectedRC' : 0 }
</call>
@@ -190,7 +193,8 @@
'DNToModify' : USER_2_DN,
'attributeName' : 'ds-certificate-fingerprint',
'newAttributeValue' : SHA1_fingerprint_cert2,
- 'changetype' : 'add' }
+ 'changetype' : 'add',
+ 'expectedRC' : 0 }
</call>
<!-- Check mapping is working -->
@@ -211,7 +215,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -240,7 +245,7 @@
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
'dsScope' : 'base',
- 'expected' : 49 }
+ 'expectedRC' : 49 }
</call>
@@ -261,7 +266,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -280,7 +286,7 @@
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : DIRECTORY_INSTANCE_SFX,
- 'dsFilter' : 'objectclass=*' ,
+ 'dsFilter' : 'objectclass=*' ,
'dsKeyStorePassword' : CLIENT_STOREPASS,
'dsUseStartTLS' : ' ',
'dsUseSASLExternal' : ' ',
@@ -289,7 +295,7 @@
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
'dsScope' : 'base',
- 'expected' : 49 }
+ 'expectedRC' : 49 }
</call>
<!-- Configure the mapper to map SHA1 fingerprint -->
@@ -308,7 +314,8 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'DNToModify' : 'cn=Fingerprint Mapper,cn=Certificate Mappers,cn=config',
'listAttributes' : listAttr,
- 'changetype' : 'replace' }
+ 'changetype' : 'replace',
+ 'expectedRC' : 0 }
</call>
@@ -328,7 +335,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -356,7 +364,7 @@
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
'dsScope' : 'base',
- 'expected' : 49 }
+ 'expectedRC' : 49 }
</call>
@@ -375,7 +383,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -403,7 +412,7 @@
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
'dsScope' : 'base',
- 'expected' : 49 }
+ 'expectedRC' : 49 }
</call>
<!-- Restore initial users configuration -->
@@ -417,7 +426,8 @@
'DNToModify' : USER_1_DN,
'attributeName' : 'ds-certificate-fingerprint',
'newAttributeValue' : MD5_fingerprint_cert1,
- 'changetype' : 'delete' }
+ 'changetype' : 'delete',
+ 'expectedRC' : 0 }
</call>
<call function="'modifyAnAttribute'">
@@ -428,7 +438,8 @@
'DNToModify' : USER_2_DN,
'attributeName' : 'ds-certificate-fingerprint',
'newAttributeValue' : SHA1_fingerprint_cert2,
- 'changetype' : 'delete' }
+ 'changetype' : 'delete',
+ 'expectedRC' : 0 }
</call>
@@ -533,7 +544,8 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'DNToModify' : 'cn=Fingerprint Mapper,cn=Certificate Mappers,cn=config',
'listAttributes' : listAttr,
- 'changetype' : 'replace' }
+ 'changetype' : 'replace',
+ 'expectedRC' : 0 }
</call>
<!-- configure the user entries -->
@@ -549,7 +561,8 @@
'DNToModify' : USER_1_DN,
'attributeName' : 'description',
'newAttributeValue' : MD5_fingerprint_cert1,
- 'changetype' : 'add' }
+ 'changetype' : 'add',
+ 'expectedRC' : 0 }
</call>
@@ -564,7 +577,8 @@
'DNToModify' : USER_2_DN,
'attributeName' : 'description',
'newAttributeValue' : SHA1_fingerprint_cert2,
- 'changetype' : 'add' }
+ 'changetype' : 'add' ,
+ 'expectedRC' : 0 }
</call>
<!-- Check mapping is working -->
@@ -585,7 +599,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -614,7 +629,7 @@
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
'dsScope' : 'base',
- 'expected' : 49 }
+ 'expectedRC' : 49 }
</call>
@@ -635,7 +650,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -663,7 +679,7 @@
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
'dsScope' : 'base',
- 'expected' : 49 }
+ 'expectedRC' : 49 }
</call>
<!-- Configure the mapper to map SHA1 fingerprint -->
@@ -682,7 +698,8 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'DNToModify' : 'cn=Fingerprint Mapper,cn=Certificate Mappers,cn=config',
'listAttributes' : listAttr,
- 'changetype' : 'replace' }
+ 'changetype' : 'replace',
+ 'expectedRC' : 0 }
</call>
@@ -702,7 +719,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -730,7 +748,7 @@
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
'dsScope' : 'base',
- 'expected' : 49 }
+ 'expectedRC' : 49 }
</call>
@@ -749,7 +767,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -777,7 +796,7 @@
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
'dsScope' : 'base',
- 'expected' : 49 }
+ 'expectedRC' : 49 }
</call>
<!-- Restore initial users configuration -->
@@ -791,7 +810,8 @@
'DNToModify' : USER_1_DN,
'attributeName' : 'description',
'newAttributeValue' : MD5_fingerprint_cert1,
- 'changetype' : 'delete' }
+ 'changetype' : 'delete',
+ 'expectedRC' : 0 }
</call>
<call function="'modifyAnAttribute'">
@@ -802,7 +822,8 @@
'DNToModify' : USER_2_DN,
'attributeName' : 'description',
'newAttributeValue' : SHA1_fingerprint_cert2,
- 'changetype' : 'delete' }
+ 'changetype' : 'delete',
+ 'expectedRC' : 0 }
</call>
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml b/opends/tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml
index 10056ee..a22f988 100755
--- a/opends/tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml
+++ b/opends/tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml
@@ -62,7 +62,8 @@
'DNToModify' : 'cn=EXTERNAL,cn=SASL Mechanisms,cn=config',
'attributeName' : 'ds-cfg-certificate-mapper-dn',
'newAttributeValue' : 'cn=Subject Attribute to User Attribute,cn=Certificate Mappers,cn=config',
- 'changetype' : 'replace' }
+ 'changetype' : 'replace',
+ 'expectedRC' : 0 }
</call>
@@ -114,7 +115,8 @@
'DNToModify' : 'cn=Subject Attribute to User Attribute,cn=Certificate Mappers,cn=config',
'attributeName' : 'ds-cfg-certificate-subject-attribute-mapping',
'newAttributeValue' : 'uid:description',
- 'changetype' : 'replace' }
+ 'changetype' : 'replace',
+ 'expectedRC' : 0 }
</call>
@@ -129,7 +131,8 @@
'DNToModify' : USER_1_DN,
'attributeName' : 'description',
'newAttributeValue' : USER_1_CERT,
- 'changetype' : 'add' }
+ 'changetype' : 'add',
+ 'expectedRC' : 0 }
</call>
@@ -146,7 +149,8 @@
'DNToModify' : USER_2_DN,
'attributeName' : 'description',
'newAttributeValue' : 'bad-certificate',
- 'changetype' : 'add' }
+ 'changetype' : 'add',
+ 'expectedRC' : 0 }
</call>
@@ -167,7 +171,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -195,7 +200,7 @@
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
'dsScope' : 'base',
- 'expected' : 49 }
+ 'expectedRC' : 49 }
</call>
@@ -215,7 +220,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -243,7 +249,7 @@
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
'dsScope' : 'base',
- 'expected' : 49 }
+ 'expectedRC' : 49 }
</call>
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml b/opends/tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml
index f9daae2..a199fa3 100755
--- a/opends/tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml
+++ b/opends/tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml
@@ -63,7 +63,8 @@
'DNToModify' : 'cn=EXTERNAL,cn=SASL Mechanisms,cn=config',
'attributeName' : 'ds-cfg-certificate-mapper-dn',
'newAttributeValue' : 'cn=Subject DN to User Attribute,cn=Certificate Mappers,cn=config',
- 'changetype' : 'replace' }
+ 'changetype' : 'replace',
+ 'expectedRC' : 0 }
</call>
<call function="'testCase_Postamble'"/>
@@ -108,7 +109,8 @@
'DNToModify' : USER_1_DN,
'attributeName' : 'ds-certificate-subject-dn',
'newAttributeValue' : USER_1_DN,
- 'changetype' : 'add' }
+ 'changetype' : 'add',
+ 'expectedRC' : 0 }
</call>
@@ -125,7 +127,8 @@
'DNToModify' : USER_2_DN,
'attributeName' : 'ds-certificate-subject-dn',
'newAttributeValue' : 'uid=bad-certificate',
- 'changetype' : 'add' }
+ 'changetype' : 'add',
+ 'expectedRC' : 0 }
</call>
@@ -146,7 +149,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -174,7 +178,7 @@
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
'dsScope' : 'base',
- 'expected' : 49 }
+ 'expectedRC' : 49 }
</call>
@@ -193,7 +197,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -221,7 +226,7 @@
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
'dsScope' : 'base',
- 'expected' : 49 }
+ 'expectedRC' : 49 }
</call>
@@ -235,7 +240,8 @@
'DNToModify' : USER_1_DN,
'attributeName' : 'ds-certificate-subject-dn',
'newAttributeValue' : USER_1_DN,
- 'changetype' : 'delete'}
+ 'changetype' : 'delete',
+ 'expectedRC' : 0 }
</call>
<call function="'modifyAnAttribute'">
@@ -246,7 +252,8 @@
'DNToModify' : USER_2_DN,
'attributeName' : 'ds-certificate-subject-dn',
'newAttributeValue' : 'uid=bad-certificate',
- 'changetype' : 'delete'}
+ 'changetype' : 'delete',
+ 'expectedRC' : 0 }
</call>
@@ -289,7 +296,8 @@
'DNToModify' : 'cn=Subject DN to User Attribute,cn=Certificate Mappers,cn=config',
'attributeName' : 'ds-cfg-certificate-subject-attribute-type',
'newAttributeValue' : 'description',
- 'changetype' : 'replace' }
+ 'changetype' : 'replace',
+ 'expectedRC' : 0 }
</call>
<message>'----- Configure the attribute ds-certificate-subject-dn for user %s ---' % USER_1_DN</message>
@@ -302,7 +310,8 @@
'DNToModify' : USER_1_DN,
'attributeName' : 'description',
'newAttributeValue' : 'bad_cert',
- 'changetype' : 'add' }
+ 'changetype' : 'add',
+ 'expectedRC' : 0 }
</call>
@@ -317,7 +326,8 @@
'DNToModify' : USER_2_DN,
'attributeName' : 'description',
'newAttributeValue' : USER_2_DN,
- 'changetype' : 'add' }
+ 'changetype' : 'add',
+ 'expectedRC' : 0 }
</call>
@@ -340,7 +350,7 @@
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
'dsScope' : 'base',
- 'expected' : 49 }
+ 'expectedRC' : 49 }
</call>
@@ -357,7 +367,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
</call>
<script>
@@ -387,7 +398,7 @@
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
'dsScope' : 'base',
- 'expected' : 49 }
+ 'expectedRC' : 49 }
</call>
@@ -404,7 +415,8 @@
'dsTrustStorePath' : CLIENT_KEYSTORE,
'dsKeyStorePath' : CLIENT_KEYSTORE,
'dsReportAuthzID' : ' ',
- 'dsScope' : 'base' }
+ 'dsScope' : 'base' ,
+ 'expectedRC' : 0 }
</call>
<script>
@@ -430,7 +442,8 @@
'DNToModify' : USER_1_DN,
'attributeName' : 'description',
'newAttributeValue' : 'bad_cert',
- 'changetype' : 'delete'}
+ 'changetype' : 'delete',
+ 'expectedRC' : 0 }
</call>
@@ -443,7 +456,8 @@
'DNToModify' : USER_2_DN,
'attributeName' : 'description',
'newAttributeValue' : USER_2_DN,
- 'changetype' : 'delete'}
+ 'changetype' : 'delete',
+ 'expectedRC' : 0 }
</call>
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml b/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
index 0fc9fe1..166e95a 100755
--- a/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
+++ b/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
@@ -71,10 +71,6 @@
'extraParams' : '-Z -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -110,10 +106,6 @@
'extraParams' : '-Z -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -149,10 +141,6 @@
'extraParams' : '-Z -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -188,10 +176,6 @@
'extraParams' : '-Z -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -227,10 +211,6 @@
'extraParams' : '-Z -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml b/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
index 976c8c3..170a9a7 100755
--- a/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
+++ b/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
@@ -68,26 +68,33 @@
'Security: JKS: Preamble Step 1. Generating Server Certicate'
</message>
- <call function="'genServerJKSCert'">
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+
+ <!-- create a server certificate -->
+
+ <call function="'genCertificate'">
+ { 'certAlias' : 'server-cert' ,
+ 'dname' : "cn=client,O=Sun Microsystems,C=US",
+ 'keystore' : 'keystore',
+ 'storepass' : 'servercert',
+ 'keypass' : 'servercert',
+ 'storetype' : 'JKS' }
+ </call>
+
<!--- Self-Sign Server Cert -->
<message>
'Security: JKS: Preamble Step 2. Self-Signing Server Certificate'
</message>
- <call function="'selfSignServerJKSCert'">
- </call>
+ <call function="'SelfSignCertificate'">
+ { 'certAlias' : 'server-cert' ,
+ 'storepass' : 'servercert',
+ 'keypass' : 'servercert',
+ 'keystore' : 'keystore',
+ 'storetype' : 'JKS' }
+ </call>
+
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<!--- Configure JKS Keystore -->
<message>
@@ -122,10 +129,6 @@
'extraParams' : '-Z -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml b/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
index e7feddf..455ac98 100755
--- a/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
+++ b/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
@@ -73,28 +73,50 @@
'extraParams' : '-Z -X -x' }
</call>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+ <!--- Disable LDAPS Connection Handler -->
+ <message>
+ 'Disabling LDAPS Connection Handler'
+ </message>
- <!--- Unconfigure JKS Keystore -->
- <message>
- 'Security: JKS: Postamble Step 2. Unconfiguring JKS Keystore'
- </message>
-
- <call function="'unconfigureSSL'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'keystoreType' : '%s' % 'jks' }
- </call>
+ 'entryToBeModified' : '%s/security/jks/teardown/disable_ldaps_conn_handler.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
+ </call>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+
+ <!--- Disable SSL Trust Manager Provider -->
+ <message> 'Disabling SSL Trust Manager Provider' </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/security/jks/teardown/disable_trust_mgr_provider.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
+ </call>
+
+
+
+ <!--- Disable Key Manager Provider -->
+ <message>
+ 'Disabling Key Manager Provider'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/security/jks/teardown/disable_key_mgr_provider.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
+ </call>
+
+
<!--- Remove JKS Keystore -->
<message>
@@ -125,10 +147,6 @@
'dsFilter' : 'objectclass=*' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml b/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
index 215145f..386c92e 100755
--- a/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
+++ b/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
@@ -70,10 +70,6 @@
'extraParams' : '-Z -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -109,10 +105,6 @@
'extraParams' : '-Z -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -148,10 +140,6 @@
'extraParams' : '-Z -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -187,10 +175,6 @@
'extraParams' : '-Z -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -226,10 +210,6 @@
'extraParams' : '-Z -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml b/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
index e878bb5..d0be11e 100755
--- a/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
+++ b/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
@@ -69,26 +69,28 @@
'Security: PKCS12: Preamble Step 1. Generating Server PKCS12 Certicate'
</message>
- <call function="'genServerPKCS12Cert'">
- </call>
+ <call function="'genCertificate'">
+ { 'certAlias' : 'server-cert' ,
+ 'dname' : "cn=client,O=Sun Microsystems,C=US",
+ 'keystore' : 'keystore',
+ 'storepass' : 'servercert',
+ 'keypass' : 'servercert',
+ 'storetype' : 'PKCS12' }
+ </call>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<!--- Self-Sign Server Cert -->
<message>
'Security: PKCS12: Preamble Step 2. Self-Signing Server PKCS12 Certicate'
</message>
+ <call function="'SelfSignCertificate'">
+ { 'certAlias' : 'server-cert' ,
+ 'storepass' : 'servercert',
+ 'keypass' : 'servercert',
+ 'keystore' : 'keystore',
+ 'storetype' : 'PKCS12' }
+ </call>
- <call function="'selfSignServerPKCS12Cert'">
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<!--- Configure PKCS12 Keystore -->
<message>
@@ -123,10 +125,7 @@
'extraParams' : '-Z -X' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml b/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
index d6769dd..c3c34b0 100755
--- a/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
+++ b/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
@@ -73,11 +73,6 @@
'extraParams' : '-Z -X -x' }
</call>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<!--- Unconfigure PKCS12 Keystore -->
<message>
'Security: PKCS12: Postamble Step 2. Unconfiguring PKCS12 Keystore'
@@ -91,7 +86,7 @@
'keystoreType' : '%s' % 'pkcs12' }
</call>
- <call function="'checkRC'">
+ <call function="'checktestRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
@@ -125,10 +120,6 @@
'dsFilter' : 'objectclass=*' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
--
Gitblit v1.10.0