refactor: rename VHD_BLOCK_SIZE to DEFAULT_VHD_BLOCK_SIZE

Signed-off-by: Mathieu Labourier <mathieu.labourier@vates.tech>

Author: Millefeuille42

libs/sm/drivers/FileSR.py

@@ -563,7 +563,7 @@ def create(self, sr_uuid, vdi_uuid, size):
             try:
                 size = vhdutil.validate_and_round_vhd_size(
                     int(size),
-                    vhdutil.VHD_BLOCK_SIZE
+                    vhdutil.DEFAULT_VHD_BLOCK_SIZE
                 )
                 mb = 1024 * 1024
                 size_mb = size // mb

libs/sm/drivers/LVHDSR.py

@@ -1351,7 +1351,7 @@ def create(self, sr_uuid, vdi_uuid, size):
 
         size = vhdutil.validate_and_round_vhd_size(
             int(size),
-            vhdutil.VHD_BLOCK_SIZE
+            vhdutil.DEFAULT_VHD_BLOCK_SIZE
         )
 
         util.SMlog("LVHDVDI.create: type = %s, %s (size=%s)" % \
@@ -1367,7 +1367,7 @@ def create(self, sr_uuid, vdi_uuid, size):
             elif self.sr.provision == "thick":
                 lvSize = lvhdutil.calcSizeVHDLV(
                     int(size),
-                    vhdutil.VHD_BLOCK_SIZE
+                    vhdutil.DEFAULT_VHD_BLOCK_SIZE
                 )
 
         self.sr._ensureSpaceAvailable(lvSize)

libs/sm/vhdutil.py

@@ -30,7 +30,7 @@
 MAX_CHAIN_SIZE = 30  # max VHD parent chain size
 VHD_UTIL = "/usr/bin/vhd-util"
 OPT_LOG_ERR = "--debug"
-VHD_BLOCK_SIZE = 2 * 1024 * 1024
+DEFAULT_VHD_BLOCK_SIZE = 2 * 1024 * 1024
 VHD_FOOTER_SIZE = 512
 
 # lock to lock the entire SR for short ops
@@ -99,7 +99,7 @@ def getBlockSize(path):
         ret = ioretry(cmd)
     except util.CommandException as e:
         util.SMlog("WARN: unable to fetch block size: {}".format(e))
-        return VHD_BLOCK_SIZE
+        return DEFAULT_VHD_BLOCK_SIZE
     if isinstance(ret, bytes):
         import locale
         ret = ret.decode(
@@ -111,7 +111,7 @@ def getBlockSize(path):
         field = field.strip()
         if not field.startswith("Block size"): continue
         return int(field.split(':')[1].strip().split(' ')[0])
-    return VHD_BLOCK_SIZE
+    return DEFAULT_VHD_BLOCK_SIZE
 
 
 def convertAllocatedSizeToBytes(size, block_size):

tests/test_FileSR.py

@@ -327,7 +327,7 @@ def test_create_vdi_vhd(self, mock_vhdutil):
         vdi = FakeFileVDI(sr, vdi_uuid)
         vdi.vdi_type = vhdutil.VDI_TYPE_VHD
         mock_vhdutil.validate_and_round_vhd_size.side_effect = vhdutil.validate_and_round_vhd_size
-        mock_vhdutil.VHD_BLOCK_SIZE = 2 * 1024 * 1024
+        mock_vhdutil.DEFAULT_VHD_BLOCK_SIZE = vhdutil.DEFAULT_VHD_BLOCK_SIZE
 
         # Act
         vdi.create(sr_uuid, vdi_uuid, 20 * 1024 * 1024)

tests/test_vhdutil.py

@@ -22,35 +22,35 @@ class TestVhdUtil(unittest.TestCase):
     def test_validate_and_round_min_size(self):
         size = vhdutil.validate_and_round_vhd_size(
             2 * 1024 * 1024,
-            vhdutil.VHD_BLOCK_SIZE
+            vhdutil.DEFAULT_VHD_BLOCK_SIZE
         )
 
         self.assertTrue(size == 2 * 1024 * 1024)
 
     def test_validate_and_round_max_size(self):
         size = vhdutil.validate_and_round_vhd_size(
             vhdutil.MAX_VHD_SIZE,
-            vhdutil.VHD_BLOCK_SIZE
+            vhdutil.DEFAULT_VHD_BLOCK_SIZE
         )
 
         self.assertTrue(size == vhdutil.MAX_VHD_SIZE)
 
     def test_validate_and_round_odd_size_up_to_next_boundary(self):
         size = vhdutil.validate_and_round_vhd_size(
             vhdutil.MAX_VHD_SIZE - 1,
-            vhdutil.VHD_BLOCK_SIZE)
+            vhdutil.DEFAULT_VHD_BLOCK_SIZE)
 
         self.assertTrue(size == vhdutil.MAX_VHD_SIZE)
 
     def test_validate_and_round_negative(self):
         with self.assertRaises(xs_errors.SROSError):
-            vhdutil.validate_and_round_vhd_size(-1, vhdutil.VHD_BLOCK_SIZE)
+            vhdutil.validate_and_round_vhd_size(-1, vhdutil.DEFAULT_VHD_BLOCK_SIZE)
 
     def test_validate_and_round_too_large(self):
         with self.assertRaises(xs_errors.SROSError):
             vhdutil.validate_and_round_vhd_size(
                 vhdutil.MAX_VHD_SIZE + 1,
-                vhdutil.VHD_BLOCK_SIZE
+                vhdutil.DEFAULT_VHD_BLOCK_SIZE
             )
 
     @testlib.with_context
@@ -78,7 +78,7 @@ def test_calc_overhead_bitmap_round_blocks(self, context):
 
         result = vhdutil.calcOverheadBitmap(
             virtual_size,
-            vhdutil.VHD_BLOCK_SIZE
+            vhdutil.DEFAULT_VHD_BLOCK_SIZE
         )
 
         self.assertEqual(49152, result)
@@ -88,7 +88,7 @@ def test_calc_overhead_bitmap_extra_block(self, context):
 
         result = vhdutil.calcOverheadBitmap(
             virtual_size,
-            vhdutil.VHD_BLOCK_SIZE
+            vhdutil.DEFAULT_VHD_BLOCK_SIZE
         )
 
         self.assertEqual(53248, result)
@@ -416,7 +416,7 @@ def test_function(args, inp):
         result = 0
         with unittest.mock.patch(
                 "sm.vhdutil.getBlockSize",
-                return_value=vhdutil.VHD_BLOCK_SIZE
+                return_value=vhdutil.DEFAULT_VHD_BLOCK_SIZE
         ):
             result = vhdutil.getAllocatedSize(TEST_VHD_NAME)