x
/
tobiko
Code Issues Proposed changes

Refactor Octavia modules 

This patch refactors the octavia modules, by using the new waiter
methods, removing unnecessary methods and import statements.

Change-Id: Ibd42db81e090767c516617c58aac61ce363721a3
This commit is contained in:
Omer 2021-11-04 16:47:46 +01:00 committed by Federico Ressi
parent 287ba278e2
commit bc291984be
4 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tobiko/openstack/octavia/__init__.py
View File

@ -28,7 +28,6 @@ get_loadbalancer = _client.get_loadbalancer
get_member = _client.get_member
list_members = _client.list_members
list_amphorae = _client.list_amphorae
get_amphora_vm = _client.get_amphora_vm
get_amphora_compute_node = _client.get_amphora_compute_node
get_master_amphora = _client.get_master_amphora

60
tobiko/openstack/octavia/_client.py
View File

@ -13,8 +13,6 @@
# under the License.
from __future__ import absolute_import
import typing
from octaviaclient.api.v2 import octavia
import tobiko
@ -74,11 +72,11 @@ def get_octavia_client(session=None, shared=True, init_client=None,
return client.client
def get_loadbalancer(loadbalancer_id, client=None):
def get_loadbalancer(loadbalancer_id: str, client=None):
return octavia_client(client).load_balancer_show(lb_id=loadbalancer_id)
def get_member(pool_id, member_id, client=None):
def get_member(pool_id: str, member_id: str, client=None):
return octavia_client(client).member_show(pool_id=pool_id,
member_id=member_id)
@ -93,7 +91,7 @@ def list_amphorae(loadbalancer_id: str, client=None):
def get_amphora_compute_node(loadbalancer_id: str,
lb_port: str,
lb_port: int,
lb_protocol: str,
ip_address: str) -> (
topology.OpenStackTopologyNode):
@ -105,13 +103,18 @@ def get_amphora_compute_node(loadbalancer_id: str,
hosts the master amphora will be returned.
:param loadbalancer_id (str): The loadbalancer ID.
:return (TripleoTopologyNode): The compute node which hosts the Amphora
:param lb_port (int): The loadbalancer port.
:param lb_protocol (str): The loadbalancer protocol.
:param ip_address (str): The ip adress of the loadbalancer.
:return (TripleoTopologyNode): The compute node which hosts the Amphora.
"""
amphorae = list_amphorae(loadbalancer_id)
if len(amphorae) > 1: # For a high available LB
amphora = get_master_amphora(amphorae, ip_address, lb_port,
lb_protocol)
amphora = get_master_amphora(amphorae=amphorae,
lb_port=lb_port,
lb_protocol=lb_protocol,
ip_address=ip_address)
else:
amphora = amphorae[0]
@ -120,13 +123,21 @@ def get_amphora_compute_node(loadbalancer_id: str,
return topology.get_openstack_node(hostname=hostname)
def get_master_amphora(amphorae, ip_address, lb_port, lb_protocol,
client=None):
def get_master_amphora(amphorae: dict,
lb_port: int,
lb_protocol: str,
ip_address: str,
client=None) -> dict:
"""Gets the master Amphora in a High Available LB
(a loadbalancer which uses the Active/standby topology)
:param loadbalancer_id (str): The loadbalancer ID.
:return amphora (str): JSON of the Master Amphora.
:param amphorae (dict): The list of amphoras (each represented by
JSON).
:param lb_port (int): The loadbalancer port.
:param lb_protocol (str): The loadbalancer protocol.
:param ip_address (str): The ip adress of the loadbalancer.
:param client (optional): Any client with access to the Octavia APIs.
:return amphora (dict): JSON of the Master Amphora.
"""
# Generate traffic on the LB so we can identify the current Master
@ -138,6 +149,7 @@ def get_master_amphora(amphorae, ip_address, lb_port, lb_protocol,
requests_count=1)
# The amphora which has total_connections > 0 is the master.
# Backup amphora will always have total_connections == 0.
for amphora in amphorae:
amphora_stats = octavia_client(client).amphora_stats_show(
amphora['id'])
@ -145,26 +157,4 @@ def get_master_amphora(amphorae, ip_address, lb_port, lb_protocol,
if listener['total_connections'] > 0:
return amphora
raise ValueError("Amphora wasn't found! Invalid parameters were sent!")
def get_amphora_vm(
loadbalancer_id: str, client=None) -> typing.Optional[nova.NovaServer]:
"""Gets the LB's amphora virtual machine.
When the Octavia's topology is SINGLE, it returns
the amphora's only vm.
When the Octavia's topology is ACTIVE_STANDBY,
it returns the first amphora's vm.
It might be MASTER or BACKUP.
"""
amphora_vm_id = list_amphorae(loadbalancer_id, client)[0]['compute_id']
err_msg = ("Could not find amphora_vm_id for any amphora in " +
f"LB {loadbalancer_id}")
tobiko_test_case = tobiko.get_test_case()
tobiko_test_case.assertTrue(amphora_vm_id, err_msg)
return nova.get_server(server_id=amphora_vm_id)
raise ValueError("Master Amphora wasn't found!")

2
tobiko/openstack/stacks/_octavia.py
View File

@ -140,6 +140,8 @@ class HttpRoundRobinAmphoraIpv4Listener(heat.HeatStackFixture):
return self.listener.listener_id
def wait_for_active_members(self):
"""Wait for all pool members to be active"""
for member in octavia.list_members(pool_id=self.pool_id):
self.wait_for_active_member(pool_id=self.pool_id,
member_id=member['id'])

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

@ -39,8 +39,8 @@ class OctaviaServicesFaultTest(testtools.TestCase):
Create a load balancer with 2 members that run a server application,
Create a client that is connected to the load balancer VIP port,
Generate network traffic from the client to the load balancer while
stopping some of the Octavia's services - if the container runtime
environment is podman.
stopping some of the Octavia's services which run under podman container
runtime environment.
Each service will be running as a single instance.
E.g. only one WORKER_SERVICE will run in all controllers, the same for