diff options
author | 2017-08-11 07:55:43 +0000 | |
---|---|---|
committer | 2017-08-11 07:55:43 +0000 | |
commit | d8a34ec774f96412f7722fc4ddc66c796722ac25 (patch) | |
tree | 4945054b97b0e99115a1b6be5fcf2a03a2a8548a /yardstick | |
parent | a9be662eab5ee7a1a5db1905bd7877974422e780 (diff) | |
parent | 36f0faeba773a092f65dfadb8149277a1c7fc7ee (diff) |
Merge "bugfix: tc038 ssh default wait 3600s"
Diffstat (limited to 'yardstick')
-rw-r--r-- | yardstick/benchmark/scenarios/networking/pktgen.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/yardstick/benchmark/scenarios/networking/pktgen.py b/yardstick/benchmark/scenarios/networking/pktgen.py index 8ca1ca60e..1e0a5fcbb 100644 --- a/yardstick/benchmark/scenarios/networking/pktgen.py +++ b/yardstick/benchmark/scenarios/networking/pktgen.py @@ -20,6 +20,7 @@ from yardstick.benchmark.scenarios import base LOG = logging.getLogger(__name__) +SSH_TIMEOUT = 60 VNIC_TYPE_LIST = ["ovs", "sriov"] SRIOV_DRIVER_LIST = ["ixgbevf", "i40evf"] @@ -287,7 +288,7 @@ class Pktgen(base.Scenario): "sudo iptables -A INPUT -p udp --dport 1000:%s -j DROP" \ % (1000 + self.number_of_ports) LOG.debug("Executing command: %s", cmd) - status, _, stderr = self.server.execute(cmd) + status, _, stderr = self.server.execute(cmd, timeout=SSH_TIMEOUT) if status: raise RuntimeError(stderr) @@ -349,7 +350,7 @@ class Pktgen(base.Scenario): duration, queue_number, pps) LOG.debug("Executing command: %s", cmd) - status, stdout, stderr = self.client.execute(cmd) + status, stdout, stderr = self.client.execute(cmd, timeout=SSH_TIMEOUT) if status: raise RuntimeError(stderr) |