commit 49550a946ca5eaa5932709aa48984c2aeed65d85
author Zuul <zuul@review.openstack.org> Wed May 16 22:13:55 2018 +0000
committer Gerrit Code Review <review@openstack.org> Wed May 16 22:13:55 2018 +0000
tree 4d29b7751d10af621bcaf25d00d06f99275401d6
parent 68860f42405197053f66e4598128abcff4fdd0f1
parent b07251fca82ac29fc02ec45bd5a7bd01761d4340

Merge "Log VM console output in remote_connectivity_check"

neutron_tempest_plugin/scenario/base.py

diff --git a/neutron_tempest_plugin/scenario/base.py b/neutron_tempest_plugin/scenario/base.py
index 2bb6344..0a2fa14 100644
--- a/neutron_tempest_plugin/scenario/base.py
+++ b/neutron_tempest_plugin/scenario/base.py
@@ -302,9 +302,18 @@
                                           1)
 
     def check_remote_connectivity(self, source, dest, should_succeed=True,
-                                  nic=None, mtu=None, fragmentation=True):
-        self.assertTrue(self._check_remote_connectivity(
-            source, dest, should_succeed, nic, mtu, fragmentation))
+                                  nic=None, mtu=None, fragmentation=True,
+                                  servers=None):
+        try:
+            self.assertTrue(self._check_remote_connectivity(
+                source, dest, should_succeed, nic, mtu, fragmentation))
+        except lib_exc.SSHTimeout as ssh_e:
+            LOG.debug(ssh_e)
+            self._log_console_output(servers)
+            raise
+        except AssertionError:
+            self._log_console_output(servers)
+            raise
 
     def ping_ip_address(self, ip_address, should_succeed=True,
                         ping_timeout=None, mtu=None):