Skip to content
Snippets Groups Projects
Commit bf46d468 authored by Erik Reid's avatar Erik Reid
Browse files

use click.File instead of click.STRING

parent 889f2850
No related branches found
No related tags found
No related merge requests found
...@@ -186,7 +186,7 @@ class State(object): ...@@ -186,7 +186,7 @@ class State(object):
f.write(json.dumps(new_interfaces)) f.write(json.dumps(new_interfaces))
def _validate_config(ctx, param, value): def _validate_config(ctx, param, file):
""" """
loads, validates and returns configuration parameters loads, validates and returns configuration parameters
...@@ -195,12 +195,11 @@ def _validate_config(ctx, param, value): ...@@ -195,12 +195,11 @@ def _validate_config(ctx, param, value):
:param value: filename (string) :param value: filename (string)
:return: a dict containing configuration parameters :return: a dict containing configuration parameters
""" """
if value is None: if file is None:
config = _DEFAULT_CONFIG config = _DEFAULT_CONFIG
else: else:
try: try:
with open(value) as f: config = json.loads(file.read())
config = json.loads(f.read())
except (json.JSONDecodeError, jsonschema.ValidationError) as e: except (json.JSONDecodeError, jsonschema.ValidationError) as e:
raise click.BadParameter(str(e)) raise click.BadParameter(str(e))
...@@ -216,13 +215,13 @@ def _validate_config(ctx, param, value): ...@@ -216,13 +215,13 @@ def _validate_config(ctx, param, value):
@click.option( @click.option(
'--config', '--config',
default=None, default=None,
type=click.STRING, type=click.File('r'),
callback=_validate_config, callback=_validate_config,
help='configuration filename') help='configuration filename')
@click.option( @click.option(
'--force/--no-force', '--force/--no-force',
default=False, default=False,
help="update even if inventory hasn't been updated") help="refresh inventory data even if it hasn't been updated")
def main(config, force): def main(config, force):
""" """
Update BRIAN snmp checks based on Inventory Provider data. Update BRIAN snmp checks based on Inventory Provider data.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment