From 51fcca535236e309dc6431ad68bad36bf8f56823 Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Mon, 4 Nov 2019 13:29:40 +0100 Subject: [PATCH] ipaserver/plugins/hbacrule: Add HBAC to memberservice_hbacsvc* labels The labels for memberservice_hbacsvc and memberservice_hbacsvcgroup are only "Services" and "Service Groups" but they should be "HBAC Services" and "HBAC Service Groups". Reviewed-By: Christian Heimes Reviewed-By: Rob Crittenden --- ipaserver/plugins/hbacrule.py | 4 ++-- ipatests/test_integration/test_commands.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ipaserver/plugins/hbacrule.py b/ipaserver/plugins/hbacrule.py index da2852b2d..2601ebe03 100644 --- a/ipaserver/plugins/hbacrule.py +++ b/ipaserver/plugins/hbacrule.py @@ -283,11 +283,11 @@ class hbacrule(LDAPObject): flags=['no_create', 'no_update', 'no_search', 'no_option'], ), Str('memberservice_hbacsvc?', - label=_('Services'), + label=_('HBAC Services'), flags=['no_create', 'no_update', 'no_search'], ), Str('memberservice_hbacsvcgroup?', - label=_('Service Groups'), + label=_('HBAC Service Groups'), flags=['no_create', 'no_update', 'no_search'], ), external_host_param, diff --git a/ipatests/test_integration/test_commands.py b/ipatests/test_integration/test_commands.py index deb8f8290..f7f97dcc2 100644 --- a/ipatests/test_integration/test_commands.py +++ b/ipatests/test_integration/test_commands.py @@ -592,7 +592,7 @@ class TestIPACommand(IntegrationTest): assert 'User category: all' in lines assert 'Host category: all' in lines assert 'Enabled: TRUE' in lines - assert 'Services: systemd-user' in lines + assert 'HBAC Services: systemd-user' in lines assert 'accessruletype: allow' in lines # delete both @@ -616,7 +616,7 @@ class TestIPACommand(IntegrationTest): assert 'User category: all' in lines assert 'Host category: all' in lines assert 'Enabled: TRUE' in lines - assert 'Services: systemd-user' in lines + assert 'HBAC Services: systemd-user' in lines assert 'accessruletype: allow' in lines self.master.run_command(