openstack/neutron-tempest-plugin
Code Issues Proposed changes

Print VM console output upon different exceptions

Browse Source 
VM console ouput is printed when tests fail due to some exceptions
This patch extends the list of caught exceptions for which it will be
printed - The added exceptions were recently reproduced

The complete list of expected exceptions follows:
tempest.lib.exceptions.SSHTimeout
paramiko.ssh_exception.AuthenticationException
paramiko.ssh_exception.NoValidConnectionsError
ConnectionResetError

Change-Id: Ie5f58209739aed1a0dd7f4fb3a9b1fb06b27061c
This commit is contained in:
Eduardo Olivares 2022-04-18 12:47:43 +02:00
parent 36a231e229
commit 46fa42463c
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
neutron_tempest_plugin/scenario/base.py
View File

@ -38,8 +38,11 @@ from neutron_tempest_plugin import exceptions
from neutron_tempest_plugin.scenario import constants from neutron_tempest_plugin.scenario import constants
CONF = config.CONF CONF = config.CONF
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
SSH_EXC_TUPLE = (lib_exc.SSHTimeout,
ssh_exc.AuthenticationException,
ssh_exc.NoValidConnectionsError,
ConnectionResetError)
def get_ncat_version(ssh_client=None): def get_ncat_version(ssh_client=None):
@ -308,7 +311,7 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
pkey=ssh_key, timeout=ssh_timeout) pkey=ssh_key, timeout=ssh_timeout)
try: try:
ssh_client.test_connection_auth() ssh_client.test_connection_auth()
except (lib_exc.SSHTimeout, ssh_exc.AuthenticationException) as ssh_e: except SSH_EXC_TUPLE as ssh_e:
LOG.debug(ssh_e) LOG.debug(ssh_e)
self._log_console_output(servers) self._log_console_output(servers)
self._log_local_network_status() self._log_local_network_status()
@ -448,7 +451,7 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
timeout=timeout, pattern=pattern, timeout=timeout, pattern=pattern,
forbid_packet_loss=forbid_packet_loss, forbid_packet_loss=forbid_packet_loss,
check_response_ip=check_response_ip)) check_response_ip=check_response_ip))
except (lib_exc.SSHTimeout, ssh_exc.AuthenticationException) as ssh_e: except SSH_EXC_TUPLE as ssh_e:
LOG.debug(ssh_e) LOG.debug(ssh_e)
self._log_console_output(servers) self._log_console_output(servers)
self._log_local_network_status() self._log_local_network_status()
@ -565,7 +568,7 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
**kwargs) **kwargs)
self.assertIn(server['name'], self.assertIn(server['name'],
ssh_client.get_hostname()) ssh_client.get_hostname())
except (lib_exc.SSHTimeout, ssh_exc.AuthenticationException) as ssh_e: except SSH_EXC_TUPLE as ssh_e:
LOG.debug(ssh_e) LOG.debug(ssh_e)
if log_errors: if log_errors:
self._log_console_output(servers) self._log_console_output(servers)
@ -600,7 +603,7 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
return ssh_client.execute_script( return ssh_client.execute_script(
get_ncat_server_cmd(port, protocol, echo_msg), get_ncat_server_cmd(port, protocol, echo_msg),
become_root=True, combine_stderr=True) become_root=True, combine_stderr=True)
except (lib_exc.SSHTimeout, ssh_exc.AuthenticationException) as ssh_e: except SSH_EXC_TUPLE as ssh_e:
LOG.debug(ssh_e) LOG.debug(ssh_e)
self._log_console_output(servers) self._log_console_output(servers)
self._log_local_network_status() self._log_local_network_status()

4
neutron_tempest_plugin/scenario/test_mac_learning.py
View File

@ -14,10 +14,8 @@
# under the License. # under the License.
from oslo_log import log from oslo_log import log
from paramiko import ssh_exception as ssh_exc
from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest.lib import decorators from tempest.lib import decorators
from tempest.lib import exceptions as lib_exc
from neutron_tempest_plugin.common import ssh from neutron_tempest_plugin.common import ssh
from neutron_tempest_plugin.common import utils from neutron_tempest_plugin.common import utils
@ -121,7 +119,7 @@ class MacLearningTest(base.BaseTempestTestCase):
def _check_cmd_installed_on_server(self, ssh_client, server, cmd): def _check_cmd_installed_on_server(self, ssh_client, server, cmd):
try: try:
ssh_client.execute_script('which %s' % cmd) ssh_client.execute_script('which %s' % cmd)
except (lib_exc.SSHTimeout, ssh_exc.AuthenticationException) as ssh_e: except base.SSH_EXC_TUPLE as ssh_e:
LOG.debug(ssh_e) LOG.debug(ssh_e)
self._log_console_output([server]) self._log_console_output([server])
self._log_local_network_status() self._log_local_network_status()

4
neutron_tempest_plugin/scenario/test_multicast.py
View File

@ -16,10 +16,8 @@
import netaddr import netaddr
from neutron_lib import constants from neutron_lib import constants
from oslo_log import log from oslo_log import log
from paramiko import ssh_exception as ssh_exc
from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest.lib import decorators from tempest.lib import decorators
from tempest.lib import exceptions as lib_exc
from neutron_tempest_plugin.common import ip from neutron_tempest_plugin.common import ip
from neutron_tempest_plugin.common import ssh from neutron_tempest_plugin.common import ssh
@ -218,7 +216,7 @@ class BaseMulticastTest(object):
def _check_cmd_installed_on_server(self, ssh_client, server, cmd): def _check_cmd_installed_on_server(self, ssh_client, server, cmd):
try: try:
ssh_client.execute_script('which %s' % cmd) ssh_client.execute_script('which %s' % cmd)
except (lib_exc.SSHTimeout, ssh_exc.AuthenticationException) as ssh_e: except base.SSH_EXC_TUPLE as ssh_e:
LOG.debug(ssh_e) LOG.debug(ssh_e)
self._log_console_output([server]) self._log_console_output([server])
self._log_local_network_status() self._log_local_network_status()