From dffff6edabaffa68869444c07d8c9332782a16b0 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
---
opends/tests/functional-tests/shared/functions/dsadm.xml | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/opends/tests/functional-tests/shared/functions/dsadm.xml b/opends/tests/functional-tests/shared/functions/dsadm.xml
index 0117a26..4876b78 100755
--- a/opends/tests/functional-tests/shared/functions/dsadm.xml
+++ b/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">
--
Gitblit v1.10.0