From 506ce526a294b358de190386e29bd7f7a7b81826 Mon Sep 17 00:00:00 2001 From: changzhi1990 Date: Fri, 4 Mar 2016 11:22:16 +0800 Subject: [PATCH] Catch error msg when agent ping Change-Id: I91542167583f18c5225312b19c6adc51a1260620 --- 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..dc13c3d 100644 --- a/steth/stethclient/agent_api.py +++ b/steth/stethclient/agent_api.py @@ -167,22 +167,19 @@ class AgentPing(Lister): def take_action(self, parsed_args): self.log.debug('Get parsed_args: %s' % parsed_args) server = setup_server(parsed_args.agent) - try: - dest = parsed_args.destination.split(',') - res = server.ping(ips=dest, - count=parsed_args.count, - timeout=parsed_args.timeout, - 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 (('Destination', 'Packet Loss (%)'), - ((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) + dest = parsed_args.destination.split(',') + res = server.ping(ips=dest, + count=parsed_args.count, + timeout=parsed_args.timeout, + 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 (('Destination', 'Packet Loss (%)'), + ((k, v) for k, v in res['data'].items())) + return (['Error Mssage', ' '], [('message', res['message'])]) class CheckPortsOnBr(Lister):