From f5eac9a33a1cb42528e346a4a58f0af7d7991060 Mon Sep 17 00:00:00 2001
From: smaguin <smaguin@localhost>
Date: Wed, 08 Aug 2007 14:51:56 +0000
Subject: [PATCH] in dsconfig function, replace parameters name
---
opends/tests/functional-tests/shared/functions/dsconfig.xml | 22 +++++-----
opends/tests/functional-tests/shared/functions/security.xml | 80 ++++++++++++++++++++--------------------
2 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/opends/tests/functional-tests/shared/functions/dsconfig.xml b/opends/tests/functional-tests/shared/functions/dsconfig.xml
index 101c617..ea8dcfc 100755
--- a/opends/tests/functional-tests/shared/functions/dsconfig.xml
+++ b/opends/tests/functional-tests/shared/functions/dsconfig.xml
@@ -25,6 +25,7 @@
!
! Portions Copyright 2006-2007 Sun Microsystems, Inc.
! -->
+
<stax>
<function name="_dsconfigCommonArgs">
@@ -207,6 +208,9 @@
</function>
+
+
+
<!-- generic wrapper on dsconfig -->
<!-- can be used to list, get or set a list of attribues -->
@@ -264,16 +268,16 @@
<function-arg-property name="type" value="string"/>
</function-arg-def>
- <function-arg-def name="propertyName" type="optional">
+ <function-arg-def name="objectType" type="optional">
<function-arg-description>
- Property type to modify, e.g. backend-name
+ Object type to modify, e.g. backend-name
</function-arg-description>
<function-arg-property name="type" value="string"/>
</function-arg-def>
- <function-arg-def name="propertyValue" type="optional">
+ <function-arg-def name="objectName" type="optional">
<function-arg-description>
- Property to modify, e.g. enabled
+ object name to modify, e.g. userroot
</function-arg-description>
<function-arg-property name="type" value="string"/>
</function-arg-def>
@@ -307,8 +311,8 @@
STAFCmdParamsList=[]
STAFCmdParamsList.append('%s' % (subcommand))
- if propertyName:
- STAFCmdParamsList.append('--%s "%s" ' % (propertyName,propertyValue))
+ if objectType:
+ STAFCmdParamsList.append('--%s "%s" ' % (objectType,objectName))
if optionsString:
STAFCmdParamsList.append(' %s' % (optionsString))
</script>
@@ -1780,8 +1784,4 @@
</sequence>
</function>
-
-
-
-
-</stax>
+</stax>
\ No newline at end of file
diff --git a/opends/tests/functional-tests/shared/functions/security.xml b/opends/tests/functional-tests/shared/functions/security.xml
index d343e87..ed8fa3e 100755
--- a/opends/tests/functional-tests/shared/functions/security.xml
+++ b/opends/tests/functional-tests/shared/functions/security.xml
@@ -518,8 +518,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-key-manager-prop' ,
- 'propertyName' : 'manager-name' ,
- 'propertyValue' : keystoreType,
+ 'objectType' : 'manager-name' ,
+ 'objectName' : keystoreType,
'optionsString' : '--set key-store-file:config/keystore --reset key-store-pin-file --set key-store-pin:%s --set enabled:true' % keystorePin,
'expectedRC' : 0 }
</call>
@@ -538,8 +538,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-trust-manager-prop' ,
- 'propertyName' : 'manager-name' ,
- 'propertyValue' : 'Blind Trust',
+ 'objectType' : 'manager-name' ,
+ 'objectName' : 'Blind Trust',
'optionsString' : '--set enabled:true' ,
'expectedRC' : 0 }
</call>
@@ -567,8 +567,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-connection-handler-prop' ,
- 'propertyName' : 'handler-name' ,
- 'propertyValue' : 'LDAPS Connection Handler',
+ 'objectType' : 'handler-name' ,
+ 'objectName' : 'LDAPS Connection Handler',
'optionsString' : optionsString,
'expectedRC' : 0 }
</call>
@@ -663,8 +663,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-key-manager-prop' ,
- 'propertyName' : 'manager-name' ,
- 'propertyValue' : keystoreType,
+ 'objectType' : 'manager-name' ,
+ 'objectName' : keystoreType,
'optionsString' : '--set key-store-file:config/keystore --reset key-store-pin-file --set key-store-pin:%s --set enabled:true' % keystorePin,
'expectedRC' : 0 }
</call>
@@ -683,8 +683,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-trust-manager-prop' ,
- 'propertyName' : 'manager-name' ,
- 'propertyValue' : 'Blind Trust',
+ 'objectType' : 'manager-name' ,
+ 'objectName' : 'Blind Trust',
'optionsString' : '--set enabled:true' ,
'expectedRC' : 0 }
</call>
@@ -711,8 +711,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-connection-handler-prop' ,
- 'propertyName' : 'handler-name' ,
- 'propertyValue' : 'LDAP Connection Handler',
+ 'objectType' : 'handler-name' ,
+ 'objectName' : 'LDAP Connection Handler',
'optionsString' : optionsString,
'expectedRC' : 0 }
</call>
@@ -809,8 +809,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-key-manager-prop' ,
- 'propertyName' : 'manager-name' ,
- 'propertyValue' : keystoreType,
+ 'objectType' : 'manager-name' ,
+ 'objectName' : keystoreType,
'optionsString' : '--set key-store-file:config/keystore --reset key-store-pin-file --set key-store-pin:%s --set enabled:true' % keystorePin,
'expectedRC' : 0 }
</call>
@@ -829,8 +829,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-trust-manager-prop' ,
- 'propertyName' : 'manager-name' ,
- 'propertyValue' : 'Blind Trust',
+ 'objectType' : 'manager-name' ,
+ 'objectName' : 'Blind Trust',
'optionsString' : '--set enabled:true' ,
'expectedRC' : 0 }
</call>
@@ -858,8 +858,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-connection-handler-prop' ,
- 'propertyName' : 'handler-name' ,
- 'propertyValue' : 'LDAPS Connection Handler',
+ 'objectType' : 'handler-name' ,
+ 'objectName' : 'LDAPS Connection Handler',
'optionsString' : optionsString,
'expectedRC' : 0 }
</call>
@@ -885,8 +885,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-connection-handler-prop' ,
- 'propertyName' : 'handler-name' ,
- 'propertyValue' : 'LDAP Connection Handler',
+ 'objectType' : 'handler-name' ,
+ 'objectName' : 'LDAP Connection Handler',
'optionsString' : optionsString,
'expectedRC' : 0 }
</call>
@@ -970,8 +970,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-connection-handler-prop' ,
- 'propertyName' : 'handler-name' ,
- 'propertyValue' : 'LDAPS Connection Handler',
+ 'objectType' : 'handler-name' ,
+ 'objectName' : 'LDAPS Connection Handler',
'optionsString' : '--set enabled:false',
'expectedRC' : 0 }
</call>
@@ -990,8 +990,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-trust-manager-prop' ,
- 'propertyName' : 'manager-name' ,
- 'propertyValue' : 'Blind Trust',
+ 'objectType' : 'manager-name' ,
+ 'objectName' : 'Blind Trust',
'optionsString' : '--set enabled:false' ,
'expectedRC' : 0 }
</call>
@@ -1010,8 +1010,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-key-manager-prop' ,
- 'propertyName' : 'manager-name' ,
- 'propertyValue' : keystoreType,
+ 'objectType' : 'manager-name' ,
+ 'objectName' : keystoreType,
'optionsString' : '--set enabled:false',
'expectedRC' : 0 }
</call>
@@ -1093,8 +1093,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-connection-handler-prop' ,
- 'propertyName' : 'handler-name' ,
- 'propertyValue' : 'LDAP Connection Handler',
+ 'objectType' : 'handler-name' ,
+ 'objectName' : 'LDAP Connection Handler',
'optionsString' : ' --set allow-start-tls:false',
'expectedRC' : 0 }
</call>
@@ -1112,8 +1112,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-trust-manager-prop' ,
- 'propertyName' : 'manager-name' ,
- 'propertyValue' : 'Blind Trust',
+ 'objectType' : 'manager-name' ,
+ 'objectName' : 'Blind Trust',
'optionsString' : '--set enabled:false' ,
'expectedRC' : 0 }
</call>
@@ -1132,8 +1132,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-key-manager-prop' ,
- 'propertyName' : 'manager-name' ,
- 'propertyValue' : keystoreType,
+ 'objectType' : 'manager-name' ,
+ 'objectName' : keystoreType,
'optionsString' : '--set enabled:false',
'expectedRC' : 0 }
</call>
@@ -1216,8 +1216,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-connection-handler-prop' ,
- 'propertyName' : 'handler-name' ,
- 'propertyValue' : 'LDAPS Connection Handler',
+ 'objectType' : 'handler-name' ,
+ 'objectName' : 'LDAPS Connection Handler',
'optionsString' : '--set enabled:false',
'expectedRC' : 0 }
</call>
@@ -1236,8 +1236,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-connection-handler-prop' ,
- 'propertyName' : 'handler-name' ,
- 'propertyValue' : 'LDAP Connection Handler',
+ 'objectType' : 'handler-name' ,
+ 'objectName' : 'LDAP Connection Handler',
'optionsString' : ' --set allow-start-tls:false',
'expectedRC' : 0 }
</call>
@@ -1256,8 +1256,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-trust-manager-prop' ,
- 'propertyName' : 'manager-name' ,
- 'propertyValue' : 'Blind Trust',
+ 'objectType' : 'manager-name' ,
+ 'objectName' : 'Blind Trust',
'optionsString' : '--set enabled:false' ,
'expectedRC' : 0 }
</call>
@@ -1276,8 +1276,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-key-manager-prop' ,
- 'propertyName' : 'manager-name' ,
- 'propertyValue' : keystoreType,
+ 'objectType' : 'manager-name' ,
+ 'objectName' : keystoreType,
'optionsString' : '--set enabled:false',
'expectedRC' : 0 }
</call>
--
Gitblit v1.10.0