tests: use cluster_name in tests when needed

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/tests/functional/tests/mon/test_mons.py b/tests/functional/tests/mon/test_mons.py
index 1ba4d1d68f02bdd353219374f98cbd4d1a66d26c..5f98d372a2d8120c1020bbb325d27344f2ff802e 100644 (file)
--- a/tests/functional/tests/mon/test_mons.py
+++ b/tests/functional/tests/mon/test_mons.py
@@ -8,22 +8,28 @@ class TestMons(object):
         assert Socket("tcp://%s:6789" % node["address"]).is_listening
 
     def test_mon_service_is_running(self, node, Service):
-        service_name = "ceph-mon@ceph-%s" % node["vars"]["inventory_hostname"]
+        service_name = "ceph-mon@ceph-{hostname}".format(
+            hostname=node["vars"]["inventory_hostname"]
+        )
         assert Service(service_name).is_running
 
     def test_mon_service_is_enabled(self, node, Service):
-        service_name = "ceph-mon@ceph-%s" % node["vars"]["inventory_hostname"]
+        service_name = "ceph-mon@ceph-{hostname}".format(
+            hostname=node["vars"]["inventory_hostname"]
+        )
         assert Service(service_name).is_enabled
 
     def test_can_get_cluster_health(self, node, Command):
-        output = Command.check_output("sudo ceph -s")
+        cmd = "sudo ceph --cluster={} --connect-timeout 5 -s".format(node["cluster_name"])
+        output = Command.check_output(cmd)
         assert output.strip().startswith("cluster")
 
 
 class TestOSDs(object):
 
     def test_all_osds_are_up_and_in(self, node, Command):
-        output = Command.check_output("sudo ceph -s")
+        cmd = "sudo ceph --cluster={} --connect-timeout 5 -s".format(node["cluster_name"])
+        output = Command.check_output(cmd)
         num_osds = len(node["vars"]["devices"])
         phrase = "{num_osds} osds: {num_osds} up, {num_osds} in".format(num_osds=num_osds)
         assert phrase in output

diff --git a/tests/functional/tests/osd/test_osds.py b/tests/functional/tests/osd/test_osds.py
index e3052e21242e9444dc2cbe679194f5981b1004f4..efb15ff2ec5a31a738376215300999399a19ebdb 100644 (file)
--- a/tests/functional/tests/osd/test_osds.py
+++ b/tests/functional/tests/osd/test_osds.py
@@ -20,4 +20,8 @@ class TestOSDs(object):
     def test_osd_are_mounted(self, node, MountPoint):
         # TODO: figure out way to paramaterize node['osd_ids'] for this test
         for osd_id in node["osd_ids"]:
-            assert MountPoint("/var/lib/ceph/osd/ceph-%s" % osd_id).exists
+            osd_path = "/var/lib/ceph/osd/{cluster}-{osd_id}".format(
+                cluster=node["cluster_name"],
+                osd_id=osd_id,
+            )
+            assert MountPoint(osd_path).exists