Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-755: Presentation and analytics layer
[csit.git]
/
resources
/
libraries
/
python
/
TrafficScriptExecutor.py
diff --git
a/resources/libraries/python/TrafficScriptExecutor.py
b/resources/libraries/python/TrafficScriptExecutor.py
index
f730d3a
..
58d48d3
100644
(file)
--- a/
resources/libraries/python/TrafficScriptExecutor.py
+++ b/
resources/libraries/python/TrafficScriptExecutor.py
@@
-37,7
+37,7
@@
class TrafficScriptExecutor(object):
@staticmethod
def run_traffic_script_on_node(script_file_name, node, script_args,
@staticmethod
def run_traffic_script_on_node(script_file_name, node, script_args,
- timeout=
1
0):
+ timeout=
6
0):
"""Run traffic script on the TG node.
:param script_file_name: Traffic script name.
"""Run traffic script on the TG node.
:param script_file_name: Traffic script name.
@@
-50,13
+50,16
@@
class TrafficScriptExecutor(object):
:type timeout: int
:raises RuntimeError: ICMP echo Rx timeout.
:raises RuntimeError: DHCP REQUEST Rx timeout.
:type timeout: int
:raises RuntimeError: ICMP echo Rx timeout.
:raises RuntimeError: DHCP REQUEST Rx timeout.
+ :raises RuntimeError: DHCP DISCOVER Rx timeout.
:raises RuntimeError: TCP/UDP Rx timeout.
:raises RuntimeError: TCP/UDP Rx timeout.
+ :raises RuntimeError: ARP reply timeout.
:raises RuntimeError: Traffic script execution failed.
"""
logger.trace("{}".format(timeout))
ssh = SSH()
ssh.connect(node)
:raises RuntimeError: Traffic script execution failed.
"""
logger.trace("{}".format(timeout))
ssh = SSH()
ssh.connect(node)
- cmd = ("cd {}; virtualenv --system-site-packages env && " +
+ cmd = ("cd {}; " +
+ "virtualenv --system-site-packages --never-download env && " +
"export PYTHONPATH=${{PWD}}; " +
". ${{PWD}}/env/bin/activate; " +
"resources/traffic_scripts/{} {}") \
"export PYTHONPATH=${{PWD}}; " +
". ${{PWD}}/env/bin/activate; " +
"resources/traffic_scripts/{} {}") \
@@
-73,8
+76,14
@@
class TrafficScriptExecutor(object):
raise RuntimeError("ICMP echo Rx timeout")
elif "RuntimeError: DHCP REQUEST Rx timeout" in stderr:
raise RuntimeError("DHCP REQUEST Rx timeout")
raise RuntimeError("ICMP echo Rx timeout")
elif "RuntimeError: DHCP REQUEST Rx timeout" in stderr:
raise RuntimeError("DHCP REQUEST Rx timeout")
+ elif "RuntimeError: DHCP DISCOVER Rx timeout" in stderr:
+ raise RuntimeError("DHCP DISCOVER Rx timeout")
elif "RuntimeError: TCP/UDP Rx timeout" in stderr:
raise RuntimeError("TCP/UDP Rx timeout")
elif "RuntimeError: TCP/UDP Rx timeout" in stderr:
raise RuntimeError("TCP/UDP Rx timeout")
+ elif "Error occurred: ARP reply timeout" in stdout:
+ raise RuntimeError("ARP reply timeout")
+ elif "RuntimeError: ESP packet Rx timeout" in stderr:
+ raise RuntimeError("ESP packet Rx timeout")
else:
raise RuntimeError("Traffic script execution failed")
else:
raise RuntimeError("Traffic script execution failed")