From 26a7dda9971dea4b0509fc077286377e9f5b870e Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 19 Dec 2007 14:14:36 +0000
Subject: [PATCH] Fix issue 2451 part #2: https://opends.dev.java.net/issues/show_bug.cgi?id=2451
---
opends/src/admin/defn/org/opends/server/admin/std/RootConfiguration.xml | 2 +-
opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml | 36 ++++++++++++++++++------------------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/RootConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/RootConfiguration.xml
index 5adcdb1..a61c45e 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/RootConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/RootConfiguration.xml
@@ -184,7 +184,7 @@
</ldap:rdn-sequence>
</adm:profile>
<adm:profile name="cli">
- <cli:relation>
+ <cli:relation naming-argument-override="name">
<cli:default-property name="enabled" />
<cli:default-property name="attribute-type" />
</cli:relation>
diff --git a/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml b/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
index f979bf1..47bf4f3 100644
--- a/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
+++ b/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
@@ -109,7 +109,7 @@
'++++ Create user defined virtual attribute'
</message>
<script>
- arg1 = '--type user-defined --attribute-name %s' % cosName
+ arg1 = '--type user-defined --name %s' % cosName
arg2 = '--set enabled:true'
arg3 = '--set attribute-type:%s' % attributeName
arg4 = '--set value:"%s"' % attributeValue
@@ -180,7 +180,7 @@
</message>
<script>
attributeValue2 = 'Elvis'
- arg1 = '--attribute-name %s' % cosName
+ arg1 = '--name %s' % cosName
arg2 = '--set value:"%s"' % attributeValue2
myOptions = '%s %s' % (arg1,arg2)
</script>
@@ -230,7 +230,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
- 'optionsString' : '--attribute-name %s' % cosName,
+ 'optionsString' : '--name %s' % cosName,
'expectedRC' : 0
}
</call>
@@ -265,7 +265,7 @@
'++++ Create user defined virtual attribute'
</message>
<script>
- arg1 = '--type user-defined --attribute-name %s' % cosName
+ arg1 = '--type user-defined --name %s' % cosName
arg2 = '--set enabled:true'
arg3 = '--set attribute-type:%s' % attributeName
arg4 = '--set value:"%s"' % attributeValue
@@ -365,7 +365,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
- 'optionsString' : '--attribute-name %s' % cosName,
+ 'optionsString' : '--name %s' % cosName,
'expectedRC' : 0
}
</call>
@@ -400,7 +400,7 @@
'++++ Create user defined virtual attribute'
</message>
<script>
- arg1 = '--type user-defined --attribute-name %s' % cosName
+ arg1 = '--type user-defined --name %s' % cosName
arg2 = '--set enabled:true'
arg3 = '--set attribute-type:%s' % attributeName
arg4 = '--set value:"%s"' % attributeValue
@@ -470,7 +470,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
- 'optionsString' : '--attribute-name %s' % cosName
+ 'optionsString' : '--name %s' % cosName
}
</call>
@@ -503,7 +503,7 @@
'++++ Create user defined virtual attribute (disabled)'
</message>
<script>
- arg1 = '--type user-defined --attribute-name %s' % cosName
+ arg1 = '--type user-defined --name %s' % cosName
arg2 = '--set enabled:false'
arg3 = '--set attribute-type:%s' % attributeName
arg4 = '--set value:"%s"' % attributeValue
@@ -550,7 +550,7 @@
'++++ Enable user defined virtual attribute'
</message>
<script>
- myOptions = '--attribute-name %s --set enabled:true' % cosName
+ myOptions = '--name %s --set enabled:true' % cosName
</script>
<call function="'dsconfig'">
{
@@ -597,7 +597,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
- 'optionsString' : '--attribute-name %s' % cosName,
+ 'optionsString' : '--name %s' % cosName,
'expectedRC' : 0
}
</call>
@@ -632,7 +632,7 @@
conflict-behavior prop set to virtual-overrides-real'
</message>
<script>
- arg1 = '--type user-defined --attribute-name %s' % cosName
+ arg1 = '--type user-defined --name %s' % cosName
arg2 = '--set enabled:true'
arg3 = '--set attribute-type:%s' % attributeName
arg4 = '--set value:"%s"' % attributeValue
@@ -698,7 +698,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
- 'optionsString' : '--attribute-name %s' % cosName,
+ 'optionsString' : '--name %s' % cosName,
'expectedRC' : 0
}
</call>
@@ -734,7 +734,7 @@
conflict-behavior prop set to virtual-overrides-real'
</message>
<script>
- arg1 = '--type user-defined --attribute-name %s' % cosName
+ arg1 = '--type user-defined --name %s' % cosName
arg2 = '--set enabled:true'
arg3 = '--set attribute-type:%s' % attributeName
arg4 = '--set value:"%s"' % attributeValue
@@ -800,7 +800,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
- 'optionsString' : '--attribute-name %s' % cosName,
+ 'optionsString' : '--name %s' % cosName,
'expectedRC' : 0
}
</call>
@@ -835,7 +835,7 @@
conflict-behavior prop set to virtual-overrides-real'
</message>
<script>
- arg1 = '--type user-defined --attribute-name %s' % cosName
+ arg1 = '--type user-defined --name %s' % cosName
arg2 = '--set enabled:true'
arg3 = '--set attribute-type:%s' % attributeName
arg4 = '--set value:"%s"' % attributeValue
@@ -901,7 +901,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
- 'optionsString' : '--attribute-name %s' % cosName,
+ 'optionsString' : '--name %s' % cosName,
'expectedRC' : 0
}
</call>
@@ -936,7 +936,7 @@
'++++ Create user defined virtual attribute (disabled)'
</message>
<script>
- arg1 = '--type user-defined --attribute-name %s' % cosName
+ arg1 = '--type user-defined --name %s' % cosName
arg2 = '--set enabled:true'
arg3 = '--set attribute-type:%s' % attributeName
arg4 = '--set value:"%s"' % attributeValue
@@ -1013,7 +1013,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
- 'optionsString' : '--attribute-name %s' % cosName,
+ 'optionsString' : '--name %s' % cosName,
'expectedRC' : 0
}
</call>
--
Gitblit v1.10.0