From b629e4eba1aa96ae40e3c5e5a98b00fbcc76eac0 Mon Sep 17 00:00:00 2001 From: Kien Ha Date: Wed, 20 Jun 2018 16:37:03 -0400 Subject: [PATCH] Fix remotefs driver report wrong value allocated_capacity_gb should not be reported by drivers and let the manager handle this. provisioned_capacity_gb is reporting allocated physical space. Return provisioned. Change-Id: I7e1b8d5b399a8dd15bb0dee477090a45c2faa6fa Closes-Bug: #1746233 Signed-off-by: Kien Ha --- cinder/tests/unit/volume/drivers/test_remotefs.py | 2 -- cinder/volume/drivers/remotefs.py | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cinder/tests/unit/volume/drivers/test_remotefs.py b/cinder/tests/unit/volume/drivers/test_remotefs.py index 38c5645905c..d341a91cdb6 100644 --- a/cinder/tests/unit/volume/drivers/test_remotefs.py +++ b/cinder/tests/unit/volume/drivers/test_remotefs.py @@ -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': ( diff --git a/cinder/volume/drivers/remotefs.py b/cinder/volume/drivers/remotefs.py index f5c5b6c1e99..6b85c5e1c38 100644 --- a/cinder/volume/drivers/remotefs.py +++ b/cinder/volume/drivers/remotefs.py @@ -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': (