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

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>

diff --git a/python/samba/netcmd/domain/auth/silo_member.py b/python/samba/netcmd/domain/auth/silo_member.py
index 99c41142787e0b7f63970b49862cd27908f397c4..3bd3d80134fef8c9c3393c5fd1468f085f82e09a 100644 (file)
--- 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 <URL> [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 <URL> [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 cf9d5c1c3aceff94cf14f59ab3134001aa84f51f..c469d6637eef94b443e280cbec0960c2b3387bc6 100644 (file)
--- 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")