From 5b9f0853f780db3b0af6b4b7c1ad1d59184069c9 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Thu, 19 Oct 2017 13:20:55 -0400 Subject: [PATCH] ceph-volume tests activate with fsid works for bluestore and filestore Signed-off-by: Alfredo Deza --- .../tests/devices/lvm/test_activate.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 fb4750816b7..a047ea34dfb 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] -- 2.39.5