From fb2453d1a36b11a98045e31927b8267c77edab69 Mon Sep 17 00:00:00 2001 From: Rob van der Linde Date: Wed, 8 Nov 2023 09:20:59 +1300 Subject: [PATCH] netcmd: silo member: rename add and remove commands to grant and revoke Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- python/samba/netcmd/domain/auth/silo_member.py | 10 +++++----- python/samba/tests/samba_tool/domain_auth_silo.py | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/python/samba/netcmd/domain/auth/silo_member.py b/python/samba/netcmd/domain/auth/silo_member.py index 99c41142787..3bd3d80134f 100644 --- a/python/samba/netcmd/domain/auth/silo_member.py +++ b/python/samba/netcmd/domain/auth/silo_member.py @@ -26,8 +26,8 @@ from samba.netcmd.domain.models import AuthenticationSilo, User from samba.netcmd.domain.models.exceptions import ModelError -class cmd_domain_auth_silo_member_add(Command): - """Add a member to an authentication silo.""" +class cmd_domain_auth_silo_member_grant(Command): + """Add a member access to an authentication silo.""" synopsis = "%prog -H [options]" @@ -132,7 +132,7 @@ class cmd_domain_auth_silo_member_list(Command): print(member.dn, file=self.outf) -class cmd_domain_auth_silo_member_remove(Command): +class cmd_domain_auth_silo_member_revoke(Command): """Remove a member from an authentication silo.""" synopsis = "%prog -H [options]" @@ -195,7 +195,7 @@ class cmd_domain_auth_silo_member(SuperCommand): """Manage members in an authentication silo.""" subcommands = { - "add": cmd_domain_auth_silo_member_add(), + "grant": cmd_domain_auth_silo_member_grant(), "list": cmd_domain_auth_silo_member_list(), - "remove": cmd_domain_auth_silo_member_remove(), + "revoke": cmd_domain_auth_silo_member_revoke(), } diff --git a/python/samba/tests/samba_tool/domain_auth_silo.py b/python/samba/tests/samba_tool/domain_auth_silo.py index cf9d5c1c3ac..c469d6637ee 100644 --- a/python/samba/tests/samba_tool/domain_auth_silo.py +++ b/python/samba/tests/samba_tool/domain_auth_silo.py @@ -523,7 +523,7 @@ class AuthSiloMemberCmdTestCase(SiloTest): def add_silo_member(self, silo, member): """Add a member to an authentication silo.""" result, out, err = self.runcmd("domain", "auth", "silo", - "member", "add", + "member", "grant", "--name", silo, "--member", member) self.assertIsNone(result, msg=err) @@ -534,7 +534,7 @@ class AuthSiloMemberCmdTestCase(SiloTest): def remove_silo_member(self, silo, member): """Remove a member to an authentication silo.""" result, out, err = self.runcmd("domain", "auth", "silo", - "member", "remove", + "member", "revoke", "--name", silo, "--member", member) self.assertIsNone(result, msg=err) @@ -597,7 +597,7 @@ class AuthSiloMemberCmdTestCase(SiloTest): # Don't use self.add_silo_member as it will try to clean up the user. result, out, err = self.runcmd("domain", "auth", "silo", - "member", "add", + "member", "grant", "--name", silo, "--member", computer) @@ -609,7 +609,7 @@ class AuthSiloMemberCmdTestCase(SiloTest): def test_member_add__unknown_user(self): """Test adding an unknown user to an authentication silo.""" result, out, err = self.runcmd("domain", "auth", "silo", - "member", "add", + "member", "grant", "--name", "Developers", "--member", "does_not_exist") -- 2.47.3