From 05af82b958fd02e854a0c055b9ba9bd58cebea9d Mon Sep 17 00:00:00 2001
From: smaguin <smaguin@localhost>
Date: Mon, 09 Jul 2007 13:53:04 +0000
Subject: [PATCH] replace configureSSL by the ldap call
---
opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml | 51 +++++++++++++++++++++----
opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml | 69 ++++++++++++++++++++++++++++++----
2 files changed, 103 insertions(+), 17 deletions(-)
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 d0be11e..7542b7e 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
@@ -97,18 +97,69 @@
'Security: PKCS12: Preamble Step 3. Configuring PKCS12 Keystore'
</message>
- <call function="'configureSSL'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ <!-- Configure SSL-->
+
+ <message>
+ '---- Configure SSL ----'
+ </message>
+
+ <!--- Enable Key Manager Provider -->
+ <message>
+ 'Enabling Key Manager Provider'
+ </message>
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'keystoreType' : '%s' % 'pkcs12' }
- </call>
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/security/pkcs12/setup/enable_key_mgr_provider.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
+ </call>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+
+ <!--- Enable Trust Manager Provider -->
+ <message>
+ 'Enabling 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/pkcs12/setup/enable_trust_mgr_provider.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
+ </call>
+
+
+ <!--- Enable LDAPS Connection Handler -->
+ <message>
+ 'Enabling LDAPS Connection Handler - Port number'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/security/ldaps_port.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
+ </call>
+
+ <!-- Enabling LDAPS Connection Handler - Keystore type -->
+ <message>
+ 'Enabling LDAPS Connection Handler - Keystore type'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/security/pkcs12/setup/enable_ldaps_conn_handler.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
+ </call>
+
<!--- Initial Search With SSL -->
<message>
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 c3c34b0..89e4963 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
@@ -78,18 +78,53 @@
'Security: PKCS12: Postamble Step 2. Unconfiguring PKCS12 Keystore'
</message>
- <call function="'unconfigureSSL'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ <!--- Unconfigure SSL -->
+
+
+ <!--- Disable LDAPS Connection Handler -->
+ <message>
+ 'Disabling LDAPS Connection Handler'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'keystoreType' : '%s' % 'pkcs12' }
- </call>
+ 'entryToBeModified' : '%s/security/pkcs12/teardown/disable_ldaps_conn_handler.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
+ </call>
- <call function="'checktestRC'">
- { '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/pkcs12/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/pkcs12/teardown/disable_key_mgr_provider.ldif' % (logsRemoteDataDir),
+ 'expectedRC' : 0 }
+ </call>
+
+
<!--- Remove PKCS12 Keystore -->
<message>
--
Gitblit v1.10.0