From: Rob van der Linde <rob@catalyst.net.nz>
Date: Tue, 7 Nov 2023 20:10:14 +0000 (+1300)
Subject: netcmd: silo member: rename model methods to grant and revoke
X-Git-Tag: talloc-2.4.2~742
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abc3b50831307c22391d2a3abbfc70fad4ca1a1a;p=thirdparty%2Fsamba.git

netcmd: silo member: rename model methods 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 af5fbc0913b..99c41142787 100644
--- a/python/samba/netcmd/domain/auth/silo_member.py
+++ b/python/samba/netcmd/domain/auth/silo_member.py
@@ -71,7 +71,7 @@ class cmd_domain_auth_silo_member_add(Command):
 
         # Add member.
         try:
-            silo.add_member(ldb, user)
+            silo.grant(ldb, user)
         except ModelError as e:
             raise CommandError(e)
 
@@ -177,7 +177,7 @@ class cmd_domain_auth_silo_member_remove(Command):
 
         # Remove member.
         try:
-            silo.remove_member(ldb, user)
+            silo.revoke(ldb, user)
         except ModelError as e:
             raise CommandError(e)
 
diff --git a/python/samba/netcmd/domain/models/auth_silo.py b/python/samba/netcmd/domain/models/auth_silo.py
index 917e7dcafe6..ba1347153ac 100644
--- a/python/samba/netcmd/domain/models/auth_silo.py
+++ b/python/samba/netcmd/domain/models/auth_silo.py
@@ -53,7 +53,7 @@ class AuthenticationSilo(Model):
     def get_object_class():
         return "msDS-AuthNPolicySilo"
 
-    def add_member(self, ldb, member):
+    def grant(self, ldb, member):
         """Add a member to the Authentication Silo.
 
         Rather than saving the silo object and writing the entire member
@@ -76,7 +76,7 @@ class AuthenticationSilo(Model):
         # If the modify operation was successful refresh members field.
         self.refresh(ldb, fields=["members"])
 
-    def remove_member(self, ldb, member):
+    def revoke(self, ldb, member):
         """Remove a member from the Authentication Silo.
 
         Rather than saving the silo object and writing the entire member
@@ -94,7 +94,7 @@ class AuthenticationSilo(Model):
         try:
             ldb.modify(message)
         except LdbError as e:
-            raise RevokeMemberError(f"Failed to remove silo member: {e}")
+            raise RevokeMemberError(f"Failed to revoke silo member: {e}")
 
         # If the modify operation was successful refresh members field.
         self.refresh(ldb, fields=["members"])