From c07117ec486254de3a8657dc91940230cbeeb1b5 Mon Sep 17 00:00:00 2001 From: jbrogan Date: Thu, 8 May 2014 14:06:52 +0000 Subject: [PATCH] Fix for solidfire driver to use reserved_percentage Fixed _update_cluster_status so reserved_percentage uses value from cinder.conf. Change-Id: I74af8dd86645b4c0800391bd126bf2bce94cf205 --- cinder/tests/test_solidfire.py | 1 + cinder/volume/drivers/solidfire.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cinder/tests/test_solidfire.py b/cinder/tests/test_solidfire.py index 1505538ed..c4efcfe7d 100644 --- 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 5ed33134e..4952cdb76 100644 --- 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'] -- 2.45.2