From b03a97a14d8b9ae0fd0a86d24b16ce2372a05f0b Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Fri, 29 Mar 2019 07:05:06 +0100 Subject: [PATCH] charm_tests/ceph/rbd_mirror: Use sorted list of pool names At present the test uses a dict which includes the internal numeric ID each pool has. This may be different on each side depending on which order the pools were created in. Use pool name in a sorted list for comparison instead. --- zaza/charm_tests/ceph/rbd_mirror/tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zaza/charm_tests/ceph/rbd_mirror/tests.py b/zaza/charm_tests/ceph/rbd_mirror/tests.py index 8b94db5..a90dd50 100644 --- a/zaza/charm_tests/ceph/rbd_mirror/tests.py +++ b/zaza/charm_tests/ceph/rbd_mirror/tests.py @@ -52,7 +52,7 @@ class CephRBDMirrorBase(test_utils.OpenStackBaseTest): def get_pools(self): """Retrieve list of pools from both sites. - :returns: Tuple with two dicts representing the pools on each side. + :returns: Tuple with list of pools on each side. :rtype: tuple """ site_a_pools = zaza.utilities.ceph.get_ceph_pools( @@ -64,7 +64,7 @@ class CephRBDMirrorBase(test_utils.OpenStackBaseTest): 'ceph-mon' + self.site_b_app_suffix, model_name=self.site_b_model), model_name=self.site_b_model) - return site_a_pools, site_b_pools + return sorted(site_a_pools.keys()), sorted(site_b_pools.keys()) def wait_for_mirror_state(self, state, application_name=None, model_name=None,