From 8c039ececbe70669f7b109fd76042845b6ec346f Mon Sep 17 00:00:00 2001 From: changzhi1990 Date: Fri, 4 Mar 2016 11:24:08 +0800 Subject: [PATCH] Catch error msg when setup link Change-Id: I4de6ecb5ddc6f7290689b2e89272bace0f3c5562 --- steth/stethclient/agent_api.py | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/steth/stethclient/agent_api.py b/steth/stethclient/agent_api.py index 9594f19..6746fcb 100644 --- a/steth/stethclient/agent_api.py +++ b/steth/stethclient/agent_api.py @@ -65,22 +65,19 @@ class SetUpLink(Lister): self.log.debug('Interface is %s' % parsed_args.interface) self.log.debug('Cidr is %s' % parsed_args.cidr) server = setup_server(parsed_args.agent) - try: - # Setup Link - server.setup_link(parsed_args.interface, - parsed_args.cidr) - # Get Link info - res = server.get_interface(parsed_args.interface) - self.log.debug('Response is %s' % res) - if res['code'] == 1: - Logger.log_fail(res['message']) - sys.exit() - if res['code'] == 0: - return (('Field', 'Value'), - ((k, v) for k, v in res['data'].items())) - except Exception as e: - self.log.error('Agent %s return error: %s!' % parsed_args.agent, e) + # Setup Link + server.setup_link(parsed_args.interface, + parsed_args.cidr) + # Get Link info + res = server.get_interface(parsed_args.interface) + self.log.debug('Response is %s' % res) + if res['code'] == 1: + Logger.log_fail(res['message']) sys.exit() + if res['code'] == 0: + return (('Field', 'Value'), + ((k, v) for k, v in res['data'].items())) + return (['Error Mssage', ' '], [('message', res['message'])]) class GetInterface(Lister):