Merge "With BGP, do not use proxy host to check connectivity"
This commit is contained in:
commit
27c843005d
@ -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)
|
||||
|
||||
|
@ -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):
|
||||
|
Loading…
Reference in New Issue
Block a user