Skip to content

Commit

Permalink
Merge pull request #1273 from dosaboy/octavia-volume-backend-amphora-…
Browse files Browse the repository at this point in the history
…antelope

[Antelope] Add Octavia volume-based Amphora test
  • Loading branch information
javacruft authored Oct 9, 2024
2 parents f25ddde + fe7bb59 commit 754535e
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 7 deletions.
1 change: 1 addition & 0 deletions zaza/openstack/charm_tests/octavia/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ def ensure_lts_images():
glance_setup.add_lts_image(image_name='bionic', release='bionic')
glance_setup.add_lts_image(image_name='focal', release='focal')
glance_setup.add_lts_image(image_name='jammy', release='jammy')
glance_setup.add_lts_image(image_name='noble', release='noble')


def add_amphora_image(image_url=None):
Expand Down
63 changes: 56 additions & 7 deletions zaza/openstack/charm_tests/octavia/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

"""Encapsulate octavia testing."""

import json
import logging
import subprocess
import tenacity
Expand All @@ -33,6 +34,7 @@
LoadBalancerUnexpectedState,
LoadBalancerUnrecoverableError,
)
from zaza.openstack.utilities.os_versions import CompareOpenStack

LBAAS_ADMIN_ROLE = 'load-balancer_admin'

Expand Down Expand Up @@ -191,12 +193,6 @@ def setUpClass(cls):
cls.keystone_client = ObjectRetrierWraps(
openstack_utils.get_keystone_session_client(cls.keystone_session))

if (openstack_utils.get_os_release() >=
openstack_utils.get_os_release('focal_wallaby')):
# add role to admin user for the duration of the test
grant_role_current_user(cls.keystone_client, cls.keystone_session,
LBAAS_ADMIN_ROLE)

cls.neutron_client = ObjectRetrierWraps(
openstack_utils.get_neutron_session_client(cls.keystone_session))
cls.octavia_client = ObjectRetrierWraps(
Expand All @@ -214,6 +210,16 @@ def setUpClass(cls):
# List of floating IPs created by this test
cls.fips = []

def setUp(self):
"""Configure the octavia test environment."""
super(LBAASv2Test, self).setUp()
if (openstack_utils.get_os_release() >=
openstack_utils.get_os_release('focal_wallaby')):
# add role to admin user for the duration of the test
grant_role_current_user(self.keystone_client,
self.keystone_session,
LBAAS_ADMIN_ROLE)

def _remove_amphorae_instances(self):
"""Remove amphorae instances forcefully.
Expand Down Expand Up @@ -244,6 +250,7 @@ def resource_cleanup(self, only_local=False):
:param only_local: When set to true do not call parent method
:type only_local: bool
"""
logging.info("deleting loadbalancer(s): {}".format(self.loadbalancers))
for lb in self.loadbalancers:
try:
self.octavia_client.load_balancer_delete(
Expand Down Expand Up @@ -450,7 +457,7 @@ def _get_payload(ip):
'http://{}/'.format(ip)],
universal_newlines=True)

def test_create_loadbalancer(self):
def create_loadbalancer(self, ensure_volume_backed=False):
"""Create load balancer."""
# Prepare payload instances
# First we allow communication to port 80 by adding a security group
Expand Down Expand Up @@ -520,5 +527,47 @@ def test_create_loadbalancer(self):
.format(snippet, provider,
lb_fp['floating_ip_address']))

if ensure_volume_backed:
amphora_list = self.octavia_client.amphora_list()
self.assertTrue(len(amphora_list) > 0)
attached_volumes = []
for amphora in amphora_list.get('amphorae', []):
server_id = amphora['compute_id']
logging.info("Checking amphora {} server {} for attached "
"volumes".format(amphora['id'], server_id))
volumes = self.nova_client.volumes.get_server_volumes(
server_id)
logging.info('amphora {} server {} has volumes={}'.
format(amphora['id'],
server_id, volumes))
attached_volumes.append(json.dumps(vars(volumes)))

self.assertTrue(len(attached_volumes) > 0)
logging.info("Amphora volumes creation successful: {}".format(
attached_volumes))

# If we get here, it means the tests passed
self.run_resource_cleanup = True

def test_create_loadbalancer(self):
"""Test creating a load balancer."""
self.create_loadbalancer()


class OctaviaVolumeBackedAmphoraTest(LBAASv2Test):
"""Octavia service tests."""

def test_volume_backed_amphora(self):
"""Test volume-backed amphora load balancer."""
os_versions = openstack_utils.get_current_os_versions(['octavia'])
if CompareOpenStack(os_versions['octavia']) < 'ussuri':
self.skipTest('Run only for Openstack Ussuri and newer releases.')
return

"""Test creating a load balancer that uses volume-based amphora."""
default_charm_config = {'enable-volume-based-amphora': False}
alternate_charm_config = {'enable-volume-based-amphora': True}
with self.config_change(default_charm_config,
alternate_charm_config, reset_to_charm_default=True):
logging.info("Testing create volume-backed amphora loadbalancer")
self.create_loadbalancer(ensure_volume_backed=True)
5 changes: 5 additions & 0 deletions zaza/openstack/utilities/openstack.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@
'pkg': 'placement-common',
'origin_setting': 'openstack-origin'
},
'octavia': {
'pkg': 'octavia-common',
'origin_setting': 'openstack-origin'
},
}

# Older tests use the order the services appear in the list to imply
Expand All @@ -164,6 +168,7 @@
{'name': 'ovn-central', 'type': CHARM_TYPES['ovn-central']},
{'name': 'ceph-mon', 'type': CHARM_TYPES['ceph-mon']},
{'name': 'placement', 'type': CHARM_TYPES['placement']},
{'name': 'octavia', 'type': CHARM_TYPES['octavia']},
]


Expand Down

0 comments on commit 754535e

Please sign in to comment.