openstack/cinder
Code Issues Proposed changes

Merge "Remove report of allocated_capacity_gb from Inspur driver"

Browse Source
This commit is contained in:
Zuul 2018-07-09 03:38:12 +00:00 committed by Gerrit Code Review
commit 7a403f5fdf
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/tests/unit/volume/drivers/inspur/instorage/test_common.py
View File

@ -882,8 +882,6 @@ class InStorageMCSCommonDriverTestCase(test.TestCase):
self.assertFalse(each_pool['multiattach'])
self.assertLessEqual(each_pool['free_capacity_gb'],
each_pool['total_capacity_gb'])
self.assertLessEqual(each_pool['allocated_capacity_gb'],
each_pool['total_capacity_gb'])
self.assertEqual(25, each_pool['reserved_percentage'])
self.assertEqual(is_thin_provisioning_enabled,
each_pool['thin_provisioning_support'])
@ -896,8 +894,6 @@ class InStorageMCSCommonDriverTestCase(test.TestCase):
self._def_flags['instorage_mcs_volpool_name'])
self.assertAlmostEqual(3328.0, each_pool['total_capacity_gb'])
self.assertAlmostEqual(3287.5, each_pool['free_capacity_gb'])
self.assertAlmostEqual(25.0,
each_pool['allocated_capacity_gb'])
if is_thin_provisioning_enabled:
self.assertAlmostEqual(
1576.96, each_pool['provisioned_capacity_gb'])

3
cinder/volume/drivers/inspur/instorage/instorage_common.py
View File

@ -1208,8 +1208,6 @@ class InStorageMCSCommonDriver(driver.VolumeDriver, san.SanDriver):
in_tier = pool_data['in_tier'] in ['on', 'auto']
total_capacity_gb = float(pool_data['capacity']) / units.Gi
free_capacity_gb = float(pool_data['free_capacity']) / units.Gi
allocated_capacity_gb = (float(pool_data['used_capacity']) /
units.Gi)
provisioned_capacity_gb = float(
pool_data['virtual_capacity']) / units.Gi
@ -1226,7 +1224,6 @@ class InStorageMCSCommonDriver(driver.VolumeDriver, san.SanDriver):
'pool_name': pool_data['name'],
'total_capacity_gb': total_capacity_gb,
'free_capacity_gb': free_capacity_gb,
'allocated_capacity_gb': allocated_capacity_gb,
'provisioned_capacity_gb': provisioned_capacity_gb,
'compression_support': self._state['compression_enabled'],
'reserved_percentage':