x/tobiko
Code Issues Proposed changes

Merge "[Faults] Verify that 'network_disruption' method takes place."

Browse Source
This commit is contained in:
Zuul 2023-10-06 11:59:30 +00:00 committed by Gerrit Code Review
commit 1449078813
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,8 @@ def disrupt_node(node_name, disrupt_method=network_disruption):
LOG.info('disrupt exec: {} on server: {}'.format(disrupt_method, LOG.info('disrupt exec: {} on server: {}'.format(disrupt_method,
node.name)) node.name))
if isinstance(disrupt_method, sh.RebootHostMethod): if isinstance(disrupt_method, sh.RebootHostMethod) \
or is_network_disruption(disrupt_method):
check_overcloud_node_uptime(node.ssh_client, start_time) check_overcloud_node_uptime(node.ssh_client, start_time)
else: else:
check_overcloud_node_responsive(node) check_overcloud_node_responsive(node)
@ -204,8 +205,8 @@ def disrupt_all_controller_nodes(disrupt_method=sh.hard_reset_method,
start_time = {} start_time = {}
for controller in nodes: for controller in nodes:
start_time[controller.name] = tobiko.time()
if isinstance(disrupt_method, sh.RebootHostMethod): if isinstance(disrupt_method, sh.RebootHostMethod):
start_time[controller.name] = tobiko.time()
reboot_node(controller.name, wait=sequentially, reboot_node(controller.name, wait=sequentially,
reboot_method=disrupt_method) reboot_method=disrupt_method)
else: else:
@ -214,12 +215,16 @@ def disrupt_all_controller_nodes(disrupt_method=sh.hard_reset_method,
LOG.info('disrupt exec: {} on server: {}'.format(disrupt_method, LOG.info('disrupt exec: {} on server: {}'.format(disrupt_method,
controller.name)) controller.name))
tobiko.cleanup_fixture(controller.ssh_client) tobiko.cleanup_fixture(controller.ssh_client)
if sequentially and is_network_disruption(disrupt_method):
check_overcloud_node_uptime(
controller.ssh_client, start_time[controller.name])
if sequentially: if sequentially:
check_overcloud_node_responsive(controller) check_overcloud_node_responsive(controller)
if not sequentially: if not sequentially:
for controller in nodes: for controller in nodes:
if isinstance(disrupt_method, sh.RebootHostMethod): if isinstance(disrupt_method, sh.RebootHostMethod) \
or is_network_disruption(disrupt_method):
check_overcloud_node_uptime( check_overcloud_node_uptime(
controller.ssh_client, start_time[controller.name]) controller.ssh_client, start_time[controller.name])
else: else:
@ -481,6 +486,14 @@ def network_undisrupt_controllers_non_main_vip():
inverse=True) inverse=True)
def is_network_disruption(disrupt_method):
if re.search("ip6?tables", disrupt_method) \
and not re.search("restore", disrupt_method):
return True
else:
return False
def get_network_disruption(isIpv6=False): def get_network_disruption(isIpv6=False):
""" """
Param: isIpv6: boolean Param: isIpv6: boolean