From cc1c6f1cdffde42168e05c90c293261fedde8419 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Mon, 19 Feb 2007 14:25:34 +0000
Subject: [PATCH] Resolve issue 1242 configDS should allow params for root DN and password
---
opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml | 50 ++++++++--------
opendj-sdk/opends/tests/functional-tests/config/config.py | 2
opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml | 32 +++++-----
opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml | 50 ++++++++--------
4 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/config/config.py b/opendj-sdk/opends/tests/functional-tests/config/config.py
index f7f0690..ccf7108 100644
--- a/opendj-sdk/opends/tests/functional-tests/config/config.py
+++ b/opendj-sdk/opends/tests/functional-tests/config/config.py
@@ -24,7 +24,7 @@
DIRECTORY_INSTANCE_PORT = '1389'
DIRECTORY_INSTANCE_SSL_PORT = '1636'
DIRECTORY_INSTANCE_SFX = 'dc=com'
-DIRECTIRY_INSTANCE_BE = 'userRoot'
+DIRECTORY_INSTANCE_BE = 'userRoot'
STAGED_DATA_DIR = '%s/functional-tests/shared/data' % DIRECTORY_INSTANCE_DIR
JAVA_HOME = '/usr/jdk/jdk1.5.0_01'
SEND_MAIL_AFTER_TEST_RUN = 'FALSE'
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
index 0117a26..4876b78 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
@@ -32,18 +32,18 @@
This function configures a Directory Server
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstancePort" default="'%s' DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server port number
</function-required-arg>
- <function-required-arg name="dsInstanceSuffix" default="'%s' % DIRECTORY_INSTANCE_SFX" >
+ <function-optional-arg name="dsInstanceSuffix">
Directory Server suffix
- </function-required-arg>
- <function-required-arg name="dsInstanceDN" default="'%s' % DIRECTORY_INSTANCE_DN" >
+ </function-optional-arg>
+ <function-optional-arg name="dsInstanceDN" default="'%s' % DIRECTORY_INSTANCE_DN" >
Directory manager DN
- </function-required-arg>
- <function-required-arg name="dsInstancePassword" default="'%s' % DIRECTORY_INSTANCE_PSWD" >
+ </function-optional-arg>
+ <function-optional-arg name="dsInstancePassword" default="'%s' % DIRECTORY_INSTANCE_PSWD" >
Directory Server suffix
- </function-required-arg>
+ </function-optional-arg>
</function-map-args>
<sequence>
@@ -98,7 +98,7 @@
This function stops a Directory Server
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server port number
</function-required-arg>
<function-optional-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN" >
@@ -269,16 +269,16 @@
This function performs an on line import task of an ldif file
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-required-arg name="dsInstanceHost">
Directory Server host name
</function-required-arg>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server port number
</function-required-arg>
- <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+ <function-required-arg name="dsInstanceDn">
Directory Server Manager DN
</function-required-arg>
- <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+ <function-required-arg name="dsInstancePswd">
Directory Server Manager Password
</function-required-arg>
<function-required-arg name="taskID">
@@ -687,16 +687,16 @@
This function performs an on line export task of an ldif file
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-required-arg name="dsInstanceHost">
Directory Server host name
</function-required-arg>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server port number
</function-required-arg>
- <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+ <function-required-arg name="dsInstanceDn">
Directory Server Manager DN
</function-required-arg>
- <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+ <function-required-arg name="dsInstancePswd">
Directory Server Manager Password
</function-required-arg>
<function-required-arg name="taskID">
@@ -878,7 +878,7 @@
loopRC=1
</script>
- <scrip>
+ <script>
import re
searchre = re.compile('ds-task-state: COMPLETED_SUCCESSFULLY')
</script>
@@ -984,16 +984,16 @@
This function performs an on line backup task
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-required-arg name="dsInstanceHost">
Directory Server host name
</function-required-arg>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server port number
</function-required-arg>
- <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+ <function-required-arg name="dsInstanceDn">
Directory Server Manager DN
</function-required-arg>
- <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+ <function-required-arg name="dsInstancePswd">
Directory Server Manager Password
</function-required-arg>
<function-required-arg name="taskID">
@@ -1231,16 +1231,16 @@
This function performs an on line restore task of a backup file
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-required-arg name="dsInstanceHost">
Directory Server host name
</function-required-arg>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server port number
</function-required-arg>
- <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+ <function-required-arg name="dsInstanceDn">
Directory Server Manager DN
</function-required-arg>
- <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+ <function-required-arg name="dsInstancePswd">
Directory Server Manager Password
</function-required-arg>
<function-required-arg name="taskID">
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml
index 0825adf..9704df3 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml
@@ -31,16 +31,16 @@
This function adds an entry to the Directory Server
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-required-arg name="dsInstanceHost">
Directory Server Host Name
</function-required-arg>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server Port Number
</function-required-arg>
- <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+ <function-required-arg name="dsInstanceDn">
Directory Server Manager DN
</function-required-arg>
- <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+ <function-required-arg name="dsInstancePswd">
Directory Server Manager Password
</function-required-arg>
<function-required-arg name="entryToBeAdded">
@@ -77,16 +77,16 @@
This function modifies an entry in the Directory Server
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-required-arg name="dsInstanceHost">
Directory Server Host Name
</function-required-arg>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server Port Number
</function-required-arg>
- <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+ <function-required-arg name="dsInstanceDn">
Directory Server Manager DN
</function-required-arg>
- <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+ <function-required-arg name="dsInstancePswd">
Directory Server Manager Password
</function-required-arg>
<function-required-arg name="entryToBeModified">
@@ -123,16 +123,16 @@
This function searches the Directory Server with optional arguments possible
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-required-arg name="dsInstanceHost">
Directory Server Host Name
</function-required-arg>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server Port Number
</function-required-arg>
- <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+ <function-required-arg name="dsInstanceDn">
Directory Server Manager DN
</function-required-arg>
- <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+ <function-required-arg name="dsInstancePswd">
Directory Server Manager Password
</function-required-arg>
<function-required-arg name="dsBaseDN">
@@ -172,13 +172,13 @@
This function searches the Directory Server with optional arguments possible
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-required-arg name="dsInstanceHost">
Directory Server Host Name
</function-required-arg>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server Port Number
</function-required-arg>
- <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+ <function-required-arg name="dsInstanceDn">
Directory Server Manager DN
</function-required-arg>
<function-required-arg name="dsBaseDN">
@@ -214,10 +214,10 @@
This function searches the Directory Server anonymously with optional arguments possible
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-required-arg name="dsInstanceHost">
Directory Server Host Name
</function-required-arg>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server Port Number
</function-required-arg>
<function-required-arg name="dsBaseDN">
@@ -253,16 +253,16 @@
This function an entry in the Directory Server
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-required-arg name="dsInstanceHost">
Directory Server Host Name
</function-required-arg>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server Port Number
</function-required-arg>
- <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+ <function-required-arg name="dsInstanceDn">
Directory Server Manager DN
</function-required-arg>
- <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+ <function-required-arg name="dsInstancePswd">
Directory Server Manager Password
</function-required-arg>
<function-required-arg name="dsBaseDN">
@@ -299,16 +299,16 @@
This function compares the attribute and value an entry to the Directory Server
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-required-arg name="dsInstanceHost">
Directory Server Host Name
</function-required-arg>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server Port Number
</function-required-arg>
- <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+ <function-required-arg name="dsInstanceDn">
Directory Server Manager DN
</function-required-arg>
- <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+ <function-required-arg name="dsInstancePswd">
Directory Server Manager Password
</function-required-arg>
<function-required-arg name="attrToBeCompared">
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml
index d5ac1c8..5431cb8 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml
@@ -31,16 +31,16 @@
This function makes the configuration changes for SSL
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-required-arg name="dsInstanceHost">
Directory Server Host Name
</function-required-arg>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server Port Number
</function-required-arg>
- <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+ <function-required-arg name="dsInstanceDn">
Directory Server Manager DN
</function-required-arg>
- <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+ <function-required-arg name="dsInstancePswd">
Directory Server Manager Password
</function-required-arg>
<function-required-arg name="keystoreType">
@@ -125,16 +125,16 @@
This function makes the configuration changes for startTLS
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-required-arg name="dsInstanceHost">
Directory Server Host Name
</function-required-arg>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server Port Number
</function-required-arg>
- <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+ <function-required-arg name="dsInstanceDn">
Directory Server Manager DN
</function-required-arg>
- <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+ <function-required-arg name="dsInstancePswd">
Directory Server Manager Password
</function-required-arg>
<function-required-arg name="keystoreType">
@@ -224,16 +224,16 @@
This function reverses the configuration changes for SSL
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-required-arg name="dsInstanceHost">
Directory Server Host Name
</function-required-arg>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server Port Number
</function-required-arg>
- <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+ <function-required-arg name="dsInstanceDn">
Directory Server Manager DN
</function-required-arg>
- <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+ <function-required-arg name="dsInstancePswd">
Directory Server Manager Password
</function-required-arg>
<function-required-arg name="keystoreType">
@@ -323,16 +323,16 @@
This function reverses the configuration changes for startTLS
</function-prolog>
<function-map-args>
- <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-required-arg name="dsInstanceHost">
Directory Server Host Name
</function-required-arg>
- <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-required-arg name="dsInstancePort">
Directory Server Port Number
</function-required-arg>
- <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+ <function-required-arg name="dsInstanceDn">
Directory Server Manager DN
</function-required-arg>
- <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+ <function-required-arg name="dsInstancePswd">
Directory Server Manager Password
</function-required-arg>
<function-required-arg name="keystoreType">
--
Gitblit v1.10.0