commit 2c33f242f797a6a2eeb2a5dfb136e1879bc28124
author Zuul <zuul@review.opendev.org> Wed Jun 10 18:45:15 2020 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jun 10 18:45:15 2020 +0000
tree 9e54436fbb520eaa758d83b4810f2d04972faa8a
parent 71b6f1efee8113d0a585f49593914d534c2bf7ee
parent 3eb1228cc687201872f018724406850076cbbe07

Merge "Add timeout to check_connectivity method"

neutron_tempest_plugin/scenario/base.py

diff --git a/neutron_tempest_plugin/scenario/base.py b/neutron_tempest_plugin/scenario/base.py
index f7e7ec8..35e5c31 100644
--- a/neutron_tempest_plugin/scenario/base.py
+++ b/neutron_tempest_plugin/scenario/base.py
@@ -259,8 +259,10 @@
                                                'server']['id'])['ports'][0]
         self.fip = self.create_floatingip(port=self.port)
 
-    def check_connectivity(self, host, ssh_user, ssh_key, servers=None):
-        ssh_client = ssh.Client(host, ssh_user, pkey=ssh_key)
+    def check_connectivity(self, host, ssh_user, ssh_key,
+                           servers=None, ssh_timeout=None):
+        ssh_client = ssh.Client(host, ssh_user,
+                                pkey=ssh_key, timeout=ssh_timeout)
         try:
             ssh_client.test_connection_auth()
         except lib_exc.SSHTimeout as ssh_e: