]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume tests.lvm verify get_cluster_fsid can read from args or ceph.conf 25116/head
authorAlfredo Deza <adeza@redhat.com>
Wed, 3 Oct 2018 19:21:03 +0000 (15:21 -0400)
committerAlfredo Deza <adeza@redhat.com>
Thu, 15 Nov 2018 12:28:00 +0000 (07:28 -0500)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 02ea6dc0663cdaf764fdb1a1a5b31a736b854e6e)

src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py

index ab0115e959baf7663e9cc5abdfc1b7ea6d983579..4f5aeea874cdb24d2d6d78102fcf362636055245 100644 (file)
@@ -32,6 +32,21 @@ class TestPrepareDevice(object):
         assert 'A vg/lv path or an existing device is needed' in str(error)
 
 
+class TestGetClusterFsid(object):
+
+    def test_fsid_is_passed_in(self, factory):
+        args = factory(cluster_fsid='aaaa-1111')
+        prepare_obj = lvm.prepare.Prepare([])
+        prepare_obj.args = args
+        assert prepare_obj.get_cluster_fsid() == 'aaaa-1111'
+
+    def test_fsid_is_read_from_ceph_conf(self, factory, conf_ceph_stub):
+        conf_ceph_stub('[global]\nfsid = bbbb-2222')
+        prepare_obj = lvm.prepare.Prepare([])
+        prepare_obj.args = factory(cluster_fsid=None)
+        assert prepare_obj.get_cluster_fsid() == 'bbbb-2222'
+
+
 class TestPrepare(object):
 
     def test_main_spits_help_with_no_arguments(self, capsys):