From 08dea1b7d1d92d893c2f0a5e6e750d838d9cdbe4 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 24 Apr 2018 17:35:08 -0400 Subject: [PATCH] ceph-volume tests update to include devices on listing Signed-off-by: Alfredo Deza --- .../tests/devices/lvm/test_listing.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_listing.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_listing.py index b780ea2e99ccb..674b111d84f40 100644 --- a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_listing.py +++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_listing.py @@ -22,12 +22,16 @@ class TestPrettyReport(object): assert stdout == '\n' def test_type_and_path_are_reported(self, capsys): - lvm.listing.pretty_report({0: [{'type': 'data', 'path': '/dev/sda1'}]}) + lvm.listing.pretty_report({0: [ + {'type': 'data', 'path': '/dev/sda1', 'devices': ['/dev/sda']} + ]}) stdout, stderr = capsys.readouterr() assert '[data] /dev/sda1' in stdout def test_osd_id_header_is_reported(self, capsys): - lvm.listing.pretty_report({0: [{'type': 'data', 'path': '/dev/sda1'}]}) + lvm.listing.pretty_report({0: [ + {'type': 'data', 'path': '/dev/sda1', 'devices': ['/dev/sda']} + ]}) stdout, stderr = capsys.readouterr() assert '====== osd.0 =======' in stdout @@ -36,7 +40,8 @@ class TestPrettyReport(object): {0: [{ 'type': 'data', 'path': '/dev/sda1', - 'tags': {'ceph.osd_id': '0'} + 'tags': {'ceph.osd_id': '0'}, + 'devices': ['/dev/sda'], }]} ) stdout, stderr = capsys.readouterr() @@ -155,7 +160,9 @@ class TestSingleReport(object): # ceph lvs are detected by looking into its tags tags = 'ceph.osd_id=0,ceph.journal_uuid=x,ceph.type=data' lv = api.Volume( - lv_name='lv', vg_name='VolGroup', lv_path='/dev/VolGroup/lv', lv_tags=tags) + lv_name='lv', vg_name='VolGroup', + lv_uuid='aaaa', lv_path='/dev/VolGroup/lv', lv_tags=tags + ) volumes.append(lv) monkeypatch.setattr(lvm.listing.api, 'Volumes', lambda: volumes) result = lvm.listing.List([]).single_report('VolGroup/lv') @@ -167,7 +174,8 @@ class TestSingleReport(object): # ceph lvs are detected by looking into its tags tags = 'ceph.osd_id=0,ceph.journal_uuid=x,ceph.type=data,ceph.journal_device=/dev/sda1' lv = api.Volume( - lv_name='lv', vg_name='VolGroup', lv_path='/dev/VolGroup/lv', lv_tags=tags) + lv_name='lv', vg_name='VolGroup', lv_path='/dev/VolGroup/lv', + lv_uuid='aaa', lv_tags=tags) volumes.append(lv) monkeypatch.setattr(lvm.listing.api, 'Volumes', lambda: volumes) result = lvm.listing.List([]).single_report('/dev/sda1') -- 2.39.5