sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-19 12:23:49 +03:00
Code Activity

netcmd: silo member: rename add and remove commands to grant and revoke

Browse Source 
Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Rob van der Linde
2023-11-08 09:20:59 +13:00
committed by Andrew Bartlett
parent 047ddb1001
commit fb2453d1a3
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
python/samba/netcmd/domain/auth/silo_member.py
View File

@@ -26,8 +26,8 @@ from samba.netcmd.domain.models import AuthenticationSilo, User
from samba.netcmd.domain.models.exceptions import ModelError from samba.netcmd.domain.models.exceptions import ModelError
class cmd_domain_auth_silo_member_add(Command): class cmd_domain_auth_silo_member_grant(Command):
"""Add a member to an authentication silo.""" """Add a member access to an authentication silo."""
synopsis = "%prog -H <URL> [options]" synopsis = "%prog -H <URL> [options]"
@@ -132,7 +132,7 @@ class cmd_domain_auth_silo_member_list(Command):
print(member.dn, file=self.outf) 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.""" """Remove a member from an authentication silo."""
synopsis = "%prog -H <URL> [options]" synopsis = "%prog -H <URL> [options]"
@@ -195,7 +195,7 @@ class cmd_domain_auth_silo_member(SuperCommand):
"""Manage members in an authentication silo.""" """Manage members in an authentication silo."""
subcommands = { subcommands = {
"add": cmd_domain_auth_silo_member_add(), "grant": cmd_domain_auth_silo_member_grant(),
"list": cmd_domain_auth_silo_member_list(), "list": cmd_domain_auth_silo_member_list(),
"remove": cmd_domain_auth_silo_member_remove(), "revoke": cmd_domain_auth_silo_member_revoke(),
} }

8
python/samba/tests/samba_tool/domain_auth_silo.py
View File

@@ -523,7 +523,7 @@ class AuthSiloMemberCmdTestCase(SiloTest):
def add_silo_member(self, silo, member): def add_silo_member(self, silo, member):
"""Add a member to an authentication silo.""" """Add a member to an authentication silo."""
result, out, err = self.runcmd("domain", "auth", "silo", result, out, err = self.runcmd("domain", "auth", "silo",
"member", "add", "member", "grant",
"--name", silo, "--member", member) "--name", silo, "--member", member)
self.assertIsNone(result, msg=err) self.assertIsNone(result, msg=err)
@@ -534,7 +534,7 @@ class AuthSiloMemberCmdTestCase(SiloTest):
def remove_silo_member(self, silo, member): def remove_silo_member(self, silo, member):
"""Remove a member to an authentication silo.""" """Remove a member to an authentication silo."""
result, out, err = self.runcmd("domain", "auth", "silo", result, out, err = self.runcmd("domain", "auth", "silo",
"member", "remove", "member", "revoke",
"--name", silo, "--member", member) "--name", silo, "--member", member)
self.assertIsNone(result, msg=err) 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. # Don't use self.add_silo_member as it will try to clean up the user.
result, out, err = self.runcmd("domain", "auth", "silo", result, out, err = self.runcmd("domain", "auth", "silo",
"member", "add", "member", "grant",
"--name", silo, "--name", silo,
"--member", computer) "--member", computer)
@@ -609,7 +609,7 @@ class AuthSiloMemberCmdTestCase(SiloTest):
def test_member_add__unknown_user(self): def test_member_add__unknown_user(self):
"""Test adding an unknown user to an authentication silo.""" """Test adding an unknown user to an authentication silo."""
result, out, err = self.runcmd("domain", "auth", "silo", result, out, err = self.runcmd("domain", "auth", "silo",
"member", "add", "member", "grant",
"--name", "Developers", "--name", "Developers",
"--member", "does_not_exist") "--member", "does_not_exist")