Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade T-rex to newer version
[csit.git]
/
resources
/
libraries
/
python
/
TrafficGenerator.py
diff --git
a/resources/libraries/python/TrafficGenerator.py
b/resources/libraries/python/TrafficGenerator.py
index
86cf093
..
47008bc
100644
(file)
--- a/
resources/libraries/python/TrafficGenerator.py
+++ b/
resources/libraries/python/TrafficGenerator.py
@@
-184,7
+184,7
@@
class TrafficGenerator(object):
self._node = tg_node
if tg_node['subtype'] == NodeSubTypeTG.TREX:
self._node = tg_node
if tg_node['subtype'] == NodeSubTypeTG.TREX:
- trex_path = "/opt/trex-core-2.
09
"
+ trex_path = "/opt/trex-core-2.
17
"
ssh = SSH()
ssh.connect(tg_node)
ssh = SSH()
ssh.connect(tg_node)
@@
-252,7
+252,7
@@
class TrafficGenerator(object):
while max_startup_retries > 0:
# kill T-rex only if it is already running
(ret, _, _) = ssh.exec_command(
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'")
+ "sh -c 'pgrep t-rex && sudo pkill t-rex
&& sleep 3
'")
# configure T-rex
(ret, stdout, stderr) = ssh.exec_command(
# configure T-rex
(ret, stdout, stderr) = ssh.exec_command(