Fix for solidfire driver to use reserved_percentage

Fixed _update_cluster_status so reserved_percentage uses value
from cinder.conf.

Change-Id: I74af8dd86645b4c0800391bd126bf2bce94cf205

diff --git a/cinder/tests/test_solidfire.py b/cinder/tests/test_solidfire.py
index 1505538edf6303ec9364f87ef379d6d61442401e..c4efcfe7da7f6ca3c0be6a784c11039bae073600 100644 (file)
--- a/cinder/tests/test_solidfire.py
+++ b/cinder/tests/test_solidfire.py
@@ -46,6 +46,7 @@ class SolidFireVolumeTestCase(test.TestCase):
         self.configuration.san_is_local = True
         self.configuration.sf_emulate_512 = True
         self.configuration.sf_account_prefix = 'cinder'
+        self.configuration.reserved_percentage = 25
 
         super(SolidFireVolumeTestCase, self).setUp()
         self.stubs.Set(SolidFireDriver, '_issue_api_request',

diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py
index 5ed33134e53aaa82e8a62192243d4ab835849cae..4952cdb76ada1317e052b5dbff48bf7ebddef2d4 100644 (file)
--- a/cinder/volume/drivers/solidfire.py
+++ b/cinder/volume/drivers/solidfire.py
@@ -684,7 +684,7 @@ class SolidFireDriver(SanISCSIDriver):
         data['total_capacity_gb'] = results['maxProvisionedSpace']
 
         data['free_capacity_gb'] = float(free_capacity / units.GiB)
-        data['reserved_percentage'] = 0
+        data['reserved_percentage'] = self.configuration.reserved_percentage
         data['QoS_support'] = True
         data['compression_percent'] =\
             results['compressionPercent']