Fix total and free capacity calculations.
Change-Id: I8cd3d15480a49e7bcdcb8a08cc82f6af637c7bef
This commit is contained in:
parent
b91ea93fe7
commit
a815d9da4c
|
@ -104,7 +104,7 @@ def fixup_str(propstr):
|
||||||
def str_to_size(sizestr):
|
def str_to_size(sizestr):
|
||||||
if 'GB' in sizestr:
|
if 'GB' in sizestr:
|
||||||
sizestr = sizestr.replace('GB', '')
|
sizestr = sizestr.replace('GB', '')
|
||||||
sizestr = int(float(sizestr) * 1024)
|
sizestr = int(float(sizestr) * 1000)
|
||||||
elif 'GiB' in sizestr:
|
elif 'GiB' in sizestr:
|
||||||
sizestr = sizestr.replace('GiB', '')
|
sizestr = sizestr.replace('GiB', '')
|
||||||
sizestr = int(float(sizestr) * 1024)
|
sizestr = int(float(sizestr) * 1024)
|
||||||
|
|
|
@ -102,6 +102,22 @@ def natural_sort(iterable):
|
||||||
return sorted(iterable)
|
return sorted(iterable)
|
||||||
|
|
||||||
|
|
||||||
|
def str_to_size(sizestr):
|
||||||
|
if 'GB' in sizestr:
|
||||||
|
sizestr = sizestr.replace('GB', '')
|
||||||
|
sizestr = int(float(sizestr) * 1000)
|
||||||
|
elif 'GiB' in sizestr:
|
||||||
|
sizestr = sizestr.replace('GiB', '')
|
||||||
|
sizestr = int(float(sizestr) * 1024)
|
||||||
|
elif 'TB' in sizestr:
|
||||||
|
sizestr = sizestr.replace('TB', '')
|
||||||
|
sizestr = int(float(sizestr) * 1000 * 1000)
|
||||||
|
elif 'TiB' in sizestr:
|
||||||
|
sizestr = sizestr.replace('TiB', '')
|
||||||
|
sizestr = int(float(sizestr) * 1024 * 1024)
|
||||||
|
return sizestr
|
||||||
|
|
||||||
|
|
||||||
class OEMHandler(generic.OEMHandler):
|
class OEMHandler(generic.OEMHandler):
|
||||||
logouturl = '/api/providers/logout'
|
logouturl = '/api/providers/logout'
|
||||||
bmcname = 'XCC'
|
bmcname = 'XCC'
|
||||||
|
@ -708,12 +724,8 @@ class OEMHandler(generic.OEMHandler):
|
||||||
spares.append(diskinfo)
|
spares.append(diskinfo)
|
||||||
else:
|
else:
|
||||||
disks.append(diskinfo)
|
disks.append(diskinfo)
|
||||||
totalsize = pool['totalCapacityStr'].replace(
|
totalsize = str_to_size(pool['totalCapacityStr'])
|
||||||
'GB', '').replace('GiB', '')
|
freesize = str_to_size(pool['freeCapacityStr'])
|
||||||
totalsize = int(float(totalsize) * 1024)
|
|
||||||
freesize = pool['freeCapacityStr'].replace(
|
|
||||||
'GB', '').replace('GiB', '')
|
|
||||||
freesize = int(float(freesize) * 1024)
|
|
||||||
pools.append(storage.Array(
|
pools.append(storage.Array(
|
||||||
disks=disks, raid=pool['rdlvlstr'], volumes=volumes,
|
disks=disks, raid=pool['rdlvlstr'], volumes=volumes,
|
||||||
id=(cid, pool['id']), hotspares=spares,
|
id=(cid, pool['id']), hotspares=spares,
|
||||||
|
|
Loading…
Reference in New Issue