diff --git a/cinder/volume/drivers/emc/emc_smis_common.py b/cinder/volume/drivers/emc/emc_smis_common.py index 7e22befdd55..c06dc131264 100644 --- a/cinder/volume/drivers/emc/emc_smis_common.py +++ b/cinder/volume/drivers/emc/emc_smis_common.py @@ -30,6 +30,7 @@ from xml.dom.minidom import parseString from cinder import exception from cinder.openstack.common import log as logging +from cinder import units LOG = logging.getLogger(__name__) @@ -75,7 +76,7 @@ class EMCSMISCommon(): """Creates a EMC(VMAX/VNX) volume.""" LOG.debug(_('Entering create_volume.')) - volumesize = int(volume['size']) * 1073741824 + volumesize = int(volume['size']) * units.GiB volumename = volume['name'] LOG.info(_('Create Volume: %(volume)s Size: %(size)lu') diff --git a/cinder/volume/drivers/glusterfs.py b/cinder/volume/drivers/glusterfs.py index 96f12bf5919..4ee4db4b1eb 100644 --- a/cinder/volume/drivers/glusterfs.py +++ b/cinder/volume/drivers/glusterfs.py @@ -30,6 +30,7 @@ from cinder import db from cinder import exception from cinder.image import image_utils from cinder.openstack.common import log as logging +from cinder import units from cinder.volume.drivers import nfs LOG = logging.getLogger(__name__) @@ -991,7 +992,7 @@ class GlusterfsDriver(nfs.RemoteFsDriver): greatest_share = glusterfs_share greatest_size = capacity - if volume_size_for * 1024 * 1024 * 1024 > greatest_size: + if volume_size_for * units.GiB > greatest_size: raise exception.GlusterfsNoSuitableShareFound( volume_size=volume_size_for) return greatest_share diff --git a/cinder/volume/drivers/rbd.py b/cinder/volume/drivers/rbd.py index 994788eb86f..192fd47ca93 100644 --- a/cinder/volume/drivers/rbd.py +++ b/cinder/volume/drivers/rbd.py @@ -457,9 +457,9 @@ class RBDDriver(driver.VolumeDriver): def create_volume(self, volume): """Creates a logical volume.""" if int(volume['size']) == 0: - size = 100 * 1024 ** 2 + size = 100 * units.MiB else: - size = int(volume['size']) * 1024 ** 3 + size = int(volume['size']) * units.GiB LOG.debug(_("creating volume '%s'") % (volume['name'])) diff --git a/cinder/volume/drivers/scality.py b/cinder/volume/drivers/scality.py index 10ee48192ab..0d2d0d37c77 100644 --- a/cinder/volume/drivers/scality.py +++ b/cinder/volume/drivers/scality.py @@ -27,6 +27,7 @@ from oslo.config import cfg from cinder import exception from cinder.image import image_utils from cinder.openstack.common import log as logging +from cinder import units from cinder.volume import driver @@ -107,8 +108,8 @@ class ScalityDriver(driver.VolumeDriver): def _size_bytes(self, size_in_g): if int(size_in_g) == 0: - return 100 * 1024 * 1024 - return int(size_in_g) * 1024 * 1024 * 1024 + return 100 * units.MiB + return int(size_in_g) * units.GiB def _create_file(self, path, size): with open(path, "ab") as f: diff --git a/cinder/volume/drivers/xenapi/lib.py b/cinder/volume/drivers/xenapi/lib.py index 4c48fc2dbbb..a7969281edb 100644 --- a/cinder/volume/drivers/xenapi/lib.py +++ b/cinder/volume/drivers/xenapi/lib.py @@ -16,11 +16,13 @@ # License for the specific language governing permissions and limitations # under the License. -from cinder.volume.drivers.xenapi import tools import contextlib import os import pickle +from cinder import units +from cinder.volume.drivers.xenapi import tools + class XenAPIException(Exception): def __init__(self, original_exception): @@ -258,7 +260,7 @@ class CompoundOperations(object): def to_bytes(size_in_gigs): - return size_in_gigs * 1024 * 1024 * 1024 + return size_in_gigs * units.GiB class NFSOperationsMixIn(CompoundOperations):