samba-tool: check for invalid 'domain level' subcommands first

This will simplify further changes...

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/netcmd/domain/level.py b/python/samba/netcmd/domain/level.py
index 0678a205d614a3833559a94486381ccbd88d3d60..8b0e8014dba57dfb274c41a09a5dcc76fd8ba818 100644 (file)
--- a/python/samba/netcmd/domain/level.py
+++ b/python/samba/netcmd/domain/level.py
@@ -57,6 +57,9 @@ class cmd_domain_level(Command):
 
     def run(self, subcommand, H=None, forest_level=None, domain_level=None,
             quiet=False, credopts=None, sambaopts=None, versionopts=None):
+        if subcommand not in ["show", "raise"]:
+            raise CommandError("invalid argument: '%s' (choose from 'show', 'raise')" % subcommand)
+
         lp = sambaopts.get_loadparm()
         creds = credopts.get_credentials(lp, fallback_machine=True)
 
@@ -205,5 +208,3 @@ class cmd_domain_level(Command):
                 msgs.append("Forest function level changed!")
             msgs.append("All changes applied successfully!")
             self.message("\n".join(msgs))
-        else:
-            raise CommandError("invalid argument: '%s' (choose from 'show', 'raise')" % subcommand)