From 08f04360a9c390620156be9a3c171ae2feb76ede Mon Sep 17 00:00:00 2001 From: Serhii Turivnyi Date: Nov 01 2017 11:49:24 +0000 Subject: Stick to PEP8. Fix exceptions flow --- diff --git a/inventory/standard-inventory-local b/inventory/standard-inventory-local index 6482bec..febbd18 100755 --- a/inventory/standard-inventory-local +++ b/inventory/standard-inventory-local @@ -3,42 +3,43 @@ import argparse import json import os -import shlex import sys -def main(argv): + +def main(): parser = argparse.ArgumentParser(description="Inventory for local") parser.add_argument("--list", action="store_true", help="Verbose output") parser.add_argument('--host', help="Get host variables") opts = parser.parse_args() - try: - if opts.host: - data = host(opts.host) - else: - data = list() - sys.stdout.write(json.dumps(data, indent=4, separators=(',', ': '))) - except RuntimeError as ex: - sys.stderr.write("{0}: {1}\n".format(os.path.basename(sys.argv[0]), str(ex))) - return 1 - - return 0 - -def list(): - rpms = [ ] - hosts = [ ] - variables = { } + if opts.host: + arg_data = get_host_variables(opts.host) + else: + arg_data = get_list_variables() + sys.stdout.write(json.dumps(arg_data, indent=4, separators=(',', ': '))) + + +def get_list_variables(): + hosts = [] + variables = {} if os.environ.get("TEST_SUBJECTS", None) == "local": - vars = host("local") - if vars: + local_vars = get_host_variables("local") + if local_vars: hosts.append("local") - variables["local"] = vars - return { "subjects": { "hosts": hosts, "vars": { } }, "localhost": { "hosts": hosts, "vars": { } }, "_meta": { "hostvars": variables } } + variables["local"] = local_vars + return {"subjects": {"hosts": hosts, "vars": {}}, "localhost": + {"hosts": hosts, "vars": {}}, "_meta": {"hostvars": variables}} + + +def get_host_variables(working_host): + if working_host == "local": + return {"ansible_connection": "local"} -def host(host): - if host == "local": - return { "ansible_connection": "local" } - return None if __name__ == '__main__': - sys.exit(main(sys.argv)) + try: + main() + except Exception as ex: + sys.stderr.write("{}: {}\n".format(os.path.basename(sys.argv[0]), + ex.message)) + sys.exit(1)