From: Rex Lee <limingjiang@huawei.com>
Date: Mon, 12 Dec 2016 07:43:15 +0000 (+0000)
Subject: Merge "Increase Ping scenario ssh timeout limit to 600 seconds"
X-Git-Tag: danube.1.0~172
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3c3ac5d9e89af36bb609017e69f6d03b52d8b251;p=yardstick.git

Merge "Increase Ping scenario ssh timeout limit to 600 seconds"
---

3c3ac5d9e89af36bb609017e69f6d03b52d8b251
diff --cc yardstick/benchmark/scenarios/networking/ping.py
index b41aa0d94,e09ea4a20..6e49a1437
--- a/yardstick/benchmark/scenarios/networking/ping.py
+++ b/yardstick/benchmark/scenarios/networking/ping.py
@@@ -52,10 -50,9 +52,10 @@@ class Ping(base.Scenario)
          else:
              LOG.info("Log in via key, user:%s, host:%s, key_filename:%s",
                       user, ip, key_filename)
 -            self.connection = ssh.SSH(user, ip, key_filename=key_filename)
 +            self.connection = ssh.SSH(user, ip, key_filename=key_filename,
 +                                      port=ssh_port)
  
-         self.connection.wait()
+         self.connection.wait(timeout=600)
  
      def run(self, result):
          """execute the benchmark"""