X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTrafficScriptExecutor.py;h=58d48d3ca90f1801902bcda7f9ec2ff25b697322;hp=e5fb2589ef3af6e41012754a44520432c4711c21;hb=4bda4f8b55b0d431b514663e8e90fccd97ad31d4;hpb=ec3512ff7f1405f2e7bc74bbfadf5691afc352c4

diff --git a/resources/libraries/python/TrafficScriptExecutor.py b/resources/libraries/python/TrafficScriptExecutor.py
index e5fb2589ef..58d48d3ca9 100644
--- a/resources/libraries/python/TrafficScriptExecutor.py
+++ b/resources/libraries/python/TrafficScriptExecutor.py
@@ -50,7 +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: DHCP DISCOVER Rx timeout.
         :raises RuntimeError: TCP/UDP Rx timeout.
         :raises RuntimeError: ARP reply timeout.
         :raises RuntimeError: Traffic script execution failed.
@@ -58,7 +58,8 @@ class TrafficScriptExecutor(object):
         logger.trace("{}".format(timeout))
         ssh = SSH()
         ssh.connect(node)
-        cmd = ("cd {}; virtualenv --system-site-packages env && " +
+        cmd = ("cd {}; " +
+               "virtualenv --system-site-packages --never-download env && " +
                "export PYTHONPATH=${{PWD}}; " +
                ". ${{PWD}}/env/bin/activate; " +
                "resources/traffic_scripts/{} {}") \
@@ -75,12 +76,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 timeout')" in stderr:
-                raise RuntimeError("DHCP DISCOVER 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")