openstack/cinder
Code Issues Proposed changes

Merge "Port hgst driver to Python 3"

Browse Source
This commit is contained in:
Jenkins
2016-02-22 01:52:47 +00:00
committed by Gerrit Code Review
parent 42dac731c0 bfdcb23fa7
commit 58ad8d3e7e
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cinder/volume/drivers/hgst.py
View File

@@ -215,7 +215,7 @@ class HGSTDriver(driver.VolumeDriver):
"""Adjust space size to next legal value because of redundancy.""" """Adjust space size to next legal value because of redundancy."""
# Extending requires expanding to a multiple of the # of # Extending requires expanding to a multiple of the # of
# storage hosts in the cluster # storage hosts in the cluster
count = len(self._make_server_list()) / 2 # Remove -s from count count = len(self._make_server_list()) // 2 # Remove -s from count
if size_g % count: if size_g % count:
size_g = int(size_g + count) size_g = int(size_g + count)
size_g -= size_g % count size_g -= size_g % count
@@ -328,12 +328,12 @@ class HGSTDriver(driver.VolumeDriver):
try: try:
out, unused = self._execute(*params, run_as_root=True) out, unused = self._execute(*params, run_as_root=True)
ret = json.loads(out) ret = json.loads(out)
cap = int(ret["totalCapacityBytes"] / units.Gi) cap = ret["totalCapacityBytes"] // units.Gi
used = int(ret["totalUsedBytes"] / units.Gi) used = ret["totalUsedBytes"] // units.Gi
avail = cap - used avail = cap - used
if int(self.configuration.safe_get('hgst_redundancy')) == 1: if int(self.configuration.safe_get('hgst_redundancy')) == 1:
cap = int(cap / 2) cap = cap // 2
avail = int(avail / 2) avail = avail // 2
# Reduce both by 1 GB due to BZ 28320 # Reduce both by 1 GB due to BZ 28320
if cap > 0: if cap > 0:
cap = cap - 1 cap = cap - 1
@@ -374,7 +374,7 @@ class HGSTDriver(driver.VolumeDriver):
volutils.copy_volume( volutils.copy_volume(
self.local_path(src_vref), self.local_path(src_vref),
"/dev/" + provider['provider_id'], "/dev/" + provider['provider_id'],
info['sizeBytes'] / units.Mi, info['sizeBytes'] // units.Mi,
self.configuration.volume_dd_blocksize, self.configuration.volume_dd_blocksize,
execute=self._execute) execute=self._execute)
@@ -526,7 +526,7 @@ class HGSTDriver(driver.VolumeDriver):
volutils.copy_volume( volutils.copy_volume(
self.local_path(origvol), self.local_path(origvol),
"/dev/" + provider['provider_id'], "/dev/" + provider['provider_id'],
info['sizeBytes'] / units.Mi, info['sizeBytes'] // units.Mi,
self.configuration.volume_dd_blocksize, self.configuration.volume_dd_blocksize,
execute=self._execute) execute=self._execute)
return provider return provider
@@ -551,7 +551,7 @@ class HGSTDriver(driver.VolumeDriver):
volnewbytes = new_size * units.Gi volnewbytes = new_size * units.Gi
new_size_g = math.ceil(float(volnewbytes) / float(self.SPACEGB)) new_size_g = math.ceil(float(volnewbytes) / float(self.SPACEGB))
wantedsize_g = self._adjust_size_g(new_size_g) wantedsize_g = self._adjust_size_g(new_size_g)
havesize_g = (info['sizeBytes'] / self.SPACEGB) havesize_g = (info['sizeBytes'] // self.SPACEGB)
if havesize_g >= wantedsize_g: if havesize_g >= wantedsize_g:
return # Already big enough, happens with redundancy return # Already big enough, happens with redundancy
else: else:

1
tests-py3.txt
View File

@@ -147,6 +147,7 @@ cinder.tests.unit.test_zfssa
cinder.tests.unit.volume.drivers.emc.scaleio cinder.tests.unit.volume.drivers.emc.scaleio
cinder.tests.unit.volume.drivers.netapp.eseries.test_library cinder.tests.unit.volume.drivers.netapp.eseries.test_library
cinder.tests.unit.volume.drivers.test_fujitsu cinder.tests.unit.volume.drivers.test_fujitsu
cinder.tests.unit.volume.drivers.test_hgst
cinder.tests.unit.volume.flows.test_create_volume_flow cinder.tests.unit.volume.flows.test_create_volume_flow
cinder.tests.unit.windows.test_smbfs cinder.tests.unit.windows.test_smbfs
cinder.tests.unit.windows.test_vhdutils cinder.tests.unit.windows.test_vhdutils