Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use interface key instead of interface name.
[csit.git]
/
resources
/
libraries
/
python
/
TrafficScriptExecutor.py
diff --git
a/resources/libraries/python/TrafficScriptExecutor.py
b/resources/libraries/python/TrafficScriptExecutor.py
index
108b2b9
..
f730d3a
100644
(file)
--- a/
resources/libraries/python/TrafficScriptExecutor.py
+++ b/
resources/libraries/python/TrafficScriptExecutor.py
@@
-48,6
+48,10
@@
class TrafficScriptExecutor(object):
:type node: dict
:type script_args: str
:type timeout: int
:type node: dict
:type script_args: str
:type timeout: int
+ :raises RuntimeError: ICMP echo Rx timeout.
+ :raises RuntimeError: DHCP REQUEST Rx timeout.
+ :raises RuntimeError: TCP/UDP Rx timeout.
+ :raises RuntimeError: Traffic script execution failed.
"""
logger.trace("{}".format(timeout))
ssh = SSH()
"""
logger.trace("{}".format(timeout))
ssh = SSH()
@@
-66,9
+70,13
@@
class TrafficScriptExecutor(object):
logger.debug("ret_code: {}".format(ret_code))
if ret_code != 0:
if "RuntimeError: ICMP echo Rx timeout" in stderr:
logger.debug("ret_code: {}".format(ret_code))
if ret_code != 0:
if "RuntimeError: ICMP echo Rx timeout" in stderr:
- raise Exception("ICMP echo Rx timeout")
+ raise RuntimeError("ICMP echo Rx timeout")
+ elif "RuntimeError: DHCP REQUEST Rx timeout" in stderr:
+ raise RuntimeError("DHCP REQUEST Rx timeout")
+ elif "RuntimeError: TCP/UDP Rx timeout" in stderr:
+ raise RuntimeError("TCP/UDP Rx timeout")
else:
else:
- raise
Exception
("Traffic script execution failed")
+ raise
RuntimeError
("Traffic script execution failed")
@staticmethod
def traffic_script_gen_arg(rx_if, tx_if, src_mac, dst_mac, src_ip, dst_ip):
@staticmethod
def traffic_script_gen_arg(rx_if, tx_if, src_mac, dst_mac, src_ip, dst_ip):