X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTrafficScriptExecutor.py;h=f4f026addf1832c8afb5229c1c3f13084e9ef85a;hb=d5e00c67d229e6f6fd9461755423cee800a1635e;hp=e7b851e7330167f1d4374d456b6594206907df45;hpb=ad0966f6296812a10eb6c8ba6f6725f4a3450ec6;p=csit.git diff --git a/resources/libraries/python/TrafficScriptExecutor.py b/resources/libraries/python/TrafficScriptExecutor.py index e7b851e733..f4f026addf 100644 --- a/resources/libraries/python/TrafficScriptExecutor.py +++ b/resources/libraries/python/TrafficScriptExecutor.py @@ -48,6 +48,11 @@ 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: ARP reply timeout. + :raises RuntimeError: Traffic script execution failed. """ logger.trace("{}".format(timeout)) ssh = SSH() @@ -66,11 +71,15 @@ 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") + elif "Error occurred: ARP reply timeout" in stdout: + raise RuntimeError("ARP reply 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):