openstack/cinder
Code Issues Proposed changes

Merge "Size in tintri driver should be converted to integer"

Browse Source
This commit is contained in:
Jenkins 2016-08-03 15:11:12 +00:00 committed by Gerrit Code Review
commit 72e9e3dcc3
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cinder/tests/unit/volume/drivers/test_tintri.py
View File

@ -15,6 +15,7 @@
Volume driver test for Tintri storage. Volume driver test for Tintri storage.
""" """
import ddt
import mock import mock
from oslo_utils import units from oslo_utils import units
@ -40,6 +41,7 @@ class FakeImage(object):
return self.__dict__[key] return self.__dict__[key]
@ddt.ddt
class TintriDriverTestCase(test.TestCase): class TintriDriverTestCase(test.TestCase):
def setUp(self): def setUp(self):
super(TintriDriverTestCase, self).setUp() super(TintriDriverTestCase, self).setUp()
@ -250,14 +252,16 @@ class TintriDriverTestCase(test.TestCase):
self._driver.manage_existing, self._driver.manage_existing,
volume, existing) volume, existing)
def test_manage_existing_get_size(self): @ddt.data((123, 123), (123.5, 124))
@ddt.unpack
def test_manage_existing_get_size(self, st_size, exp_size):
volume = fake_volume.fake_volume_obj(self.context) volume = fake_volume.fake_volume_obj(self.context)
existing = {'source-name': self._provider_location + '/' + existing = {'source-name': self._provider_location + '/' +
volume.name} volume.name}
file = mock.Mock(st_size=123 * units.Gi) file = mock.Mock(st_size=int(st_size * units.Gi))
with mock.patch('os.path.isfile', return_value=True): with mock.patch('os.path.isfile', return_value=True):
with mock.patch('os.stat', return_value=file): with mock.patch('os.stat', return_value=file):
self.assertEqual(float(file.st_size / units.Gi), self.assertEqual(exp_size,
self._driver.manage_existing_get_size( self._driver.manage_existing_get_size(
volume, existing)) volume, existing))

4
cinder/volume/drivers/tintri.py
View File

@ -735,8 +735,8 @@ class TintriDriver(driver.ManageableVD,
try: try:
volume_path = os.path.join(nfs_mount, volume_name) volume_path = os.path.join(nfs_mount, volume_name)
vol_size = math.ceil(float(utils.get_file_size(volume_path)) / vol_size = int(math.ceil(float(utils.get_file_size(volume_path)) /
units.Gi) units.Gi))
except OSError: except OSError:
msg = (_('Failed to get size of volume %s') % msg = (_('Failed to get size of volume %s') %
existing_ref['source-name']) existing_ref['source-name'])