From e5d57d237b4f146faf2e5c27d4e9eb3359dc15b3 Mon Sep 17 00:00:00 2001 From: Martin Kosek Date: Fri, 4 Feb 2011 14:03:30 +0100 Subject: HBAC plugin inconsistent output This patch adds a proper summary text to HBAC command which is then printed out in CLI. Now, HBAC plugin output is consistent with other plugins. https://fedorahosted.org/freeipa/ticket/596 --- ipalib/plugins/hbacrule.py | 37 +++++++++++++++++++++++++++---------- ipalib/plugins/hbacsvc.py | 14 ++++++++++---- ipalib/plugins/hbacsvcgroup.py | 10 +++++----- 3 files changed, 42 insertions(+), 19 deletions(-) (limited to 'ipalib') diff --git a/ipalib/plugins/hbacrule.py b/ipalib/plugins/hbacrule.py index b834a141..cb4dbb4f 100644 --- a/ipalib/plugins/hbacrule.py +++ b/ipalib/plugins/hbacrule.py @@ -211,6 +211,9 @@ class hbacrule_add(LDAPCreate): """ Create a new HBAC rule. """ + + msg_summary = _('Added HBAC rule "%(value)s"') + def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): # HBAC rules are enabled by default entry_attrs['ipaenabledflag'] = 'TRUE' @@ -224,6 +227,8 @@ class hbacrule_del(LDAPDelete): Delete an HBAC rule. """ + msg_summary = _('Deleted HBAC rule "%(value)s"') + api.register(hbacrule_del) @@ -232,6 +237,8 @@ class hbacrule_mod(LDAPUpdate): Modify an HBAC rule. """ + msg_summary = _('Modified HBAC rule "%(value)s"') + def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): try: (dn, entry_attrs) = ldap.get_entry(dn, attrs_list) @@ -256,6 +263,10 @@ class hbacrule_find(LDAPSearch): Search for HBAC rules. """ + msg_summary = ngettext( + '%(count)d HBAC rule matched', '%(count)d HBAC rules matched', 0 + ) + api.register(hbacrule_find) @@ -271,6 +282,10 @@ class hbacrule_enable(LDAPQuery): """ Enable an HBAC rule. """ + + msg_summary = _('Enabled HBAC rule "%(value)s"') + has_output = output.standard_value + def execute(self, cn): ldap = self.obj.backend @@ -284,11 +299,10 @@ class hbacrule_enable(LDAPQuery): except errors.NotFound: self.obj.handle_not_found(cn) - return dict(result=True) - - def output_for_cli(self, textui, result, cn): - textui.print_name(self.name) - textui.print_dashed('Enabled HBAC rule "%s".' % cn) + return dict( + result=True, + value=cn, + ) api.register(hbacrule_enable) @@ -297,6 +311,10 @@ class hbacrule_disable(LDAPQuery): """ Disable an HBAC rule. """ + + msg_summary = _('Disabled HBAC rule "%(value)s"') + has_output = output.standard_value + def execute(self, cn): ldap = self.obj.backend @@ -310,11 +328,10 @@ class hbacrule_disable(LDAPQuery): except errors.NotFound: self.obj.handle_not_found(cn) - return dict(result=True) - - def output_for_cli(self, textui, result, cn): - textui.print_name(self.name) - textui.print_dashed('Disabled HBAC rule "%s".' % cn) + return dict( + result=True, + value=cn, + ) api.register(hbacrule_disable) diff --git a/ipalib/plugins/hbacsvc.py b/ipalib/plugins/hbacsvc.py index 282f927c..3fe9f0fb 100644 --- a/ipalib/plugins/hbacsvc.py +++ b/ipalib/plugins/hbacsvc.py @@ -64,14 +64,14 @@ class hbacsvc(LDAPObject): Str('cn', cli_name='service', label=_('Service name'), - doc=_('HBAC Service'), + doc=_('HBAC service'), primary_key=True, normalizer=lambda value: value.lower(), ), Str('description?', cli_name='desc', label=_('Description'), - doc=_('Description of service'), + doc=_('HBAC service description'), ), ) @@ -82,7 +82,7 @@ class hbacsvc_add(LDAPCreate): """ Add a new HBAC service. """ - msg_summary = _('Added service "%(value)s"') + msg_summary = _('Added HBAC service "%(value)s"') api.register(hbacsvc_add) @@ -91,7 +91,7 @@ class hbacsvc_del(LDAPDelete): """ Delete an existing HBAC service. """ - msg_summary = _('Deleted service "%(value)s"') + msg_summary = _('Deleted HBAC service "%(value)s"') api.register(hbacsvc_del) @@ -101,6 +101,8 @@ class hbacsvc_mod(LDAPUpdate): Modify an HBAC service. """ + msg_summary = _('Modified HBAC service "%(value)s"') + api.register(hbacsvc_mod) @@ -109,6 +111,10 @@ class hbacsvc_find(LDAPSearch): Search for HBAC services. """ + msg_summary = ngettext( + '%(count)d HBAC service matched', '%(count)d HBAC services matched', 0 + ) + api.register(hbacsvc_find) diff --git a/ipalib/plugins/hbacsvcgroup.py b/ipalib/plugins/hbacsvcgroup.py index e2568076..0a66697d 100644 --- a/ipalib/plugins/hbacsvcgroup.py +++ b/ipalib/plugins/hbacsvcgroup.py @@ -61,7 +61,7 @@ class hbacsvcgroup(LDAPObject): 'member': ['hbacsvc'], } - label = _('HBAC Service Groups') + label = _('HBAC service Groups') takes_params = ( Str('cn', @@ -84,7 +84,7 @@ class hbacsvcgroup_add(LDAPCreate): """ Add a new HBAC services group. """ - msg_summary = _('Added HBAC Service group "%(value)s"') + msg_summary = _('Added HBAC service group "%(value)s"') api.register(hbacsvcgroup_add) @@ -93,7 +93,7 @@ class hbacsvcgroup_del(LDAPDelete): """ Delete an HBAC services group. """ - msg_summary = _('Deleted HBAC Service group "%(value)s"') + msg_summary = _('Deleted HBAC service group "%(value)s"') api.register(hbacsvcgroup_del) @@ -102,7 +102,7 @@ class hbacsvcgroup_mod(LDAPUpdate): """ Modify an HBAC services group. """ - msg_summary = _('Modified HBAC Service group "%(value)s"') + msg_summary = _('Modified HBAC service group "%(value)s"') api.register(hbacsvcgroup_mod) @@ -112,7 +112,7 @@ class hbacsvcgroup_find(LDAPSearch): Search for an HBAC services group. """ msg_summary = ngettext( - '%(count)d group matched', '%(count)d groups matched', 0 + '%(count)d HBAC service group matched', '%(count)d HBAC service groups matched', 0 ) api.register(hbacsvcgroup_find) -- cgit