StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not store the raw probe data on the model instance 

it already has enough attributes with overlapping functionality
This commit is contained in:
Michael Hudson-Doyle 2017-03-06 13:35:27 +13:00
parent ad2a92a67d
commit d22cb90626
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
subiquity/models/filesystem.py
View File

@ -88,7 +88,6 @@ class FilesystemModel(object):
self.raid_devices = {} self.raid_devices = {}
self.bcache_devices = {} self.bcache_devices = {}
self.lvm_devices = {} self.lvm_devices = {}
self.storage = {}
self.holders = {} self.holders = {}
self.tags = {} self.tags = {}
@ -107,8 +106,8 @@ class FilesystemModel(object):
def probe_storage(self): def probe_storage(self):
log.debug('model.probe_storage: probing storage') log.debug('model.probe_storage: probing storage')
self.storage = self.prober.get_storage() storage = self.prober.get_storage()
log.debug('got storage:\n{}'.format(self.storage)) log.debug('got storage:\n{}'.format(storage))
# TODO: Put this into a logging namespace for probert # TODO: Put this into a logging namespace for probert
# since its quite a bit of log information. # since its quite a bit of log information.
# log.debug('storage probe data:\n{}'.format( # log.debug('storage probe data:\n{}'.format(
@ -117,11 +116,11 @@ class FilesystemModel(object):
# TODO: replace this with Storage.get_device_by_match() # TODO: replace this with Storage.get_device_by_match()
# which takes a lambda fn for matching # which takes a lambda fn for matching
VALID_MAJORS = ['8', '253'] VALID_MAJORS = ['8', '253']
for disk in self.storage.keys(): for disk in storage.keys():
if self.storage[disk]['DEVTYPE'] == 'disk' and \ if storage[disk]['DEVTYPE'] == 'disk' and \
self.storage[disk]['MAJOR'] in VALID_MAJORS: storage[disk]['MAJOR'] in VALID_MAJORS:
log.debug('disk={}\n{}'.format(disk, log.debug('disk={}\n{}'.format(disk,
json.dumps(self.storage[disk], indent=4, json.dumps(storage[disk], indent=4,
sort_keys=True))) sort_keys=True)))
self.info[disk] = self.prober.get_storage_info(disk) self.info[disk] = self.prober.get_storage_info(disk)