X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTrafficScriptExecutor.py;h=f730d3a0e3bb5345c8dd3fd5da3e52d7028969c7;hb=a74531b4483ae9122ba18e064cd20b8550039d21;hp=108b2b9815658321cd0ea9f651b50a4aca9d67c0;hpb=5eb99d868051556dce3d509545d130971d74e1fa;p=csit.git diff --git a/resources/libraries/python/TrafficScriptExecutor.py b/resources/libraries/python/TrafficScriptExecutor.py index 108b2b9815..f730d3a0e3 100644 --- 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 + :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() @@ -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: - 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: - 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):