Skip to content

Commit f725405

Browse files
committed
Testing: fix ipv6 rendering
Signed-off-by: Peter Sabaini <peter.sabaini@canonical.com>
1 parent d0381f1 commit f725405

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

ceph-dashboard/tests/target.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import zaza
2727
import zaza.openstack.charm_tests.test_utils as test_utils
2828
import zaza.openstack.utilities.openstack as openstack_utils
29+
import zaza.utilities.networking as network_utils
2930

3031

3132
X509_CERT = '''
@@ -372,9 +373,12 @@ def verify_ssl_config(self, ca_file):
372373
with attempt:
373374
rcs = collections.defaultdict(list)
374375
for unit in units:
376+
ipaddr = network_utils.format_addr(
377+
zaza.model.get_unit_public_address(unit)
378+
)
375379
req = self._run_request_get(
376380
'https://{}:8443'.format(
377-
zaza.model.get_unit_public_address(unit)),
381+
ipaddr),
378382
verify=ca_file,
379383
allow_redirects=False)
380384
rcs[req.status_code].append(

ceph-radosgw/tests/target.py

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import zaza.model as zaza_model
2929
import zaza.openstack.utilities.ceph as zaza_ceph
3030
import zaza.openstack.utilities.generic as zaza_utils
31+
import zaza.utilities.networking as network_utils
3132
import zaza.utilities.juju as juju_utils
3233
import zaza.openstack.utilities.openstack as zaza_openstack
3334
import zaza.openstack.utilities.generic as generic_utils
@@ -243,6 +244,7 @@ def get_rgw_endpoint(self, unit_name: str):
243244
logging.info("Unit: {}, Endpoint: {}".format(unit_name, unit_address))
244245
if unit_address is None:
245246
return None
247+
unit_address = network_utils.format_addr(unit_address)
246248
# Evaluate port
247249
try:
248250
zaza_model.get_application("vault")

0 commit comments

Comments
 (0)