Merge pull request #1289 from sabaini/fix-ipaddr-format

Use formatter to accomodate ipv6 tests

zaza/openstack/charm_tests/ceph/dashboard/tests.py

@@ -25,6 +25,7 @@ import trustme
 
 import zaza
 import zaza.openstack.charm_tests.test_utils as test_utils
+import zaza.utilities.networking as network_utils
 import zaza.openstack.utilities.openstack as openstack_utils
 
 
@@ -340,9 +341,12 @@ class CephDashboardTest(test_utils.BaseCharmTest):
             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(

zaza/openstack/charm_tests/ceph/tests.py

@@ -35,6 +35,7 @@ import zaza.model as zaza_model
 import zaza.openstack.utilities.ceph as zaza_ceph
 import zaza.openstack.utilities.exceptions as zaza_exceptions
 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
@@ -848,6 +849,7 @@ class CephRGWTest(test_utils.BaseCharmTest):
         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")
@@ -1658,6 +1660,7 @@ class CheckPoolTypes(unittest.TestCase):
                                                min=5, max=10),
                 reraise=True)
 def _get_mon_count_from_prometheus(prometheus_ip):
+    prometheus_ip = network_utils.format_addr(prometheus_ip)
     url = ('http://{}:9090/api/v1/query?query='
            'count(ceph_mon_metadata)'.format(prometheus_ip))
     client = requests.session()