From ec0d64368402dfa4ee260c94d0a50b44531527e6 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Mon, 07 Apr 2008 09:10:08 +0000
Subject: [PATCH] update ssl configuration
---
opendj-sdk/opends/tests/system-tests/phases/installation/installation_opends.xml | 2 +-
opendj-sdk/opends/tests/system-tests/phases/parser/parser.py | 14 +++++++-------
opendj-sdk/opends/tests/system-tests/phases/shared/functions/opendsadm.xml | 11 ++---------
opendj-sdk/opends/tests/system-tests/scenario/conf.dtd | 5 ++---
4 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/opendj-sdk/opends/tests/system-tests/phases/installation/installation_opends.xml b/opendj-sdk/opends/tests/system-tests/phases/installation/installation_opends.xml
index b23d365..6c740e6 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/installation/installation_opends.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/installation/installation_opends.xml
@@ -267,7 +267,7 @@
<!--== Setup product ==-->
- <if expr="instance.isSecurityEnabled() == 'false'">
+ <if expr="instance.isSslEnabled() == 'false'">
<call function="'SetUpDsWithScript'">
{
'location' : instance.getHost(),
diff --git a/opendj-sdk/opends/tests/system-tests/phases/parser/parser.py b/opendj-sdk/opends/tests/system-tests/phases/parser/parser.py
index 2585934..e1bcc81 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/parser/parser.py
+++ b/opendj-sdk/opends/tests/system-tests/phases/parser/parser.py
@@ -274,7 +274,7 @@
"Describes an opends Instance"
def __init__(self, iid, name, product, role, host, installDir, tarball, \
portLDAP, portLDAPS, portJMX, portREPL, \
- securityEnabled, certificate, startTlsEnabled):
+ sslEnabled, certificate, startTlsEnabled):
# from instance object
self.iid = iid
self.name = name
@@ -289,7 +289,7 @@
self.portJMX = portJMX
self.portREPL = portREPL
self.javaVersion = NOT_DEFINED
- self.securityEnabled = securityEnabled
+ self.sslEnabled = sslEnabled
self.certificate = certificate
self.startTlsEnabled = startTlsEnabled
@@ -308,8 +308,8 @@
def setJavaVersion(self,javaVersion):
self.javaVersion = javaVersion
- def isSecurityEnabled(self):
- return self.securityEnabled
+ def isSslEnabled(self):
+ return self.sslEnabled
def getCertificate(self):
return self.certificate
@@ -589,7 +589,7 @@
cPortLDAPS = '1636'
cPortJMX = '1390'
cPortREPL = '1391'
- cSecurityEnabled = 'false'
+ cSslEnabled = 'false'
cCertificate = NOT_DEFINED
cStartTlsEnabled = 'false'
@@ -644,7 +644,7 @@
elif (thisSubChild.getNodeType() == Node.ELEMENT_NODE and
thisSubChild.getNodeName() == 'security'):
- cSecurityEnabled = _getAttributeNode(thisSubChild,'enabled')
+ cSslEnabled = _getAttributeNode(thisSubChild,'sslEnabled')
cCertificate = _getAttributeNode(thisSubChild,'certificate')
cStartTlsEnabled = _getAttributeNode(thisSubChild,'startTlsEnabled')
@@ -670,7 +670,7 @@
return [msg,OpendsInstance(cId,cName,cProduct,cRole,cHost,cInstallDir,\
opendsZip,\
cPortLDAP,cPortLDAPS,cPortJMX,cPortREPL,\
- cSecurityEnabled,cCertificate,cStartTlsEnabled)]
+ cSslEnabled,cCertificate,cStartTlsEnabled)]
#============================================================================
diff --git a/opendj-sdk/opends/tests/system-tests/phases/shared/functions/opendsadm.xml b/opendj-sdk/opends/tests/system-tests/phases/shared/functions/opendsadm.xml
index efa8a56..4c25440 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/shared/functions/opendsadm.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/shared/functions/opendsadm.xml
@@ -113,8 +113,7 @@
</function-arg-def>
<function-arg-def name="dsCertificate" type="optional">
<function-arg-description>
- certificate mode: selfsigned,Pkcs11keyStore,Pkcs12keyStore,
- JavakeyStore,
+ certificate mode: generateSelfSigned
</function-arg-description>
<function-arg-property name="type" value="string"/>
</function-arg-def>
@@ -175,14 +174,8 @@
if dsCertificate:
dsCertificate = dsCertificate.lower()
- if dsCertificate == 'selfsigned':
+ if dsCertificate == 'generateSelfSigned':
STAFCmdParamsList.append('--generateSelfSignedCertificate')
- elif dsCertificate == 'pkcs11keystore':
- STAFCmdParamsList.append('--usePkcs11Keystore')
- elif dsCertificate == 'pkcs12keystore':
- STAFCmdParamsList.append('--usePkcs12keyStore')
- elif dsCertificate == 'javakeystore':
- STAFCmdParamsList.append('--useJavaKeystore')
STAFCmdParams=' '.join(STAFCmdParamsList)
</script>
diff --git a/opendj-sdk/opends/tests/system-tests/scenario/conf.dtd b/opendj-sdk/opends/tests/system-tests/scenario/conf.dtd
index 8219775..ecedfd5 100755
--- a/opendj-sdk/opends/tests/system-tests/scenario/conf.dtd
+++ b/opendj-sdk/opends/tests/system-tests/scenario/conf.dtd
@@ -55,9 +55,8 @@
<!ELEMENT replicationServer (#PCDATA)>
<!ELEMENT security EMPTY>
<!ATTLIST security
- enabled ( true | false ) "true"
- certificate ( selfSigned | Pkcs11keyStore | Pkcs12keyStore
- | JavakeyStore ) "selfSigned"
+ sslEnabled ( true | false ) "true"
+ certificate ( generateSelfSigned ) "generateSelfSigned"
startTlsEnabled ( true | false) "false">
--
Gitblit v1.10.0