x/tobiko
Code Issues Proposed changes

Merge "Fix Octavia services test"

Browse Source
This commit is contained in:
Zuul 2022-03-11 20:39:15 +00:00 committed by Gerrit Code Review
commit 4d914fa521
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tobiko/tests/faults/octavia/test_services.py
View File

@ -83,13 +83,26 @@ class OctaviaServicesFaultTest(testtools.TestCase):
self.listener_stack.wait_for_members_to_be_reachable()
# For 5 minutes we ignore specific exceptions as we know
# that Octavia resources are being provisioned
# Sending initial traffic before we stop octavia services
octavia.check_members_balanced(
pool_id=self.listener_stack.pool_id,
ip_address=self.loadbalancer_stack.floating_ip_address,
lb_algorithm=self.listener_stack.lb_algorithm,
protocol=self.listener_stack.lb_protocol,
port=self.listener_stack.lb_port)
for attempt in tobiko.retry(timeout=300.):
try:
octavia.check_members_balanced(
pool_id=self.listener_stack.pool_id,
ip_address=self.loadbalancer_stack.floating_ip_address,
lb_algorithm=self.listener_stack.lb_algorithm,
protocol=self.listener_stack.lb_protocol,
port=self.listener_stack.lb_port)
break
except (octavia.RoundRobinException,
octavia.TrafficTimeoutError,
sh.ShellCommandFailed):
LOG.exception(f"Traffic didn't reach all members after "
f"#{attempt.number} attempts and "
f"{attempt.elapsed_time} seconds")
if attempt.is_last:
raise
def test_services_fault(self):
# excluded_services are the services which will be stopped
@ -174,12 +187,23 @@ class OctaviaServicesFaultTest(testtools.TestCase):
self.loadbalancer_stack.wait_for_octavia_service()
octavia.check_members_balanced(
pool_id=self.listener_stack.pool_id,
ip_address=self.loadbalancer_stack.floating_ip_address,
lb_algorithm=self.listener_stack.lb_algorithm,
protocol=self.listener_stack.lb_protocol,
port=self.listener_stack.lb_port)
# For 30 seconds we ignore the OctaviaClientException as we know
# that Octavia services are being stopped and restarted
for attempt in tobiko.retry(timeout=30.):
try:
octavia.check_members_balanced(
pool_id=self.listener_stack.pool_id,
ip_address=self.loadbalancer_stack.floating_ip_address,
lb_algorithm=self.listener_stack.lb_algorithm,
protocol=self.listener_stack.lb_protocol,
port=self.listener_stack.lb_port)
break
except octavia.OctaviaClientException:
LOG.exception(f"Octavia service was unavailable after "
f"#{attempt.number} attempts and "
f"{attempt.elapsed_time} seconds")
if attempt.is_last:
raise
def _start_octavia_main_services(
self, controllers: typing.List[OpenStackTopologyNode] = None):

2
tobiko/tests/scenario/octavia/test_traffic.py
View File

@ -64,7 +64,7 @@ class OctaviaBasicTrafficScenarioTest(testtools.TestCase):
self.listener_stack.wait_for_members_to_be_reachable()
def test_round_robin_traffic(self):
# For 5 minutes seconds we ignore specific exceptions as we know
# For 5 minutes we ignore specific exceptions as we know
# that Octavia resources are being provisioned
for attempt in tobiko.retry(timeout=300.):
try: