openstack
/
cinder
Code Issues Proposed changes

Merge "Fix remotefs driver report wrong value"

This commit is contained in:
Zuul 2018-08-02 19:03:33 +00:00 committed by Gerrit Code Review
parent 7e6746f76e b629e4eba1
commit 00956b26ab
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/tests/unit/volume/drivers/test_remotefs.py
View File

@ -681,7 +681,6 @@ class RemoteFSPoolMixinTestCase(test.TestCase):
share_total_gb = 3
share_free_gb = 2
share_used_gb = 4 # provisioned space
expected_allocated_gb = share_total_gb - share_free_gb
self._driver._mounted_shares = [mock.sentinel.share]
@ -710,7 +709,6 @@ class RemoteFSPoolMixinTestCase(test.TestCase):
'total_capacity_gb': float(share_total_gb),
'free_capacity_gb': float(share_free_gb),
'provisioned_capacity_gb': float(share_used_gb),
'allocated_capacity_gb': float(expected_allocated_gb),
'reserved_percentage': (
self._driver.configuration.reserved_percentage),
'max_over_subscription_ratio': (

7
cinder/volume/drivers/remotefs.py
View File

@ -1734,14 +1734,13 @@ class RemoteFSPoolMixin(object):
for share in self._mounted_shares:
(share_capacity,
share_free,
share_used) = self._get_capacity_info(share)
total_allocated) = self._get_capacity_info(share)
pool = {'pool_name': self._get_pool_name_from_share(share),
'total_capacity_gb': share_capacity / float(units.Gi),
'free_capacity_gb': share_free / float(units.Gi),
'provisioned_capacity_gb': share_used / float(units.Gi),
'allocated_capacity_gb': (
share_capacity - share_free) / float(units.Gi),
'provisioned_capacity_gb': (
total_allocated / float(units.Gi)),
'reserved_percentage': (
self.configuration.reserved_percentage),
'max_over_subscription_ratio': (