x/tobiko
Code Issues Proposed changes

Merge "Adapt test_soft_reboot_computes_recovery to Amphora LBs"

Browse Source
This commit is contained in:
Zuul 2023-07-10 13:42:26 +00:00 committed by Gerrit Code Review
commit e3f28757d4
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tobiko/tests/faults/ha/cloud_disruptions.py
View File

@ -431,26 +431,36 @@ def network_undisrupt_controllers_non_main_vip():
inverse=True)
def reset_all_compute_nodes(hard_reset=False):
def reset_all_compute_nodes(hard_reset=False, sequentially=False):
# reboot all computes and wait for ssh Up on them
# hard reset is simultaneous while soft is sequential
def _check_compute(ssh_client):
compute_checked = sh.execute(
"hostname", ssh_client=ssh_client, expect_exit_status=None).stdout
LOG.info('{} is up '.format(compute_checked))
if hard_reset:
reset_method = sh.hard_reset_method
else:
reset_method = sh.soft_reset_method
for compute in topology.list_openstack_nodes(group='compute'):
nodes = topology.list_openstack_nodes(group='compute')
for compute in nodes:
# using ssh_client.connect we use a fire and forget reboot method
sh.reboot_host(ssh_client=compute.ssh_client, wait=False,
method=reset_method)
LOG.info('reboot exec: {} on server: {}'.format(reset_method,
compute.name))
tobiko.cleanup_fixture(compute.ssh_client)
if sequentially:
# without the sleep, the command succeeds right after the reboot
# - i.e. the node had not been stopped yet
time.sleep(5)
_check_compute(compute.ssh_client)
for compute in topology.list_openstack_nodes(group='compute'):
compute_checked = sh.execute("hostname", ssh_client=compute.ssh_client,
expect_exit_status=None).stdout
LOG.info('{} is up '.format(compute_checked))
if not sequentially:
for compute in nodes:
_check_compute(compute.ssh_client)
def reset_ovndb_pcs_master_resource():

13
tobiko/tests/faults/ha/test_cloud_recovery.py
View File

@ -171,10 +171,21 @@ class DisruptTripleoNodesTest(testtools.TestCase):
cloud_disruptions.reset_all_controller_nodes()
OvercloudHealthCheck.run_after()
@staticmethod
def _any_amphora_lb():
""" returns True if octavia is configured and any octavia amphora LB
exists"""
return (keystone.has_service(name='octavia') and
any([lb['provider'] == octavia.AMPHORA_PROVIDER
for lb in octavia.list_load_balancers()]))
@nova.skip_background_vm_ping_checks
def test_soft_reboot_computes_recovery(self):
OvercloudHealthCheck.run_before()
cloud_disruptions.reset_all_compute_nodes(hard_reset=False)
sequentially = self._any_amphora_lb()
cloud_disruptions.reset_all_compute_nodes(hard_reset=False,
sequentially=sequentially)
# verify VM status is updated after reboot
nova.wait_for_all_instances_status('SHUTOFF')
# start all VM instance