Use the Output tuple to determine the order of output

The attributes displayed is now dependant upon their definition in
a Param. This enhances that, giving some level of control over how
the result is displayed to the user.

This also fixes displaying group membership, including failures of
adding/removing entries.

All tests pass now though there is still one problem. We need to
return the dn as well. Once that is fixed we just need to comment
out all the dn entries in the tests and they should once again
pass.

1 files changed, 26 insertions, 6 deletions

diff --git a/ipalib/plugins/group.py b/ipalib/plugins/group.py
index 0cc42a7a6..a04330cc8 100644
--- a/ipalib/plugins/group.py
+++ b/ipalib/plugins/group.py
@@ -43,12 +43,12 @@ class group(LDAPObject):
     attribute_names = {
         'cn': 'name',
         'gidnumber': 'group id',
-        'member user': 'member users',
-        'member group': 'member groups',
-        'memberof group': 'member of groups',
-        'memberof netgroup': 'member of netgroups',
-        'memberof rolegroup': 'member of rolegroup',
-        'memberof taskgroup': 'member of taskgroup',
+        'member_user': 'member users',
+        'member_group': 'member groups',
+        'memberof_group': 'member of groups',
+        'memberof_netgroup': 'member of netgroups',
+        'memberof_rolegroup': 'member of rolegroup',
+        'memberof_taskgroup': 'member of taskgroup',
     }
     attribute_members = {
         'member': ['user', 'group'],
@@ -74,6 +74,26 @@ class group(LDAPObject):
             label='GID',
             doc='GID (use this option to set it manually)',
         ),
+        Str('member_group?',
+            label='Member Groups',
+            flags=['no_create', 'no_update', 'no_search'],
+        ),
+        Str('member_user?',
+            label='Member Users',
+            flags=['no_create', 'no_update', 'no_search'],
+        ),
+        Str('member?',
+            label='Failed Members',
+            flags=['no_create', 'no_update', 'no_search'],
+        ),
+        Str('user?',
+            label='Users',
+            flags=['no_create', 'no_update', 'no_search'],
+        ),
+        Str('group?',
+            label='Groups',
+            flags=['no_create', 'no_update', 'no_search'],
+        ),
     )
 
 api.register(group)