diff --git a/cinder/tests/unit/volume/drivers/test_remotefs.py b/cinder/tests/unit/volume/drivers/test_remotefs.py index 03c403640d0..739cd8015ab 100644 --- a/cinder/tests/unit/volume/drivers/test_remotefs.py +++ b/cinder/tests/unit/volume/drivers/test_remotefs.py @@ -466,3 +466,10 @@ class RemoteFsSnapDriverTestCase(test.TestCase): mock_copy_volume_from_snapshot.assert_called_once_with( snap_ref, volume_ref, volume['size']) self.assertTrue(mock_delete_snapshot.called) + + def test_create_regular_file(self): + self._driver._create_regular_file('/path', 1) + self._driver._execute.assert_called_once_with('dd', 'if=/dev/zero', + 'of=/path', 'bs=1M', + 'count=1024', + run_as_root=True) diff --git a/cinder/volume/drivers/remotefs.py b/cinder/volume/drivers/remotefs.py index c9ec1b66d13..88a0bbffd13 100644 --- a/cinder/volume/drivers/remotefs.py +++ b/cinder/volume/drivers/remotefs.py @@ -332,7 +332,7 @@ class RemoteFSDriver(driver.LocalVD, driver.TransferVD, driver.BaseVD): """Creates a regular file of given size in GiB.""" block_size_mb = 1 - block_count = size * units.Gi / (block_size_mb * units.Mi) + block_count = size * units.Gi // (block_size_mb * units.Mi) self._execute('dd', 'if=/dev/zero', 'of=%s' % path, 'bs=%dM' % block_size_mb, @@ -417,7 +417,7 @@ class RemoteFSDriver(driver.LocalVD, driver.TransferVD, driver.BaseVD): data = image_utils.qemu_img_info(self.local_path(volume), run_as_root=run_as_root) - virt_size = data.virtual_size / units.Gi + virt_size = data.virtual_size // units.Gi if virt_size != volume.size: raise exception.ImageUnacceptable( image_id=image_id,