X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTrafficScriptExecutor.py;h=e5fb2589ef3af6e41012754a44520432c4711c21;hb=ec3512ff7f1405f2e7bc74bbfadf5691afc352c4;hp=f4f026addf1832c8afb5229c1c3f13084e9ef85a;hpb=7d2ae8ca0427b2646327ba42bffdebaac21cd9bc;p=csit.git diff --git a/resources/libraries/python/TrafficScriptExecutor.py b/resources/libraries/python/TrafficScriptExecutor.py index f4f026addf..e5fb2589ef 100644 --- 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, - timeout=10): + timeout=60): """Run traffic script on the TG node. :param script_file_name: Traffic script name. @@ -50,6 +50,7 @@ class TrafficScriptExecutor(object): :type timeout: int :raises RuntimeError: ICMP echo Rx timeout. :raises RuntimeError: DHCP REQUEST Rx timeout. + :raises RuntimeError: DHCP DISCOVER timeout. :raises RuntimeError: TCP/UDP Rx timeout. :raises RuntimeError: ARP reply timeout. :raises RuntimeError: Traffic script execution failed. @@ -74,6 +75,8 @@ class TrafficScriptExecutor(object): raise RuntimeError("ICMP echo Rx timeout") elif "RuntimeError: DHCP REQUEST Rx timeout" in stderr: raise RuntimeError("DHCP REQUEST Rx timeout") + elif "RuntimeError('DHCP DISCOVER timeout')" in stderr: + raise RuntimeError("DHCP DISCOVER timeout") elif "RuntimeError: TCP/UDP Rx timeout" in stderr: raise RuntimeError("TCP/UDP Rx timeout") elif "Error occurred: ARP reply timeout" in stdout: