samba_cmds: Switch ctdb to CommandArgs type

When '--samba-debug-level' (or SAMBA_DEBUG_LEVEL env var) is specified
with samba-container command it adds '--debuglevel' to the underlying
command which is not valid for ctdb resulting in "Invalid option".
Instead change its internal type to parent class CommandArgs where we
get to run without debug arguments.

Signed-off-by: Anoop C S <[email protected]>

Author: anoopcs9

sambacc/ctdb.py

@@ -764,12 +764,12 @@ def archive_tdb(iconfig: config.InstanceConfig, dest_dir: str) -> None:
                 os.rename(tdb_path, dest_path)
 
 
-def check_nodestatus(cmd: samba_cmds.SambaCommand = samba_cmds.ctdb) -> None:
+def check_nodestatus(cmd: samba_cmds.CommandArgs = samba_cmds.ctdb) -> None:
     cmd_ctdb_check = cmd["nodestatus"]
     samba_cmds.execute(cmd_ctdb_check)
 
 
-def _read_command_pnn(cmd: samba_cmds.SambaCommand) -> typing.Optional[int]:
+def _read_command_pnn(cmd: samba_cmds.CommandArgs) -> typing.Optional[int]:
     """Run a ctdb command assuming it returns a pnn value. Return the pnn as an
     int on success, None on command failure.
     """

sambacc/samba_cmds.py

@@ -188,7 +188,7 @@ def samba_dc_foreground() -> SambaCommand:
 
 ltdbtool = CommandArgs("ltdbtool")
 
-ctdb = SambaCommand("ctdb")
+ctdb = CommandArgs("ctdb")
 
 sambatool = SambaCommand("samba-tool")