From 40a688c0f708e75b16a0ffb404bed4ffb2d0790a Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 25 Jun 2018 13:41:27 -0400 Subject: [PATCH] Die with usage on inv cmd --- libremanage.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libremanage.py b/libremanage.py index 22d1c11..6ebf835 100644 --- a/libremanage.py +++ b/libremanage.py @@ -36,11 +36,14 @@ Valid commands are as follows: - shutdown, reboot, poweron: Power management """ -if len(sys.argv) != 3: - print("Incorrect number of arguments") +def die_with_usage(message): + print(message) print(USAGE) sys.exit(1) +if len(sys.argv) != 3: + die_with_usage("Incorrect number of arguments") + def get_server_handle(name): # TODO: resolve based on config, SSH in, give self-contained handle? return name @@ -57,6 +60,10 @@ COMMANDS = { def issue_command(server_name, command): server = get_server_handle(server_name) print(server_name, command) - COMMANDS[command](server_name) + + try: + COMMANDS[command](server_name) + except KeyError: + die_with_usage("Invalid command supplied") issue_command(sys.argv[1], sys.argv[2]) -- 2.25.1