From c25d62965af9dffc655d659dfcd1f39e8d08e66c Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mon, 4 Oct 2010 17:45:40 -0400 Subject: Populate indirect members when showing a group object. This is done by creating a new attribute, memberindirect, to hold this indirect membership. The new function get_members() can return all members or just indirect or direct. We are only using it to retrieve indirect members currently. This also: * Moves all member display attributes into baseldap.py to reduce duplication * Adds netgroup nesting * Use a unique object name in hbacsvc and hbacsvcgroup ticket 296 --- ipalib/plugins/hbacsvcgroup.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'ipalib/plugins/hbacsvcgroup.py') diff --git a/ipalib/plugins/hbacsvcgroup.py b/ipalib/plugins/hbacsvcgroup.py index 70dd32b13..682a6c4e6 100644 --- a/ipalib/plugins/hbacsvcgroup.py +++ b/ipalib/plugins/hbacsvcgroup.py @@ -53,14 +53,17 @@ class hbacsvcgroup(LDAPObject): HBAC service group object. """ container_dn = api.env.container_hbacservicegroup - object_name = 'servicegroup' - object_name_plural = 'servicegroups' + object_name = 'hbacsvcgroup' + object_name_plural = 'hbacsvcgroups' object_class = ['ipaobject', 'ipahbacservicegroup'] - default_attributes = [ 'cn', 'description', 'member', 'memberof', ] + default_attributes = [ 'cn', 'description', 'member', 'memberof', + 'memberindirect', + ] uuid_attribute = 'ipauniqueid' attribute_members = { 'member': ['hbacsvc', 'hbacsvcgroup'], 'memberof': ['hbacsvcgroup'], + 'memberindirect': ['hbacsvc', 'hbacsvcgroup'], } label = _('HBAC Service Groups') @@ -77,18 +80,6 @@ class hbacsvcgroup(LDAPObject): label=_('Description'), doc=_('HBAC service group description'), ), - Str('member_service?', - label=_('Member services'), - flags=['no_create', 'no_update', 'no_search'], - ), - Str('member_servicegroup?', - label=_('Member service groups'), - flags=['no_create', 'no_update', 'no_search'], - ), - Str('memberof_servicegroup?', - label='Member of service groups', - flags=['no_create', 'no_update', 'no_search'], - ), ) api.register(hbacsvcgroup) -- cgit