From: Victor Stinner <vstinner@redhat.com>
Date: Mon, 15 Feb 2016 10:15:13 +0000 (+0100)
Subject: Port hgst driver to Python 3
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=bfdcb23fa71e166e0743c4f4bd76b9d6deec59c0;p=openstack-build%2Fcinder-build.git

Port hgst driver to Python 3

* hgst: replace a/b with a//b to get integer on Python 3
* tests-py3.txt: add cinder.tests.unit.volume.drivers.test_hgst

Partial-Implements: blueprint cinder-python3
Change-Id: I5a5fcbc92101b8d928ac80c74698f6cc8f8723d2
---

diff --git a/cinder/volume/drivers/hgst.py b/cinder/volume/drivers/hgst.py
index 2c27037cb..19528f4cc 100644
--- a/cinder/volume/drivers/hgst.py
+++ b/cinder/volume/drivers/hgst.py
@@ -215,7 +215,7 @@ class HGSTDriver(driver.VolumeDriver):
         """Adjust space size to next legal value because of redundancy."""
         # Extending requires expanding to a multiple of the # of
         # 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:
             size_g = int(size_g + count)
             size_g -= size_g % count
@@ -328,12 +328,12 @@ class HGSTDriver(driver.VolumeDriver):
         try:
             out, unused = self._execute(*params, run_as_root=True)
             ret = json.loads(out)
-            cap = int(ret["totalCapacityBytes"] / units.Gi)
-            used = int(ret["totalUsedBytes"] / units.Gi)
+            cap = ret["totalCapacityBytes"] // units.Gi
+            used = ret["totalUsedBytes"] // units.Gi
             avail = cap - used
             if int(self.configuration.safe_get('hgst_redundancy')) == 1:
-                cap = int(cap / 2)
-                avail = int(avail / 2)
+                cap = cap // 2
+                avail = avail // 2
             # Reduce both by 1 GB due to BZ 28320
             if cap > 0:
                 cap = cap - 1
@@ -374,7 +374,7 @@ class HGSTDriver(driver.VolumeDriver):
         volutils.copy_volume(
             self.local_path(src_vref),
             "/dev/" + provider['provider_id'],
-            info['sizeBytes'] / units.Mi,
+            info['sizeBytes'] // units.Mi,
             self.configuration.volume_dd_blocksize,
             execute=self._execute)
 
@@ -526,7 +526,7 @@ class HGSTDriver(driver.VolumeDriver):
         volutils.copy_volume(
             self.local_path(origvol),
             "/dev/" + provider['provider_id'],
-            info['sizeBytes'] / units.Mi,
+            info['sizeBytes'] // units.Mi,
             self.configuration.volume_dd_blocksize,
             execute=self._execute)
         return provider
@@ -551,7 +551,7 @@ class HGSTDriver(driver.VolumeDriver):
         volnewbytes = new_size * units.Gi
         new_size_g = math.ceil(float(volnewbytes) / float(self.SPACEGB))
         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:
             return  # Already big enough, happens with redundancy
         else:
diff --git a/tests-py3.txt b/tests-py3.txt
index cc2d520cf..316ecf6bd 100644
--- a/tests-py3.txt
+++ b/tests-py3.txt
@@ -168,6 +168,7 @@ cinder.tests.unit.test_zfssa
 cinder.tests.unit.volume.drivers.emc.scaleio
 cinder.tests.unit.volume.drivers.netapp.eseries.test_library
 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.windows.test_smbfs
 cinder.tests.unit.windows.test_vhdutils