From dbdfc106bfc599ba86c4870b342e684eaf0b2476 Mon Sep 17 00:00:00 2001 From: Roberto Hueso Gómez Date: Fri, 19 Jun 2020 12:23:59 +0200 Subject: Rewrite basic structure This commit: - Adds OgREST class as a wrapper for HTTP REST requests. - Adds objects folder which will contain available functions for each object in the OpenGnsys ecosystem (e.g. client, image, etc.). --- ogcli.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'ogcli.py') diff --git a/ogcli.py b/ogcli.py index b3071f5..09969f5 100755 --- a/ogcli.py +++ b/ogcli.py @@ -14,7 +14,7 @@ class CLI(): self.cfg = json.load(json_file) except json.JSONDecodeError: sys.exit(f'ERROR: Failed parse malformed JSON file ' - f'{OG_CLI_CFG_PATH}') + f'{OG_CLI_CFG_PATH}') except: sys.exit(f'ERROR: cannot open {OG_CLI_CFG_PATH}') @@ -24,20 +24,12 @@ class CLI(): parser.add_argument('command', help='Subcommand to run') args = parser.parse_args(sys.argv[1:2]) - if not hasattr(self, args.command): + if not hasattr(self.ogcli, args.command): parser.print_help() sys.exit('Unknown command') # Call the command with the same name. - getattr(self, args.command)(sys.argv[2:]) - - def list(self, args): - parser = argparse.ArgumentParser() - parser.add_argument('item', choices=['clients']) - parser.parse_args(args) - - if parser.item == 'clients': - self.ogcli.client_list() + getattr(self.ogcli, args.command)(sys.argv[2:]) if __name__ == "__main__": CLI() -- cgit v1.2.3-18-g5258