fix(linstor): typo on resize for linstor raw VDI

fix resize typo for linstor on raw VDI
refactor linstor resize code

Signed-off-by: Antoine Bartuccio <[email protected]>

Author: klmp200

drivers/LinstorSR.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from sm_typing import Optional, override
+from sm_typing import Optional, override, Tuple
 
 from constants import CBTLOG_TAG
 
@@ -1907,7 +1907,30 @@ def detach(self, sr_uuid, vdi_uuid) -> None:
             vdi_uuid = parent_vdi_uuid
 
     @override
-    def resize(self, sr_uuid, vdi_uuid, size) -> str:
+    def resize(self, sr_uuid: str, vdi_uuid: str, size: int) -> str:
+        def compute_vdi_sizes(vdi: LinstorVDI) -> Tuple[int, int]:
+            if vdi.vdi_type == vhdutil.VDI_TYPE_RAW:
+                return vdi.size, LinstorVolumeManager.round_up_volume_size(size)
+
+            old_volume_size = vdi.utilisation
+            if vdi.sr._provisioning == 'thin':
+                # VDI is currently deflated, so keep it deflated.
+                return old_volume_size, old_volume_size
+
+            return old_volume_size, LinstorVhdUtil.compute_volume_size(size, vdi.vdi_type)
+
+        def resize_vdi(vdi: LinstorVDI, old_volume_size: int, new_volume_size) -> None:
+            if vdi.vdi_type == vhdutil.VDI_TYPE_RAW:
+                vdi._linstor.resize_volume(vdi.uuid, new_volume_size)
+                return
+
+            if new_volume_size != old_volume_size:
+                vdi.sr._vhdutil.inflate(
+                    vdi.sr._journaler, vdi.uuid, vdi.path,
+                    new_volume_size, old_volume_size
+                )
+            vdi.sr._vhdutil.set_size_virt_fast(vdi.path, size)
+
         util.SMlog('LinstorVDI.resize for {}'.format(self.uuid))
         if not self.sr.is_master():
             raise xs_errors.XenError(
@@ -1934,37 +1957,22 @@ def resize(self, sr_uuid, vdi_uuid, size) -> str:
             raise xs_errors.XenError('VDISize', opterr='shrinking not allowed')
 
         if size == self.size:
-            return VDI.VDI.get_params(self)
+            return VDI.VDI.get_params(self) # No change needed
 
-        if self.vdi_type == vhdutil.VDI_TYPE_RAW:
-            old_volume_size = self.size
-            new_volume_size = LinstorVolumeManager.round_up_volume_size(size)
-        else:
-            old_volume_size = self.utilisation
-            if self.sr._provisioning == 'thin':
-                # VDI is currently deflated, so keep it deflated.
-                new_volume_size = old_volume_size
-            else:
-                new_volume_size = LinstorVhdUtil.compute_volume_size(size, self.vdi_type)
+        old_volume_size, new_volume_size = compute_vdi_sizes(self)
         assert new_volume_size >= old_volume_size
 
         space_needed = new_volume_size - old_volume_size
         self.sr._ensure_space_available(space_needed)
 
         old_size = self.size
-        if self.vdi_type == vhdutil.VDI_TYPE_RAW:
-            self._linstor.resize(self.uuid, new_volume_size)
-        else:
-            if new_volume_size != old_volume_size:
-                self.sr._vhdutil.inflate(
-                    self.sr._journaler, self.uuid, self.path,
-                    new_volume_size, old_volume_size
-                )
-            self.sr._vhdutil.set_size_virt_fast(self.path, size)
+
+        resize_vdi(self, old_volume_size, new_volume_size)
 
         # Reload size attributes.
         self._load_this()
 
+        # Update metadata
         vdi_ref = self.sr.srcmd.params['vdi_ref']
         self.session.xenapi.VDI.set_virtual_size(vdi_ref, str(self.size))
         self.session.xenapi.VDI.set_physical_utilisation(