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

Fix exclude_hosts mechanism in _create_server method

Browse Source 
Patch [1] broke the way tests specify that a VM has to be spawned on
a host different from a provided list of exclude_hosts because the list
of hosts includes shortnames instead of FQDN after [1] was merged.
This patch fixes this problem.

Besides that, the method `get_shortname_for_server` is renamed to
`get_host_shortname_for_server` because what it really returns is the
hypervisor/host name.

[1] https://review.opendev.org/c/932348

Change-Id: I584565b42bfb691c224330ab96664ac9fec150c1
This commit is contained in:
Eduardo Olivares 2024-10-23 13:22:57 +02:00
parent 15692a9fa8
commit 3feaab6c99
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ class BaseTempestWhiteboxTestCase(base.BaseTempestTestCase):
server_details = self.os_admin.servers_client.show_server(server_id) server_details = self.os_admin.servers_client.show_server(server_id)
return server_details['server']['OS-EXT-SRV-ATTR:host'] return server_details['server']['OS-EXT-SRV-ATTR:host']
def get_shortname_for_server(self, server_id): def get_host_shortname_for_server(self, server_id):
return self.get_host_for_server(server_id).split('.')[0] return self.get_host_for_server(server_id).split('.')[0]
@classmethod @classmethod
@ -176,7 +176,7 @@ class BaseTempestWhiteboxTestCase(base.BaseTempestTestCase):
for node in self.nodes: for node in self.nodes:
if not node['is_compute']: if not node['is_compute']:
continue continue
if node['is_compute'] and not node['name'] in exclude_hosts: if node['is_compute'] and not node['short_name'] in exclude_hosts:
return node['name'] return node['name']
raise self.skipException( raise self.skipException(
"Not able to find a different compute than: {}".format( "Not able to find a different compute than: {}".format(
@ -624,7 +624,8 @@ class BaseTempestWhiteboxTestCase(base.BaseTempestTestCase):
kwargs.pop("scheduler_hints", None) kwargs.pop("scheduler_hints", None)
if exclude_hosts: if exclude_hosts:
exclude_hosts_ignored = False exclude_hosts_ignored = False
if kwargs.get('host') and (kwargs['host'] in exclude_hosts): if kwargs.get('host') and (
kwargs['host'].split('.')[0] in exclude_hosts):
exclude_hosts_ignored = True exclude_hosts_ignored = True
LOG.debug("'exclude_hosts' parameter contains same value as " LOG.debug("'exclude_hosts' parameter contains same value as "
"'host' so it will be ignored, i.e. 'host' will be " "'host' so it will be ignored, i.e. 'host' will be "
@ -647,12 +648,14 @@ class BaseTempestWhiteboxTestCase(base.BaseTempestTestCase):
self.addCleanup(test_utils.call_and_ignore_notfound_exc, self.addCleanup(test_utils.call_and_ignore_notfound_exc,
servers_client.delete_server, servers_client.delete_server,
server['id']) server['id'])
# wait for VM ACTIVE to get its host; otherwise host may be None
self.wait_for_server_active(server, client=servers_client)
if exclude_hosts and not exclude_hosts_ignored: if exclude_hosts and not exclude_hosts_ignored:
if self.get_host_for_server(server['id']) in exclude_hosts: if (self.get_host_shortname_for_server(server['id'])
in exclude_hosts):
self.fail("Failed to spawn a server on a host other than in " self.fail("Failed to spawn a server on a host other than in "
"this list: '{}'. Can not proceed.".format( "this list: '{}'. Can not proceed.".format(
' '.join(exclude_hosts))) ' '.join(exclude_hosts)))
self.wait_for_server_active(server, client=servers_client)
port = network_client.list_ports( port = network_client.list_ports(
network_id=network['id'], network_id=network['id'],
device_id=server['id'])['ports'][0] device_id=server['id'])['ports'][0]

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

@ -142,7 +142,7 @@ class OvnDvrBase(base.TrafficFlowTest, base.BaseTempestTestCaseOvn):
self.server = self._create_server( self.server = self._create_server(
exclude_hosts=self.exclude_hosts) exclude_hosts=self.exclude_hosts)
self.compute = self.get_shortname_for_server( self.compute = self.get_host_shortname_for_server(
self.server['server']['id']) self.server['server']['id'])
self.exclude_hosts.append(self.compute) self.exclude_hosts.append(self.compute)
@ -252,7 +252,7 @@ class OvnDvrTest(OvnDvrBase):
ext_vm['port']['fixed_ips'][0]['ip_address'], ext_vm['port']['fixed_ips'][0]['ip_address'],
self.username, pkey=self.keypair['private_key']) self.username, pkey=self.keypair['private_key'])
ssh_client = self.ext_vm_ssh_client ssh_client = self.ext_vm_ssh_client
ext_vm_host = self.get_shortname_for_server( ext_vm_host = self.get_host_shortname_for_server(
ext_vm['server']['id']) ext_vm['server']['id'])
# expected_routing_nodes should not have duplicates # expected_routing_nodes should not have duplicates
expected_routing_nodes = list(set([self.compute, ext_vm_host])) expected_routing_nodes = list(set([self.compute, ext_vm_host]))
@ -324,7 +324,7 @@ class OvnDvrTest(OvnDvrBase):
""" """
self._setup() self._setup()
server2 = self._create_server(exclude_hosts=self.exclude_hosts) server2 = self._create_server(exclude_hosts=self.exclude_hosts)
compute2 = self.get_shortname_for_server( compute2 = self.get_host_shortname_for_server(
server2['server']['id']) server2['server']['id'])
LOG.debug("compute = {}, compute2 = {}".format(self.compute, compute2)) LOG.debug("compute = {}, compute2 = {}".format(self.compute, compute2))
if self.compute == compute2: if self.compute == compute2:
@ -399,7 +399,7 @@ class OvnDvrTest(OvnDvrBase):
CONF.validation.image_ssh_user, CONF.validation.image_ssh_user,
pkey=self.keypair['private_key'], pkey=self.keypair['private_key'],
proxy_client=self.server_ssh_client) proxy_client=self.server_ssh_client)
server2_host = self.get_shortname_for_server( server2_host = self.get_host_shortname_for_server(
server2['server']['id']) server2['server']['id'])
# verify N/S connection with self.server # verify N/S connection with self.server
@ -437,13 +437,13 @@ class OvnDvrTest(OvnDvrBase):
block_migration=block_migration) block_migration=block_migration)
self.wait_for_server_active( self.wait_for_server_active(
self.server['server'], client=self.os_admin.servers_client) self.server['server'], client=self.os_admin.servers_client)
new_host = self.get_shortname_for_server( new_host = self.get_host_shortname_for_server(
self.server['server']['id']) self.server['server']['id'])
self.assertNotEqual(self.compute, new_host, 'Server1 did not migrate') self.assertNotEqual(self.compute, new_host, 'Server1 did not migrate')
# migrate server2 # migrate server2
compute_names = [ compute_names = [
node['name'] for node in self.nodes node['name'] for node in self.nodes
if node['is_compute'] and node['name'] not in ( if node['is_compute'] and node['short_name'] not in (
new_host, server2_host)] new_host, server2_host)]
host = random.choice(compute_names) host = random.choice(compute_names)
self.os_admin.servers_client.live_migrate_server( self.os_admin.servers_client.live_migrate_server(
@ -452,7 +452,7 @@ class OvnDvrTest(OvnDvrBase):
self.wait_for_server_active( self.wait_for_server_active(
server2['server'], client=self.os_admin.servers_client) server2['server'], client=self.os_admin.servers_client)
new_server2_host = self.get_shortname_for_server( new_server2_host = self.get_host_shortname_for_server(
server2['server']['id']) server2['server']['id'])
self.assertNotEqual(server2_host, new_server2_host, self.assertNotEqual(server2_host, new_server2_host,
'Server2 did not migrate') 'Server2 did not migrate')
@ -524,7 +524,7 @@ class OvnDvrTest(OvnDvrBase):
else {}) else {})
servers.append(self._create_server( servers.append(self._create_server(
network=networks[i], scheduler_hints=scheduler_hints)) network=networks[i], scheduler_hints=scheduler_hints))
servers_host.append(self.get_shortname_for_server( servers_host.append(self.get_host_shortname_for_server(
servers[i]['server']['id'])) servers[i]['server']['id']))
servers_fip_mac.append(self.get_fip_port_details( servers_fip_mac.append(self.get_fip_port_details(
servers[i]['fip'])['mac_address']) servers[i]['fip'])['mac_address'])
@ -548,7 +548,7 @@ class OvnDvrTest(OvnDvrBase):
def get_mac_mapping_for_vm(vm): def get_mac_mapping_for_vm(vm):
return self.get_mac_mappings( return self.get_mac_mappings(
self.find_node_client( self.find_node_client(
self.get_shortname_for_server(vm['server']['id'])), self.get_host_shortname_for_server(vm['server']['id'])),
'datacentre') 'datacentre')
def get_expected_macs_for_vlan_tenant(): def get_expected_macs_for_vlan_tenant():
@ -591,14 +591,14 @@ class OvnDvrTest(OvnDvrBase):
else: else:
compute_names = [ compute_names = [
node['name'] for node in self.nodes node['name'] for node in self.nodes
if node['is_compute'] and node['name'] not in ( if node['is_compute'] and node['short_name'] not in (
new_servers_host[0], servers_host[1])] new_servers_host[0], servers_host[1])]
host = random.choice(compute_names) host = random.choice(compute_names)
self.os_admin.servers_client.live_migrate_server( self.os_admin.servers_client.live_migrate_server(
server['server']['id'], host=host, server['server']['id'], host=host,
block_migration=block_migration) block_migration=block_migration)
self.wait_for_server_active(server['server']) self.wait_for_server_active(server['server'])
new_servers_host.append(self.get_shortname_for_server( new_servers_host.append(self.get_host_shortname_for_server(
server['server']['id'])) server['server']['id']))
self.assertNotEqual(servers_host[i], new_servers_host[i], self.assertNotEqual(servers_host[i], new_servers_host[i],
'Server%d did not migrate' % i) 'Server%d did not migrate' % i)
@ -698,7 +698,7 @@ class OvnDvrTest(OvnDvrBase):
port_id=test_server['port']['id'], port_id=test_server['port']['id'],
floating_network_id=CONF.network.public_network_id)['floatingip'] floating_network_id=CONF.network.public_network_id)['floatingip']
fip_port_mac = self.get_fip_port_details(fip)['mac_address'] fip_port_mac = self.get_fip_port_details(fip)['mac_address']
test_server_compute = self.get_shortname_for_server( test_server_compute = self.get_host_shortname_for_server(
test_server['server']['id']) test_server['server']['id'])
self.check_north_south_icmp_flow( self.check_north_south_icmp_flow(
dst_ip=self.gateway_external_ip, dst_ip=self.gateway_external_ip,
@ -880,7 +880,7 @@ class OvnDvrAdvancedTest(base.BaseTempestTestCaseAdvanced,
ip, self.username, ip, self.username,
pkey=self.keypair['private_key'], pkey=self.keypair['private_key'],
proxy_client=ext_vm_ssh_client) proxy_client=ext_vm_ssh_client)
ext_vm_host = self.get_shortname_for_server( ext_vm_host = self.get_host_shortname_for_server(
ext_vm['server']['id']) ext_vm['server']['id'])
if ext_vm_host not in self.expected_routing_nodes: if ext_vm_host not in self.expected_routing_nodes:
self.expected_routing_nodes.append(ext_vm_host) self.expected_routing_nodes.append(ext_vm_host)
@ -935,7 +935,7 @@ class OvnDvrAdvancedTest(base.BaseTempestTestCaseAdvanced,
for vm in [vm1, vm2]: for vm in [vm1, vm2]:
nic = local_utils.get_default_interface(vm['ssh_client']) nic = local_utils.get_default_interface(vm['ssh_client'])
self.expected_routing_nodes.append( self.expected_routing_nodes.append(
self.get_shortname_for_server(vm['id'])) self.get_host_shortname_for_server(vm['id']))
vip_ssh_client = ssh.Client( vip_ssh_client = ssh.Client(
vip_fip['floating_ip_address'], self.username, vip_fip['floating_ip_address'], self.username,
@ -1035,7 +1035,7 @@ class OvnDvrAdvancedTest(base.BaseTempestTestCaseAdvanced,
for vm in [vm1, vm2]: for vm in [vm1, vm2]:
nic = local_utils.get_default_interface(vm['ssh_client']) nic = local_utils.get_default_interface(vm['ssh_client'])
self.expected_routing_nodes.append( self.expected_routing_nodes.append(
self.get_shortname_for_server(vm['id'])) self.get_host_shortname_for_server(vm['id']))
# checking whether an external IPv6 subnet exists or not # checking whether an external IPv6 subnet exists or not
ip_versions = [ ip_versions = [