On 03/27/2012 12:39 PM, Petr Vobornik wrote:
On 03/26/2012 10:27 PM, Rob Crittenden wrote:
Ondrej Hamada wrote:
On 03/19/2012 05:25 PM, Martin Kosek wrote:
On Tue, 2012-03-06 at 19:07 +0100, Ondrej Hamada wrote:
https://fedorahosted.org/freeipa/ticket/2354
There was added '(fallback)' string in the automember plugin labels
referring to automember default groups to point out, that the
users are
already members of default group specified in IPA config, thus the
default group specified in automember will be additional one - a
fallback group.
Hm, looks ok. Though I would also like some second opinion for this
change. I think naming it simply "Fallback Group" would be better, but
we cannot change the API at this stage and rename the parameter. So
this
change is a good compromise so far, IMO.
I found few issues though:
1) The label of default group parameter in automember has not been
updated, i.e. the following command still shows the old name:
# ipa automember-default-group-show --type=group
Default Group:
cn=editors,cn=groups,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com
2) I think we could fix few issues in docstrings since we touch these
strings anyway:
a) Typo in doc
- label=_('Default Group'),
- doc=_('Default group for entires to land'),
+ label=_('Default (fallback) Group'),
+ doc=_('Default (fallback) group for entires to land'),
b) Non-translatable strings:
- entry_attrs['automemberdefaultgroup'] = u'No default group
set'
+ entry_attrs['automemberdefaultgroup'] = u'No default
(fallback) group set'
- entry_attrs['automemberdefaultgroup'] = u'No default group
set'
+ entry_attrs['automemberdefaultgroup'] = u'No default
(fallback) group set'
Martin
fixed
Ondra
Petr, related to handling in the UI, do you look for the string "No
default group set' or just look for a string that isn't a dn?
rob
We are checking if the string looks like dn - if it contains 'cn='. If
not, we consider it as an error message.
Fixed issues with json serialization
--
Regards,
Ondrej Hamada
FreeIPA team
jabber: oh...@jabbim.cz
IRC: ohamada
From 89f28563ce57dd3e068fd2651b12df393399f402 Mon Sep 17 00:00:00 2001
From: Ondrej Hamada <oham...@redhat.com>
Date: Thu, 5 Apr 2012 17:42:41 +0200
Subject: [PATCH] Confusing default user groups
Added 'fallback' into the labels for default automember group and
hostgroup.
https://fedorahosted.org/freeipa/ticket/2354
---
ipalib/plugins/automember.py | 35 +++++++++++++++-----------
tests/test_xmlrpc/test_automember_plugin.py | 6 ++--
2 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/ipalib/plugins/automember.py b/ipalib/plugins/automember.py
index fabc9bb35a3803475ee1647aea264e29ea8a6f20..bf4cb355ced9760399bf05ceb3ef5d045570c0de 100644
--- a/ipalib/plugins/automember.py
+++ b/ipalib/plugins/automember.py
@@ -33,12 +33,17 @@ or exclusive regex paterns, you can automatically assign a new entries into
a group or hostgroup based upon attribute information.
A rule is directly associated with a group by name, so you cannot create
-a rule without an accompanying group or hostgroup
+a rule without an accompanying group or hostgroup.
A condition is a regular expression used by 389-ds to match a new incoming
entry with an automember rule. If it matches an inclusive rule then the
entry is added to the appropriate group or hostgroup.
+A default group or hostgroup could be specified for entries that do not
+match any rule. In case of user entries this group will be a fallback group
+because all users are by default members of group specified in IPA config.
+
+
EXAMPLES:
Add the initial group or hostgroup:
@@ -80,15 +85,15 @@ EXAMPLES:
Modify the automember rule:
ipa automember-mod
- Set the default target group:
+ Set the default (fallback) target group:
ipa automember-default-group-set --default-group=webservers --type=hostgroup
ipa automember-default-group-set --default-group=ipausers --type=group
- Remove the default target group:
+ Remove the default (fallback) target group:
ipa automember-default-group-remove --type=hostgroup
ipa automember-default-group-remove --type=group
- Show the default target group:
+ Show the default (fallback) target group:
ipa automember-default-group-show --type=hostgroup
ipa automember-default-group-show --type=group
@@ -173,7 +178,7 @@ class automember(LDAPObject):
),
Str('automemberdefaultgroup?',
cli_name='default_group',
- label=_('Default Group'),
+ label=_('Default (fallback) Group'),
doc=_('Default group for entries to land'),
flags=['no_create', 'no_update', 'no_search']
),
@@ -500,18 +505,18 @@ api.register(automember_show)
class automember_default_group_set(LDAPUpdate):
__doc__ = _("""
- Set default group for all unmatched entries.
+ Set default (fallback) group for all unmatched entries.
""")
takes_options = (
Str('automemberdefaultgroup',
cli_name='default_group',
- label=_('Default Group'),
- doc=_('Default group for entires to land'),
+ label=_('Default (fallback) Group'),
+ doc=_('Default (fallback) group for entries to land'),
flags=['no_create', 'no_update']
),
) + group_type
- msg_summary = _('Set default group for automember "%(value)s"')
+ msg_summary = _('Set default (fallback) group for automember "%(value)s"')
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
dn = DN(('cn', options['type']), api.env.container_automember)
@@ -529,11 +534,11 @@ api.register(automember_default_group_set)
class automember_default_group_remove(LDAPUpdate):
__doc__ = _("""
- Remove default group for all unmatched entries.
+ Remove default (fallback) group for all unmatched entries.
""")
takes_options = group_type
- msg_summary = _('Removed default group for automember "%(value)s"')
+ msg_summary = _('Removed default (fallback) group for automember "%(value)s"')
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
dn = DN(('cn', options['type']), api.env.container_automember)
@@ -545,14 +550,14 @@ class automember_default_group_remove(LDAPUpdate):
)
if attr not in entry_attrs_:
- raise errors.NotFound(reason=_(u'No default group set'))
+ raise errors.NotFound(reason=_(u'No default (fallback) group set'))
else:
entry_attrs[attr] = []
return dn
def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
if 'automemberdefaultgroup' not in entry_attrs:
- entry_attrs['automemberdefaultgroup'] = u'No default group set'
+ entry_attrs['automemberdefaultgroup'] = unicode(_('No default (fallback) group set'))
return dn
def execute(self, *keys, **options):
@@ -565,7 +570,7 @@ api.register(automember_default_group_remove)
class automember_default_group_show(LDAPRetrieve):
__doc__ = _("""
- Display information about the default automember groups.
+ Display information about the default (fallback) automember groups.
""")
takes_options = group_type
@@ -576,7 +581,7 @@ class automember_default_group_show(LDAPRetrieve):
def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
if 'automemberdefaultgroup' not in entry_attrs:
- entry_attrs['automemberdefaultgroup'] = u'No default group set'
+ entry_attrs['automemberdefaultgroup'] = unicode(_('No default (fallback) group set'))
return dn
def execute(self, *keys, **options):
diff --git a/tests/test_xmlrpc/test_automember_plugin.py b/tests/test_xmlrpc/test_automember_plugin.py
index 265c3af861b0bfd5ffa102e5fbb3a81857292996..b59899b4570aed663708bd0bd5145b040b72beb3 100644
--- a/tests/test_xmlrpc/test_automember_plugin.py
+++ b/tests/test_xmlrpc/test_automember_plugin.py
@@ -710,7 +710,7 @@ class test_automember(Declarative):
automemberdefaultgroup=[u'cn=%s,cn=groups,cn=accounts,%s' % (defaultgroup1, api.env.basedn)],
),
value=u'group',
- summary=u'Set default group for automember "group"',
+ summary=u'Set default (fallback) group for automember "group"',
),
),
@@ -733,7 +733,7 @@ class test_automember(Declarative):
dict(
- desc='Set default automember group for hostgroups',
+ desc='Set default (fallback) automember group for hostgroups',
command=(
'automember_default_group_set', [], dict(
type=u'hostgroup',
@@ -746,7 +746,7 @@ class test_automember(Declarative):
automemberdefaultgroup=[u'cn=%s,cn=hostgroups,cn=accounts,%s' % (defaulthostgroup1, api.env.basedn)],
),
value=u'hostgroup',
- summary=u'Set default group for automember "hostgroup"',
+ summary=u'Set default (fallback) group for automember "hostgroup"',
),
),
--
1.7.6.5
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
