openstack/neutron-tempest-plugin
Code Issues Proposed changes

Merge "Adding pattern to check_remote_connectivity function"

Browse Source
This commit is contained in:
Zuul 2020-01-31 00:26:18 +00:00 committed by Gerrit Code Review
commit 4376daf66b
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
neutron_tempest_plugin/scenario/base.py
View File

@ -250,7 +250,7 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
def _check_remote_connectivity(self, source, dest, count, def _check_remote_connectivity(self, source, dest, count,
should_succeed=True, should_succeed=True,
nic=None, mtu=None, fragmentation=True, nic=None, mtu=None, fragmentation=True,
timeout=None): timeout=None, pattern=None):
"""check ping server via source ssh connection """check ping server via source ssh connection
:param source: RemoteClient: an ssh connection from which to ping :param source: RemoteClient: an ssh connection from which to ping
@ -261,12 +261,13 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
:param mtu: mtu size for the packet to be sent :param mtu: mtu size for the packet to be sent
:param fragmentation: Flag for packet fragmentation :param fragmentation: Flag for packet fragmentation
:param timeout: Timeout for all ping packet(s) to succeed :param timeout: Timeout for all ping packet(s) to succeed
:param pattern: hex digits included in ICMP messages
:returns: boolean -- should_succeed == ping :returns: boolean -- should_succeed == ping
:returns: ping is false if ping failed :returns: ping is false if ping failed
""" """
def ping_host(source, host, count, def ping_host(source, host, count,
size=CONF.validation.ping_size, nic=None, mtu=None, size=CONF.validation.ping_size, nic=None, mtu=None,
fragmentation=True): fragmentation=True, pattern=None):
IP_VERSION_4 = neutron_lib_constants.IP_VERSION_4 IP_VERSION_4 = neutron_lib_constants.IP_VERSION_4
IP_VERSION_6 = neutron_lib_constants.IP_VERSION_6 IP_VERSION_6 = neutron_lib_constants.IP_VERSION_6
@ -282,13 +283,16 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
cmd += ' -M do' cmd += ' -M do'
size = str(net_utils.get_ping_payload_size( size = str(net_utils.get_ping_payload_size(
mtu=mtu, ip_version=ip_version)) mtu=mtu, ip_version=ip_version))
if pattern:
cmd += ' -p {pattern}'.format(pattern=pattern)
cmd += ' -c{0} -w{0} -s{1} {2}'.format(count, size, host) cmd += ' -c{0} -w{0} -s{1} {2}'.format(count, size, host)
return source.exec_command(cmd) return source.exec_command(cmd)
def ping_remote(): def ping_remote():
try: try:
result = ping_host(source, dest, count, nic=nic, mtu=mtu, result = ping_host(source, dest, count, nic=nic, mtu=mtu,
fragmentation=fragmentation) fragmentation=fragmentation,
pattern=pattern)
except lib_exc.SSHExecCommandFailed: except lib_exc.SSHExecCommandFailed:
LOG.warning('Failed to ping IP: %s via a ssh connection ' LOG.warning('Failed to ping IP: %s via a ssh connection '
@ -309,12 +313,13 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
def check_remote_connectivity(self, source, dest, should_succeed=True, def check_remote_connectivity(self, source, dest, should_succeed=True,
nic=None, mtu=None, fragmentation=True, nic=None, mtu=None, fragmentation=True,
servers=None, timeout=None, servers=None, timeout=None,
ping_count=CONF.validation.ping_count): ping_count=CONF.validation.ping_count,
pattern=None):
try: try:
self.assertTrue(self._check_remote_connectivity( self.assertTrue(self._check_remote_connectivity(
source, dest, ping_count, should_succeed, nic, mtu, source, dest, ping_count, should_succeed, nic, mtu,
fragmentation, fragmentation,
timeout=timeout)) timeout=timeout, pattern=pattern))
except lib_exc.SSHTimeout as ssh_e: except lib_exc.SSHTimeout as ssh_e:
LOG.debug(ssh_e) LOG.debug(ssh_e)
self._log_console_output(servers) self._log_console_output(servers)