From: Jan Fajerski <jan--f@users.noreply.github.com>
Date: Wed, 12 Aug 2020 12:21:25 +0000 (+0200)
Subject: Merge pull request #35900 from rishabh-d-dave/wip-32493-notrack-mimic
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3a8ad2d05874b4b3fa75a53e266a70fb1faf8740;p=ceph.git

Merge pull request #35900 from rishabh-d-dave/wip-32493-notrack-mimic

mimic: ceph-volume: don't use container classes in api/lvm.py
---

3a8ad2d05874b4b3fa75a53e266a70fb1faf8740
diff --cc src/ceph-volume/ceph_volume/tests/util/test_device.py
index 82267fd9339ea,56921131d8b48..10c146edd05f1
--- a/src/ceph-volume/ceph_volume/tests/util/test_device.py
+++ b/src/ceph-volume/ceph_volume/tests/util/test_device.py
@@@ -5,27 -6,36 +6,39 @@@ from ceph_volume.api import lvm as ap
  
  class TestDevice(object):
  
-     def test_sys_api(self, device_info):
+     def test_sys_api(self, volumes, monkeypatch, device_info):
+         volume = api.Volume(lv_name='lv', lv_uuid='y', vg_name='vg',
+                             lv_tags={}, lv_path='/dev/VolGroup/lv')
+         volumes.append(volume)
+         monkeypatch.setattr(api, 'get_lvs', lambda **kwargs:
+                             deepcopy(volumes))
+ 
          data = {"/dev/sda": {"foo": "bar"}}
 -        device_info(devices=data)
 +        lsblk = {"TYPE": "disk"}
 +        device_info(devices=data,lsblk=lsblk)
          disk = device.Device("/dev/sda")
          assert disk.sys_api
          assert "foo" in disk.sys_api
  
-     def test_lvm_size(self, device_info):
+     def test_lvm_size(self, volumes, monkeypatch, device_info):
+         volume = api.Volume(lv_name='lv', lv_uuid='y', vg_name='vg',
+                             lv_tags={}, lv_path='/dev/VolGroup/lv')
+         volumes.append(volume)
+         monkeypatch.setattr(api, 'get_lvs', lambda **kwargs:
+                             deepcopy(volumes))
+ 
          # 5GB in size
          data = {"/dev/sda": {"size": "5368709120"}}
 -        device_info(devices=data)
 +        lsblk = {"TYPE": "disk"}
 +        device_info(devices=data,lsblk=lsblk)
          disk = device.Device("/dev/sda")
          assert disk.lvm_size.gb == 4
  
-     def test_lvm_size_rounds_down(self, device_info):
+     def test_lvm_size_rounds_down(self, device_info, volumes):
          # 5.5GB in size
          data = {"/dev/sda": {"size": "5905580032"}}
 -        device_info(devices=data)
 +        lsblk = {"TYPE": "disk"}
 +        device_info(devices=data,lsblk=lsblk)
          disk = device.Device("/dev/sda")
          assert disk.lvm_size.gb == 4