Address some comments

lib/vdi.py:
Renamed `size` to `get_virtual_size`

tests/storage/ext/test_ext_sr.py:
Changed to use `vdi.get_virtual_size()`
Fix Exception type in `test_failing_resize`

tests/storage/lvm/test_lvm_sr.py:
Changed to use `vdi.get_virtual_size()`
Changed Exception handling to use `pytest.raises()`

Signed-off-by: Damien Thenot <[email protected]>

Author: Nambrok

lib/vdi.py

@@ -47,7 +47,7 @@ def clone(self):
     def readonly(self) -> bool:
         return strtobool(self.param_get("read-only"))
 
-    def size(self) -> int:
+    def get_virtual_size(self) -> int:
         return int(self.param_get("virtual-size"))
 
     def resize(self, new_size: int) -> None:

tests/storage/ext/test_ext_sr.py

@@ -74,29 +74,29 @@ def test_blktap_activate_failure(self, vm_on_ext_sr):
     def test_resize(self, vm_on_ext_sr):
         vm = vm_on_ext_sr
         vdi = VDI(vm.vdi_uuids()[0], host=vm.host)
-        old_size = vdi.size()
+        old_size = vdi.get_virtual_size()
         new_size = old_size + (1 * 1024 * 1024 * 1024) # Adding a 1GiB to size
 
         vdi.resize(new_size)
 
-        assert vdi.size() == new_size
+        assert vdi.get_virtual_size() == new_size
 
     @pytest.mark.small_vm
     @pytest.mark.big_vm
     def test_failing_resize(self, host, ext_sr, vm_on_ext_sr, exit_on_fistpoint):
         vm = vm_on_ext_sr
         vdi = VDI(vm.vdi_uuids()[0], host=vm.host)
-        old_size = vdi.size()
+        old_size = vdi.get_virtual_size()
         new_size = old_size + (1 * 1024 * 1024 * 1024) # Adding a 1GiB to size
 
         with FistPoint(vm.host, "LVHDRT_inflate_after_setSize"):
             try:
                 vdi.resize(new_size)
-            except Exception:
+            except SSHCommandFailed:
                 logging.info(f"Launching SR scan for {ext_sr} after failure")
                 host.xe("sr-scan", {"uuid": ext_sr})
 
-        assert vdi.size() == new_size
+        assert vdi.get_virtual_size() == new_size
 
     @pytest.mark.reboot
     @pytest.mark.small_vm

tests/storage/lvm/test_lvm_sr.py

@@ -63,18 +63,13 @@ def test_snapshot(self, vm_on_lvm_sr):
     def test_failing_resize_on_inflate_after_setSize(self, host, lvm_sr, vm_on_lvm_sr, exit_on_fistpoint):
         vm = vm_on_lvm_sr
         lvinflate = ""
-        need_rescan = False
         vdi = VDI(vm.vdi_uuids()[0], host=vm.host)
-        new_size = vdi.size() + (1 * 1024 * 1024 * 1024) # Adding a 1GiB to size
+        new_size = vdi.get_virtual_size() + (1 * 1024 * 1024 * 1024) # Adding a 1GiB to size
 
-        with FistPoint(vm.host, "LVHDRT_inflate_after_setSize"):
-            try:
-                vdi.resize(new_size)
-            except SSHCommandFailed as e:
-                logging.info(e)
-                need_rescan = True
+        with FistPoint(vm.host, "LVHDRT_inflate_after_setSize"), pytest.raises(SSHCommandFailed) as exc_info:
+            vdi.resize(new_size)
+        logging.info(exc_info)
 
-        assert need_rescan, "Resize did not make an error"
         lvlist = host.lvs(f"VG_XenStorage-{lvm_sr.uuid}")
         for lv in lvlist:
             if lv.startswith("inflate_"):
@@ -94,18 +89,13 @@ def test_failing_resize_on_inflate_after_setSize(self, host, lvm_sr, vm_on_lvm_s
     def test_failing_resize_on_inflate_after_setSizePhys(self, host, lvm_sr, vm_on_lvm_sr, exit_on_fistpoint):
         vm = vm_on_lvm_sr
         lvinflate = ""
-        need_rescan = False
         vdi = VDI(vm.vdi_uuids()[0], host=vm.host)
-        new_size = vdi.size() + (1 * 1024 * 1024 * 1024) # Adding a 1GiB to size
+        new_size = vdi.get_virtual_size() + (1 * 1024 * 1024 * 1024) # Adding a 1GiB to size
 
-        with FistPoint(vm.host, "LVHDRT_inflate_after_setSizePhys"):
-            try:
-                vdi.resize(new_size)
-            except SSHCommandFailed as e:
-                logging.info(e)
-                need_rescan = True
+        with FistPoint(vm.host, "LVHDRT_inflate_after_setSizePhys"), pytest.raises(SSHCommandFailed) as exc_info:
+            vdi.resize(new_size)
+        logging.info(exc_info)
 
-        assert need_rescan, "Resize did not make an error"
         lvlist = host.lvs(f"VG_XenStorage-{lvm_sr.uuid}")
         for lv in lvlist:
             if lv.startswith("inflate_"):