openstack/cinder
Code Issues Proposed changes

Change the type of "free_capacity_gb" to be float

Browse Source 
Change the type of "free_capacity_gb" from string to float
in function _get_free_capacity.

Fix bug: 1177678
Change-Id: If2654fc3ad6b3dbea6a8cc0be7ae041ad30bf876
This commit is contained in:
zhangchao010 2013-05-10 20:25:53 +08:00 committed by Gerrit Code Review
parent 145b38cc93
commit 59fc6cbd95
2 changed files with 3 additions and 3 deletions
cinder
tests
test_huawei.py
volume/drivers/huawei
huawei_iscsi.py

2
cinder/tests/test_huawei.py

@ -390,7 +390,7 @@ class HuaweiVolumeTestCase(test.TestCase):
def _test_get_get_volume_stats(self):
stats = self.driver.get_volume_stats(True)
fakecapacity = str(int(float(FakePoolInfo['Free Capacity']) / 1024))
fakecapacity = float(FakePoolInfo['Free Capacity']) / 1024
self.assertEqual(stats['free_capacity_gb'], fakecapacity)

4
cinder/volume/drivers/huawei/huawei_iscsi.py

@ -1525,7 +1525,7 @@ class HuaweiISCSIDriver(driver.ISCSIDriver):
lun_type = 'Thick'
poolinfo_dev = self._find_pool_info(lun_type)
pools_conf = root.findall('LUN/StoragePool')
total_free_capacity = 0
total_free_capacity = 0.0
for poolinfo in poolinfo_dev:
if self.device_type['type'] == 'Dorado2100 G2':
total_free_capacity += float(poolinfo[2])
@ -1544,4 +1544,4 @@ class HuaweiISCSIDriver(driver.ISCSIDriver):
total_free_capacity += float(poolinfo[4])
break
return str(int(total_free_capacity / 1024))
return total_free_capacity / 1024