From 989f1b4aaa86581781ee7f7ebc711c5338ef6dc7 Mon Sep 17 00:00:00 2001 From: "wu.zhihui" Date: Wed, 3 Aug 2016 10:20:57 +0800 Subject: Add parameter attempts in ping_test() According to https://build.opnfv.org/ci/job/qtip-fuel-zte-pod1-daily-master/55/consoleText, it need to add attempts for ping test. The default value is 30. Change-Id: Ia6c2628bd88c963374d00ed2c02346c8d7f40c39 Signed-off-by: wu.zhihui --- func/env_setup.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/func/env_setup.py b/func/env_setup.py index 9c0dadb3..f59883a0 100644 --- a/func/env_setup.py +++ b/func/env_setup.py @@ -98,16 +98,18 @@ class Env_setup: print 'Retrying SSH %s' % infinity @staticmethod - def ping_test(lister): - + def ping_test(lister, attempts=30): for k, v in lister.iteritems(): time.sleep(10) for val in v: ipvar = val ping_cmd = 'ping -D -c1 {0}'.format(ipvar) - while os.system(ping_cmd) != 0: - print '\nWaiting for machine\n' - time.sleep(10) + for i in range(attempts): + if os.system(ping_cmd) != 0: + print '\nWaiting for machine\n' + time.sleep(10) + else: + break print ('\n\n %s is UP \n\n ' % ipvar) def get_host_machine_info(self, host_tag): -- cgit 1.2.3-korg