diff --git a/kci-dev/subcommands/results.py b/kci-dev/subcommands/results.py index 960c01c..e5e5e1b 100644 --- a/kci-dev/subcommands/results.py +++ b/kci-dev/subcommands/results.py @@ -23,21 +23,46 @@ def get_node(url, nodeid): click.secho(url) response = requests.get(url, headers=headers) click.secho(response.status_code, fg="green") - click.secho(pprint.pprint(response.json()), fg="green") + try: + click.secho(pprint.pprint(response.json()), fg="green") + except: + click.secho(pprint.pprint(response.text), fg="green") + + +def get_nodes(url): + headers = { + "Content-Type": "application/json; charset=utf-8", + } + url = url + "/nodes" + click.secho(url) + response = requests.get(url, headers=headers) + click.secho(response.status_code, fg="green") + try: + click.secho(pprint.pprint(response.json()), fg="green") + except: + click.secho(pprint.pprint(response.text), fg="green") @click.command(help="Get results") @click.option( "--nodeid", - required=True, + required=False, help="select node_id", ) +@click.option( + "--nodes", + required=False, + help="Get last nodes results", +) @click.pass_context -def results(ctx, nodeid): +def results(ctx, nodeid, nodes): config = ctx.obj.get("CFG") instance = ctx.obj.get("INSTANCE") url = api_connection(config[instance]["host"]) - get_node(url, nodeid) + if nodeid: + get_node(url, nodeid) + if nodes: + get_nodes(url) if __name__ == "__main__":