Merge pull request #33 from sabaini/fix/ipaddr-rendering

Testing: fix ipv6 rendering

Author: sabaini

ceph-dashboard/tests/target.py

@@ -26,6 +26,7 @@
 import zaza
 import zaza.openstack.charm_tests.test_utils as test_utils
 import zaza.openstack.utilities.openstack as openstack_utils
+import zaza.utilities.networking as network_utils
 
 
 X509_CERT = '''
@@ -372,9 +373,12 @@ def verify_ssl_config(self, ca_file):
             with attempt:
                 rcs = collections.defaultdict(list)
                 for unit in units:
+                    ipaddr = network_utils.format_addr(
+                        zaza.model.get_unit_public_address(unit)
+                    )
                     req = self._run_request_get(
                         'https://{}:8443'.format(
-                            zaza.model.get_unit_public_address(unit)),
+                            ipaddr),
                         verify=ca_file,
                         allow_redirects=False)
                     rcs[req.status_code].append(

ceph-radosgw/tests/target.py

@@ -28,6 +28,7 @@
 import zaza.model as zaza_model
 import zaza.openstack.utilities.ceph as zaza_ceph
 import zaza.openstack.utilities.generic as zaza_utils
+import zaza.utilities.networking as network_utils
 import zaza.utilities.juju as juju_utils
 import zaza.openstack.utilities.openstack as zaza_openstack
 import zaza.openstack.utilities.generic as generic_utils
@@ -243,6 +244,7 @@ def get_rgw_endpoint(self, unit_name: str):
         logging.info("Unit: {}, Endpoint: {}".format(unit_name, unit_address))
         if unit_address is None:
             return None
+        unit_address = network_utils.format_addr(unit_address)
         # Evaluate port
         try:
             zaza_model.get_application("vault")