fix: adjust block size parsing

fix: remove default value if error in fetch
fix: raise an error instead of return default value if block size is not found

Signed-off-by: Mathieu Labourier <[email protected]>
Co-authored-by: Ronan Abhamon <[email protected]>
Signed-off-by: Mathieu Labourier <[email protected]>

Author: Millefeuille42

libs/sm/vhdutil.py

@@ -95,23 +95,18 @@ def ioretry(cmd, text=True):
 
 def getBlockSize(path):
     cmd = [VHD_UTIL, "read", "-pn", path]
-    try:
-        ret = ioretry(cmd)
-    except util.CommandException as e:
-        util.SMlog("WARN: unable to fetch block size: {}".format(e))
-        return DEFAULT_VHD_BLOCK_SIZE
+    ret = ioretry(cmd)
     if isinstance(ret, bytes):
         import locale
         ret = ret.decode(
             encoding = locale.getpreferredencoding(False),
             errors="replace"
         )
-    fields = ret.strip().split('\n')
-    for field in fields:
-        field = field.strip()
+    for field in ret.split('\n'):
+        field = field.lstrip()
         if not field.startswith("Block size"): continue
-        return int(field.split(':')[1].strip().split(' ')[0])
-    return DEFAULT_VHD_BLOCK_SIZE
+        return int(field.split(':')[1].lstrip().split()[0])
+    raise util.SMException("Unable to find block size in VHD with path: {}".format(path))
 
 
 def convertAllocatedSizeToBytes(size, block_size):