x/tobiko
Code Issues Proposed changes

Merge "Improve DisruptTripleoNodesTest tearDown"

Browse Source
This commit is contained in:
Zuul 2023-11-15 15:32:37 +00:00 committed by Gerrit Code Review
commit 35b59a826d
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,14 +206,25 @@ class DisruptTripleoNodesTest(testtools.TestCase):
def tearDown(self): def tearDown(self):
super(DisruptTripleoNodesTest, self).tearDown() super(DisruptTripleoNodesTest, self).tearDown()
for vm in self.vms_detailed_info or []: for i, vm in enumerate(self.vms_detailed_info or []):
if vm is None or vm.get('id') is None: if vm is None or vm.get('id') is None:
# server_name pattern comes from multi_ip_test_stack.yaml
server_name = "group_of_vms_%d" % i
try:
server = nova_osp.find_server(unique=True,
name=server_name)
except tobiko.ObjectNotFound:
LOG.debug(f"Server {server_name} not found. "
"Perhaps it was never created.")
continue continue
vm_id = server.id
else:
vm_id = vm['id'] vm_id = vm['id']
try: try:
nova_osp.delete_server(vm_id) nova_osp.delete_server(vm_id)
except nova_osp.ServerNotFoundError: except nova_osp.ServerNotFoundError:
LOG.debug(f"Server {vm_id} not found") LOG.debug(f"Server {vm_id} not found. "
"Perhaps it was already deleted.")
@nova.skip_background_vm_ping_checks_when_nondvr @nova.skip_background_vm_ping_checks_when_nondvr
@testtools.skipIf(has_external_lb, SKIP_MESSAGE_EXTLB) @testtools.skipIf(has_external_lb, SKIP_MESSAGE_EXTLB)