diff options
| author |   pmikus <pmikus@cisco.com> | 2016-06-10 12:13:15 +0100 |
|---|---|---|
| committer |   Miroslav Miklus <mmiklus@cisco.com> | 2016-06-12 17:24:32 +0000 |
| commit | f54659a337045921002d508c48696359d913b044 (patch) | |
| tree | 2b61c56adc1810f1374ddb95f5ea355402ca7637 /resources/libraries/python/TrafficGenerator.py | |
| parent | 62ba63249e5d5e07c773303855a3a2a852ab459b (diff) | |
CSIT-152: Detect if the T-rex is responding to API after start
Change-Id: I99c8dcbd210175fa5d1af193371249e525dc0102
Signed-off-by: pmikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries/python/TrafficGenerator.py')
| -rw-r--r-- | resources/libraries/python/TrafficGenerator.py | 39 |
1 files changed, 29 insertions, 10 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 127b5b1d9b..6d90fe41b7 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -205,16 +205,35 @@ class TrafficGenerator(object): logger.error('trex-cfg failed: {0}'.format(stdout + stderr)) raise RuntimeError('trex-cfg failed') - (ret, _, _) = ssh.exec_command( - "sh -c 'pgrep t-rex && sudo pkill t-rex'") - - (ret, _, _) = ssh.exec_command( - "sh -c 'cd {0}/scripts/ && " - "sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /dev/null 2>&1 &'" - "> /dev/null"\ - .format(trex_path)) - if int(ret) != 0: - raise RuntimeError('t-rex-64 startup failed') + max_startup_retries = 3 + while max_startup_retries > 0: + # kill T-rex only if it is already running + (ret, _, _) = ssh.exec_command( + "sh -c 'pgrep t-rex && sudo pkill t-rex'") + + # start T-rex + (ret, _, _) = ssh.exec_command( + "sh -c 'cd {0}/scripts/ && " + "sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /dev/null 2>&1 &'" + "> /dev/null"\ + .format(trex_path)) + if int(ret) != 0: + raise RuntimeError('t-rex-64 startup failed') + + # get T-rex server info + (ret, _, _) = ssh.exec_command( + "sh -c '{0}/resources/tools/t-rex/t-rex-server-info.py'"\ + .format(Constants.REMOTE_FW_DIR), + timeout=120) + if int(ret) == 0: + # If we get info T-rex is running + return + # try again + max_startup_retries -= 1 + # after max retries T-rex is still not responding to API + # critical error occured + raise RuntimeError('t-rex-64 startup failed') + @staticmethod def teardown_traffic_generator(node): |