openstack/neutron-tempest-plugin
Code Issues Proposed changes

refactor: don't require host= for check_connectivity

Browse Source 
When ssh_client is passed, the argument is not used.

Change-Id: Ibf73130fbf82c2ed85e16b3f69aacbc2930efb3d
This commit is contained in:
Ihar Hrachyshka 2024-08-26 12:47:24 -04:00
parent 20dec4e823
commit 2d66355407
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron_tempest_plugin/scenario/base.py
View File

@ -337,7 +337,7 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
if create_fip: if create_fip:
self.fip = self.create_floatingip(port=self.port) self.fip = self.create_floatingip(port=self.port)
def check_connectivity(self, host, ssh_user=None, ssh_key=None, def check_connectivity(self, host=None, ssh_user=None, ssh_key=None,
servers=None, ssh_timeout=None, ssh_client=None): servers=None, ssh_timeout=None, ssh_client=None):
# Either ssh_client or ssh_user+ssh_key is mandatory. # Either ssh_client or ssh_user+ssh_key is mandatory.
if ssh_client is None: if ssh_client is None:

3
neutron_tempest_plugin/scenario/test_metadata.py
View File

@ -169,8 +169,7 @@ class MetadataTest(base.BaseTempestTestCase):
self.network, use_advanced_image=use_advanced_image) self.network, use_advanced_image=use_advanced_image)
self.wait_for_server_active(server=vm.server) self.wait_for_server_active(server=vm.server)
self.wait_for_guest_os_ready(vm.server) self.wait_for_guest_os_ready(vm.server)
self.check_connectivity(host=vm.floating_ip['floating_ip_address'], self.check_connectivity(ssh_client=vm.ssh_client)
ssh_client=vm.ssh_client)
interface = self._get_primary_interface(vm.ssh_client) interface = self._get_primary_interface(vm.ssh_client)
try: try:

1
neutron_tempest_plugin/scenario/test_trunk.py
View File

@ -193,7 +193,6 @@ class TrunkTest(base.BaseTempestTestCase):
self._wait_for_port(port=vm.port) self._wait_for_port(port=vm.port)
self._wait_for_port(port=vm.subport) self._wait_for_port(port=vm.subport)
self.check_connectivity( self.check_connectivity(
host=vm.floating_ip['floating_ip_address'],
ssh_client=vm.ssh_client, ssh_client=vm.ssh_client,
servers=[vm.server]) servers=[vm.server])

4
neutron_tempest_plugin/scenario/test_vlan_transparency.py
View File

@ -138,9 +138,7 @@ class VlanTransparencyTest(base.BaseTempestTestCase):
ssh_clients.append( ssh_clients.append(
self._create_ssh_client(floating_ip=floating_ips[i])) self._create_ssh_client(floating_ip=floating_ips[i]))
self.check_connectivity( self.check_connectivity(ssh_client=ssh_clients[i])
host=floating_ips[i]['floating_ip_address'],
ssh_client=ssh_clients[i])
self._configure_vlan_transparent(port=self.vm_ports[-1], self._configure_vlan_transparent(port=self.vm_ports[-1],
ssh_client=ssh_clients[i], ssh_client=ssh_clients[i],
vlan_tag=vlan_tag, vlan_tag=vlan_tag,