From a9f7794b15aeebe04ae4c257836d2cdcf68a62a4 Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Fri, 11 Oct 2024 12:02:35 +0200 Subject: [PATCH 1/2] tempest: Refactor _add_application_ips. Perform repetitive task in loop on input data rather than repeating the same call three times in the code. Signed-off-by: Frode Nordahl --- zaza/openstack/charm_tests/tempest/utils.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zaza/openstack/charm_tests/tempest/utils.py b/zaza/openstack/charm_tests/tempest/utils.py index b30f187..eaf2b65 100644 --- a/zaza/openstack/charm_tests/tempest/utils.py +++ b/zaza/openstack/charm_tests/tempest/utils.py @@ -217,9 +217,10 @@ def _add_application_ips(ctxt): :returns: None :rtype: None """ - ctxt['keystone'] = juju_utils.get_application_ip('keystone') - ctxt['dashboard'] = juju_utils.get_application_ip('openstack-dashboard') - ctxt['ncc'] = juju_utils.get_application_ip('nova-cloud-controller') + for ctxt_key, application_name in (('keystone', 'keystone'), + ('dashboard', 'openstack-dashboard'), + ('ncc', 'nova-cloud-controller')): + ctxt[ctxt_key] = zaza_juju_utils.get_application_ip(application_name) def _add_nova_config(ctxt, keystone_session, missing_fatal=True): From efca169566dda68a2b3253e70db7026e57e7c0d2 Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Fri, 11 Oct 2024 12:24:32 +0200 Subject: [PATCH 2/2] tempest: Properly render IPv6 endpoint IPs. Signed-off-by: Frode Nordahl --- zaza/openstack/charm_tests/tempest/utils.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zaza/openstack/charm_tests/tempest/utils.py b/zaza/openstack/charm_tests/tempest/utils.py index eaf2b65..3ef71c5 100644 --- a/zaza/openstack/charm_tests/tempest/utils.py +++ b/zaza/openstack/charm_tests/tempest/utils.py @@ -28,7 +28,7 @@ from neutronclient.common import exceptions as neutronexceptions import zaza.model as model import zaza.utilities.deployment_env as deployment_env import zaza.utilities.juju as zaza_juju_utils -import zaza.openstack.utilities.juju as juju_utils +import zaza.utilities.networking import zaza.openstack.utilities.openstack as openstack_utils import zaza.openstack.charm_tests.glance.setup as glance_setup import zaza.openstack.charm_tests.magnum.setup as magnum_setup @@ -220,7 +220,10 @@ def _add_application_ips(ctxt): for ctxt_key, application_name in (('keystone', 'keystone'), ('dashboard', 'openstack-dashboard'), ('ncc', 'nova-cloud-controller')): - ctxt[ctxt_key] = zaza_juju_utils.get_application_ip(application_name) + ip = zaza_juju_utils.get_application_ip(application_name) + if ip: + ip = zaza.utilities.networking.format_addr(ip) + ctxt[ctxt_key] = ip def _add_nova_config(ctxt, keystone_session, missing_fatal=True):