Fix up lint and errors in filesystems

Signed-off-by: Ryan Harper <ryan.harper@canonical.com>
This commit is contained in:
Ryan Harper 2015-06-25 21:22:49 -05:00
parent 940b20be08
commit 4418c94521
1 changed files with 10 additions and 9 deletions

View File

@ -23,7 +23,6 @@ configuration.
from subiquity import models
import argparse
import math
import time
from probert import prober
@ -36,27 +35,29 @@ class FilesystemModel(models.Model):
'Create volume group (LVM2)',
'Create software RAID (MD)',
'Setup hierarchichal storage (bcache)']
def __init__(self):
self.storage= {}
self.options = argparse.Namespace(probe_storage=True, probe_network=False)
self.storage = {}
self.options = argparse.Namespace(probe_storage=True,
probe_network=False)
self.prober = prober.Prober(self.options)
def probe_storage(self):
self.prober.probe()
self.storage = self.prober.get_results().get('storage'}
self.storage = self.prober.get_results().get('storage')
def get_available_disks(self):
return [disk for disk in self.storage.keys()
if self.storage[disk]['DEVTYPE'] == 'disk' and
self.storage[disk]['MAJOR'] == '8']
self.storage[disk]['MAJOR'] == '8']
def _humanize_size(self, size):
size = abs(size)
if (size==0):
if size == 0:
return "0B"
units = ['B','KiB','MiB','GiB','TiB','PiB','EiB','ZiB','YiB']
p = math.floor(math.log(size, 2)/10)
return "%.3f %s" % (size/math.pow(1024,p),units[int(p)])
units = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB']
p = math.floor(math.log(size, 2) / 10)
return "%.3f %s" % (size / math.pow(1024, p), units[int(p)])
def get_disk_size(self, disk):
return self._humanize_size(int(self.storage[disk]['attrs']['size']))