From: Alfredo Deza <adeza@redhat.com>
Date: Mon, 21 Aug 2017 19:43:03 +0000 (-0400)
Subject: tests/osd add tests for ceph-volume* executables
X-Git-Tag: v3.0.0rc4~30^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e3ff46dce22318c4063d8adb86b69899197fded8;p=ceph-ansible.git

tests/osd add tests for ceph-volume* executables

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/tests/functional/tests/osd/test_osds.py b/tests/functional/tests/osd/test_osds.py
index 11fc226a3..d3cefa4e8 100644
--- a/tests/functional/tests/osd/test_osds.py
+++ b/tests/functional/tests/osd/test_osds.py
@@ -4,30 +4,43 @@ import pytest
 class TestOSDs(object):
 
     @pytest.mark.no_docker
-    def test_ceph_osd_package_is_installed(self, node, Package):
-        assert Package("ceph-osd").is_installed
+    def test_ceph_osd_package_is_installed(self, node, host):
+        assert host.package("ceph-osd").is_installed
 
-    def test_osds_listen_on_public_network(self, node, Command):
+    def test_osds_listen_on_public_network(self, node, host):
         # TODO: figure out way to paramaterize this test
         nb_port = (node["num_devices"] * 2)
-        assert Command.check_output("netstat -lntp | grep ceph-osd | grep %s | wc -l" % (node["address"])) == str(nb_port)
+        assert host.check_output("netstat -lntp | grep ceph-osd | grep %s | wc -l" % (node["address"])) == str(nb_port)
 
-    def test_osds_listen_on_cluster_network(self, node, Command):
+    def test_osds_listen_on_cluster_network(self, node, host):
         # TODO: figure out way to paramaterize this test
         nb_port = (node["num_devices"] * 2)
-        assert Command.check_output("netstat -lntp | grep ceph-osd | grep %s | wc -l" % (node["cluster_address"])) == str(nb_port)
+        assert host.check_output("netstat -lntp | grep ceph-osd | grep %s | wc -l" % (node["cluster_address"])) == str(nb_port)
 
-    def test_osd_services_are_running(self, node, Service):
+    def test_osd_services_are_running(self, node, host):
         # TODO: figure out way to paramaterize node['osds'] for this test
         for osd in node["osds"]:
-            assert Service("ceph-osd@%s" % osd).is_running
+            assert host.service("ceph-osd@%s" % osd).is_running
+
+    def test_osd_services_are_running(self, node, host):
+        # TODO: figure out way to paramaterize node['osds'] for this test
+        for osd in node["osds"]:
+            assert host.service("ceph-osd@%s" % osd).is_running
 
     @pytest.mark.no_docker
-    def test_osd_are_mounted(self, node, MountPoint):
+    def test_osd_are_mounted(self, node, host):
         # TODO: figure out way to paramaterize node['osd_ids'] for this test
         for osd_id in node["osd_ids"]:
             osd_path = "/var/lib/ceph/osd/{cluster}-{osd_id}".format(
                 cluster=node["cluster_name"],
                 osd_id=osd_id,
             )
-            assert MountPoint(osd_path).exists
+            assert host.mount_point(osd_path).exists
+
+    @pytest.mark.lvm_scenario
+    def test_ceph_volume_is_installed(self, node, host):
+        host.exists('ceph-volume')
+
+    @pytest.mark.lvm_scenario
+    def test_ceph_volume_systemd_is_installed(self, node, host):
+        host.exists('ceph-volume-systemd')