X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTrafficScriptExecutor.py;h=33b3d6d520b51b302485b101cc5fe2da3a4bc64e;hp=f730d3a0e3bb5345c8dd3fd5da3e52d7028969c7;hb=cdfe60613521e492157153bbe097fdc05193a593;hpb=559a2b904cf95e4a5a82726d8b3791e57e7a9f9c diff --git a/resources/libraries/python/TrafficScriptExecutor.py b/resources/libraries/python/TrafficScriptExecutor.py index f730d3a0e3..33b3d6d520 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,7 +50,9 @@ class TrafficScriptExecutor(object): :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: ARP reply timeout. :raises RuntimeError: Traffic script execution failed. """ logger.trace("{}".format(timeout)) @@ -73,8 +75,14 @@ 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 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 "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")