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

netcmd: silo member: rename exceptions 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/models/auth_silo.py b/python/samba/netcmd/domain/models/auth_silo.py
index 28d94e64fa3..917e7dcafe6 100644
--- a/python/samba/netcmd/domain/models/auth_silo.py
+++ b/python/samba/netcmd/domain/models/auth_silo.py
@@ -24,7 +24,7 @@ from ldb import FLAG_MOD_ADD, FLAG_MOD_DELETE, LdbError, Message, MessageElement
 
 from samba.sd_utils import escaped_claim_id
 
-from .exceptions import AddMemberError, RemoveMemberError
+from .exceptions import GrantMemberError, RevokeMemberError
 from .fields import DnField, BooleanField, StringField
 from .model import Model
 
@@ -71,7 +71,7 @@ class AuthenticationSilo(Model):
         try:
             ldb.modify(message)
         except LdbError as e:
-            raise AddMemberError(f"Failed to add silo member: {e}")
+            raise GrantMemberError(f"Failed to add silo member: {e}")
 
         # If the modify operation was successful refresh members field.
         self.refresh(ldb, fields=["members"])
@@ -94,7 +94,7 @@ class AuthenticationSilo(Model):
         try:
             ldb.modify(message)
         except LdbError as e:
-            raise RemoveMemberError(f"Failed to remove silo member: {e}")
+            raise RevokeMemberError(f"Failed to remove silo member: {e}")
 
         # If the modify operation was successful refresh members field.
         self.refresh(ldb, fields=["members"])
diff --git a/python/samba/netcmd/domain/models/exceptions.py b/python/samba/netcmd/domain/models/exceptions.py
index b28b423f64d..14ebd774d09 100644
--- a/python/samba/netcmd/domain/models/exceptions.py
+++ b/python/samba/netcmd/domain/models/exceptions.py
@@ -44,11 +44,11 @@ class DoesNotExist(ModelError):
     pass
 
 
-class AddMemberError(ModelError):
+class GrantMemberError(ModelError):
     pass
 
 
-class RemoveMemberError(ModelError):
+class RevokeMemberError(ModelError):
     pass