From: Alfredo Deza Date: Thu, 19 Oct 2017 17:20:55 +0000 (-0400) Subject: ceph-volume tests activate with fsid works for bluestore and filestore X-Git-Tag: v12.2.2~83^2~34 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8d72737f90b0cd1db860678ebb66596e233fd646;p=ceph.git ceph-volume tests activate with fsid works for bluestore and filestore Signed-off-by: Alfredo Deza (cherry picked from commit 5b9f0853f780db3b0af6b4b7c1ad1d59184069c9) --- diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py index fb4750816b7b..a047ea34dfb2 100644 --- a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py +++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py @@ -6,6 +6,10 @@ from ceph_volume.api import lvm as api class Args(object): def __init__(self, **kw): + # default flags + self.bluestore = False + self.filestore = False + self.auto_detect_objectstore = None for k, v in kw.items(): setattr(self, k, v) @@ -21,7 +25,16 @@ class TestActivate(object): volumes.append(FooVolume) monkeypatch.setattr(api, 'Volumes', lambda: volumes) monkeypatch.setattr(activate, 'activate_filestore', capture) - args = Args(osd_id=None, osd_fsid='1234') + args = Args(osd_id=None, osd_fsid='1234', filestore=True) + activate.Activate([]).activate(args) + assert capture.calls[0]['args'][0] == [FooVolume] + + def test_no_osd_id_matches_fsid_bluestore(self, is_root, volumes, monkeypatch, capture): + FooVolume = api.Volume(lv_name='foo', lv_path='/dev/vg/foo', lv_tags="ceph.osd_fsid=1234") + volumes.append(FooVolume) + monkeypatch.setattr(api, 'Volumes', lambda: volumes) + monkeypatch.setattr(activate, 'activate_bluestore', capture) + args = Args(osd_id=None, osd_fsid='1234', bluestore=True) activate.Activate([]).activate(args) assert capture.calls[0]['args'][0] == [FooVolume]