netcmd: silo member uses consistent output with other commands

This also includes always spelling out "authentication silo" or "authentication policy" in full, not just calling it "silo."

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 4094ba768406d94c950dfd7ee763e8c994744b28..f9ec2686cf19a29cf0d9fd6f33da5fbbb2e56042 100644 (file)
--- a/python/samba/netcmd/domain/auth/silo_member.py
+++ b/python/samba/netcmd/domain/auth/silo_member.py
@@ -67,7 +67,7 @@ class cmd_domain_auth_silo_member_add(Command):
 
         # Ensure the user actually exists first.
         if user is None:
-            raise CommandError(f"User '{member}' not found.")
+            raise CommandError(f"User {member} not found.")
 
         # Add member.
         try:
@@ -75,7 +75,7 @@ class cmd_domain_auth_silo_member_add(Command):
         except ModelError as e:
             raise CommandError(e)
 
-        self.outf.write(f"User '{user.name}' added to the {name} silo.\n")
+        self.outf.write(f"User {user} added to the authentication silo {name}.\n")
 
 
 class cmd_domain_auth_silo_member_list(Command):
@@ -166,7 +166,7 @@ class cmd_domain_auth_silo_member_remove(Command):
 
         # Ensure the user actually exists first.
         if user is None:
-            raise CommandError(f"User '{member}' not found.")
+            raise CommandError(f"User {member} not found.")
 
         # Remove member.
         try:
@@ -174,7 +174,7 @@ class cmd_domain_auth_silo_member_remove(Command):
         except ModelError as e:
             raise CommandError(e)
 
-        self.outf.write(f"User '{user.name}' removed from the {name} silo.\n")
+        self.outf.write(f"User {user} removed from the authentication silo {name}.\n")
 
 
 class cmd_domain_auth_silo_member(SuperCommand):

diff --git a/python/samba/tests/samba_tool/domain_auth_silo.py b/python/samba/tests/samba_tool/domain_auth_silo.py
index c440e0eeff5bf7f29aaa4a3493f097bcdd32a8ac..27c5caf6a33ecd883e6de8f678ae160f6d92e5df 100644 (file)
--- a/python/samba/tests/samba_tool/domain_auth_silo.py
+++ b/python/samba/tests/samba_tool/domain_auth_silo.py
@@ -527,7 +527,8 @@ class AuthSiloMemberCmdTestCase(BaseAuthCmdTest):
                                        "--name", silo, "--member", member)
 
         self.assertIsNone(result, msg=err)
-        self.assertIn(f"User '{member}' added to the {silo} silo.", out)
+        self.assertIn(
+            f"User {member} added to the authentication silo {silo}", out)
         self.addCleanup(self.remove_silo_member, silo, member)
 
     def remove_silo_member(self, silo, member):
@@ -601,7 +602,8 @@ class AuthSiloMemberCmdTestCase(BaseAuthCmdTest):
                                        "--member", computer)
 
         self.assertIsNone(result, msg=err)
-        self.assertIn(f"User '{name}' added to the {silo} silo.", out)
+        self.assertIn(
+            f"User {name} added to the authentication silo {silo}.", out)
 
     def test_member_add__unknown_user(self):
         """Test adding an unknown user to an authentication silo."""
@@ -611,4 +613,4 @@ class AuthSiloMemberCmdTestCase(BaseAuthCmdTest):
                                        "--member", "does_not_exist")
 
         self.assertIsNotNone(result)
-        self.assertIn("User 'does_not_exist' not found.", err)
+        self.assertIn("User does_not_exist not found.", err)