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.
This commit is contained in:
Frode Nordahl
2019-03-29 07:05:06 +01:00
parent 7b7dc7ec55
commit b03a97a14d
+2 -2
View File
@@ -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,