RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 03:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37311 from mgariepy/fix-47502

Browse Source 
[ceph-volume]: remove unneeded call to get_devices()
This commit is contained in:
Jan Fajerski 2020-09-25 11:45:16 +02:00 committed by GitHub
commit c514214e0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ceph-volume/ceph_volume/devices/lvm/batch.py
View File

@ -3,7 +3,7 @@ import logging
import json
from textwrap import dedent
from ceph_volume import terminal, decorators
from ceph_volume.util import disk, prompt_bool
from ceph_volume.util import prompt_bool
from ceph_volume.util import arg_validators
from . import strategies
@ -127,9 +127,6 @@ class Batch(object):
_help = dedent("""
Automatically size devices ready for OSD provisioning based on default strategies.
Detected devices:
{detected_devices}
Usage:
ceph-volume lvm batch [DEVICE...]
@ -143,7 +140,7 @@ class Batch(object):
parser = argparse.ArgumentParser(
prog='ceph-volume lvm batch',
formatter_class=argparse.RawDescriptionHelpFormatter,
description=self.print_help(),
description=self._help,
)
parser.add_argument(
@ -260,18 +257,6 @@ class Batch(object):
for dev_list in ['', 'db_', 'wal_', 'journal_']:
setattr(self, '{}usable'.format(dev_list), [])
def get_devices(self):
# remove devices with partitions
devices = [(device, details) for device, details in
disk.get_devices().items() if details.get('partitions') == {}]
size_sort = lambda x: (x[0], x[1]['size'])
return device_formatter(sorted(devices, key=size_sort))
def print_help(self):
return self._help.format(
detected_devices=self.get_devices(),
)
def report(self):
if self.args.format == 'pretty':
self.strategy.report_pretty(self.filtered_devices)

48
src/ceph-volume/ceph_volume/tests/devices/lvm/test_batch.py
View File

@ -9,54 +9,6 @@ class TestBatch(object):
b = batch.Batch([])
b.main()
def test_get_devices(self, monkeypatch):
return_value = {
'/dev/vdd': {
'removable': '0',
'vendor': '0x1af4',
'model': '',
'sas_address': '',
'sas_device_handle': '',
'sectors': 0,
'size': 21474836480.0,
'support_discard': '',
'partitions': {
'vdd1': {
'start': '2048',
'sectors': '41940959',
'sectorsize': 512,
'size': '20.00 GB'
}
},
'rotational': '1',
'scheduler_mode': 'mq-deadline',
'sectorsize': '512',
'human_readable_size': '20.00 GB',
'path': '/dev/vdd'
},
'/dev/vdf': {
'removable': '0',
'vendor': '0x1af4',
'model': '',
'sas_address': '',
'sas_device_handle': '',
'sectors': 0,
'size': 21474836480.0,
'support_discard': '',
'partitions': {},
'rotational': '1',
'scheduler_mode': 'mq-deadline',
'sectorsize': '512',
'human_readable_size': '20.00 GB',
'path': '/dev/vdf'
}
}
monkeypatch.setattr('ceph_volume.devices.lvm.batch.disk.get_devices',
lambda: return_value)
b = batch.Batch([])
result = b.get_devices().strip()
assert result == '* /dev/vdf 20.00 GB rotational'
def test_disjoint_device_lists(self, factory):
device1 = factory(used_by_ceph=False, available=True, abspath="/dev/sda")
device2 = factory(used_by_ceph=False, available=True, abspath="/dev/sdb")