x/whitebox-neutron-tempest-plugin
Code Issues Proposed changes

Merge "With BGP, do not use proxy host to check connectivity"

Browse Source
This commit is contained in:
Zuul 2024-06-12 09:01:47 +00:00 committed by Gerrit Code Review
commit 27c843005d
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
whitebox_neutron_tempest_plugin/tests/scenario/base.py
View File

@ -139,10 +139,14 @@ class BaseTempestWhiteboxTestCase(base.BaseTempestTestCase):
return ssh.Client(host=host, username=username,
key_filename=key_filename)
def get_local_ssh_client(self, network):
def get_local_ssh_client(self, network=None):
if network is None:
local_ip = '127.0.0.1'
else:
local_ip = self._get_local_ip_from_network(
self.get_subnet_cidr(network, 4))
return ssh.Client(
host=self._get_local_ip_from_network(
self.get_subnet_cidr(network, 4)),
host=local_ip,
username=shell.execute_local_command('whoami').stdout.rstrip(),
key_filename=WB_CONF.overcloud_key_file)

12
whitebox_neutron_tempest_plugin/tests/scenario/test_dvr_ovn.py
View File

@ -213,12 +213,18 @@ class OvnDvrTest(OvnDvrBase):
7. Restart the server and verify that routing has not changed
"""
# will the pings be send from self.proxy_host_client or from localhost?
if not WB_CONF.bgp:
ssh_local_client = self.proxy_host_client
else:
ssh_local_client = self.get_local_ssh_client()
self._setup()
self.check_north_south_icmp_flow(
dst_ip=self.server['fip']['floating_ip_address'],
expected_routing_nodes=[self.compute],
expected_mac=self.fip_port_mac,
ssh_client=self.proxy_host_client)
ssh_client=ssh_local_client)
# Delete fip
LOG.debug('Deleting floating ip')
@ -235,7 +241,7 @@ class OvnDvrTest(OvnDvrBase):
dst_ip=fip['floating_ip_address'],
expected_routing_nodes=[self.compute],
expected_mac=fip_port_mac,
ssh_client=self.proxy_host_client)
ssh_client=ssh_local_client)
# Reboot the server and make sure that routing is still via compute.
LOG.debug('Rebooting vm')
@ -248,7 +254,7 @@ class OvnDvrTest(OvnDvrBase):
dst_ip=fip['floating_ip_address'],
expected_routing_nodes=[self.compute],
expected_mac=fip_port_mac,
ssh_client=self.proxy_host_client)
ssh_client=ssh_local_client)
@decorators.idempotent_id('0fcf9f97-6368-4c5d-a5f5-ff8a7643e3b6')
def test_validate_fip2fip_compute(self):