Rename permissions and privileges to be more readable.

This also drops description from permissions since it seems redundant and
fixes up the help text a little.

ticket 792

2 files changed, 4 insertions, 20 deletions

diff --git a/tests/test_xmlrpc/test_permission_plugin.py b/tests/test_xmlrpc/test_permission_plugin.py
index 15f9c2708..be5d2befb 100644
--- a/tests/test_xmlrpc/test_permission_plugin.py
+++ b/tests/test_xmlrpc/test_permission_plugin.py
@@ -68,7 +68,7 @@ class test_permission(Declarative):
 
         dict(
             desc='Try to update non-existent %r' % permission1,
-            command=('permission_mod', [permission1], dict(description=u'Foo')),
+            command=('permission_mod', [permission1], dict(permissions=u'all')),
             expected=errors.NotFound(reason='no such entry'),
         ),
 
@@ -96,7 +96,6 @@ class test_permission(Declarative):
             desc='Create %r' % permission1,
             command=(
                 'permission_add', [permission1], dict(
-                     description=u'Test desc 1',
                      type=u'user',
                      permissions=u'write',
                 )
@@ -107,7 +106,6 @@ class test_permission(Declarative):
                 result=dict(
                     dn=permission1_dn,
                     cn=[permission1],
-                    description=[u'Test desc 1'],
                     objectclass=objectclasses.permission,
                     type=u'user',
                     permissions=[u'write'],
@@ -120,7 +118,6 @@ class test_permission(Declarative):
             desc='Try to create duplicate %r' % permission1,
             command=(
                 'permission_add', [permission1], dict(
-                     description=u'Test desc 1',
                      type=u'user',
                      permissions=u'write',
                 ),
@@ -178,7 +175,6 @@ class test_permission(Declarative):
                 result={
                     'dn': permission1_dn,
                     'cn': [permission1],
-                    'description': [u'Test desc 1'],
                     'member_privilege': [privilege1],
                     'type': u'user',
                     'permissions': [u'write'],
@@ -198,7 +194,6 @@ class test_permission(Declarative):
                     {
                         'dn': permission1_dn,
                         'cn': [permission1],
-                        'description': [u'Test desc 1'],
                         'member_privilege': [privilege1],
                         'type': u'user',
                         'permissions': [u'write'],
@@ -219,7 +214,6 @@ class test_permission(Declarative):
                     {
                         'dn': permission1_dn,
                         'cn': [permission1],
-                        'description': [u'Test desc 1'],
                         'member_privilege': [privilege1],
                         'type': u'user',
                         'permissions': [u'write'],
@@ -233,7 +227,6 @@ class test_permission(Declarative):
             desc='Create %r' % permission2,
             command=(
                 'permission_add', [permission2], dict(
-                     description=u'Test desc 2',
                      type=u'user',
                      permissions=u'write',
                 )
@@ -244,7 +237,6 @@ class test_permission(Declarative):
                 result=dict(
                     dn=permission2_dn,
                     cn=[permission2],
-                    description=[u'Test desc 2'],
                     objectclass=objectclasses.permission,
                     type=u'user',
                     permissions=[u'write'],
@@ -264,7 +256,6 @@ class test_permission(Declarative):
                     {
                         'dn': permission1_dn,
                         'cn': [permission1],
-                        'description': [u'Test desc 1'],
                         'member_privilege': [privilege1],
                         'type': u'user',
                         'permissions': [u'write'],
@@ -272,7 +263,6 @@ class test_permission(Declarative):
                     {
                         'dn': permission2_dn,
                         'cn': [permission2],
-                        'description': [u'Test desc 2'],
                         'type': u'user',
                         'permissions': [u'write'],
                     },
@@ -303,7 +293,7 @@ class test_permission(Declarative):
         dict(
             desc='Update %r' % permission1,
             command=(
-                'permission_mod', [permission1], dict(description=u'New desc 1')
+                'permission_mod', [permission1], dict(permissions=u'read')
             ),
             expected=dict(
                 value=permission1,
@@ -311,10 +301,9 @@ class test_permission(Declarative):
                 result=dict(
                     dn=permission1_dn,
                     cn=[permission1],
-                    description=[u'New desc 1'],
                     member_privilege=[privilege1],
                     type=u'user',
-                    permissions=[u'write'],
+                    permissions=[u'read'],
                 ),
             ),
         ),
@@ -329,10 +318,9 @@ class test_permission(Declarative):
                 result={
                     'dn': permission1_dn,
                     'cn': [permission1],
-                    'description': [u'New desc 1'],
                     'member_privilege': [privilege1],
                     'type': u'user',
-                    'permissions': [u'write'],
+                    'permissions': [u'read'],
                 },
             ),
         ),
diff --git a/tests/test_xmlrpc/test_privilege_plugin.py b/tests/test_xmlrpc/test_privilege_plugin.py
index 5b0bcc618..4c7556b8f 100644
--- a/tests/test_xmlrpc/test_privilege_plugin.py
+++ b/tests/test_xmlrpc/test_privilege_plugin.py
@@ -89,7 +89,6 @@ class test_privilege(Declarative):
             desc='Create %r' % permission1,
             command=(
                 'permission_add', [permission1], dict(
-                     description=u'Test desc 1',
                      type=u'user',
                      permissions=u'add, delete',
                 )
@@ -100,7 +99,6 @@ class test_privilege(Declarative):
                 result=dict(
                     dn=permission1_dn,
                     cn=[permission1],
-                    description=[u'Test desc 1'],
                     objectclass=objectclasses.permission,
                     type=u'user',
                     permissions=[u'add', u'delete'],
@@ -207,7 +205,6 @@ class test_privilege(Declarative):
             desc='Create %r' % permission2,
             command=(
                 'permission_add', [permission2], dict(
-                     description=u'Test desc 2',
                      type=u'user',
                      permissions=u'write',
                 )
@@ -218,7 +215,6 @@ class test_privilege(Declarative):
                 result=dict(
                     dn=permission2_dn,
                     cn=[permission2],
-                    description=[u'Test desc 2'],
                     objectclass=objectclasses.permission,
                     type=u'user',
                     permissions=[u'write'],