From: Alfredo Deza Date: Wed, 3 Oct 2018 19:21:03 +0000 (-0400) Subject: ceph-volume tests.lvm verify get_cluster_fsid can read from args or ceph.conf X-Git-Tag: v14.0.1~84^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=02ea6dc0663cdaf764fdb1a1a5b31a736b854e6e;p=ceph.git ceph-volume tests.lvm verify get_cluster_fsid can read from args or ceph.conf Signed-off-by: Alfredo Deza --- diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py index ab0115e959b..4f5aeea874c 100644 --- a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py +++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py @@ -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):