Fix unit tests with QCOW2 changes

Also add a fix to have phy vdi_type giving a raw cowutil
We also needed to patch pathlib.Path before any os.*

Signed-off-by: Damien Thenot <damien.thenot@vates.tech>

Author: Nambrok

drivers/blktap2.py

@@ -1686,6 +1686,7 @@ def _get_vdi_chain(self, cowutil, extractUuid) -> List[str]:
     def _check_journal_coalesce_chain(self, sr_uuid: str, vdi_uuid: str) -> bool:
         vdi_type = self.target.get_vdi_type()
         cowutil = getCowUtil(vdi_type)
+
         if not cowutil.isCoalesceableOnRemote(): #We only need to stop the coalesce in case of QCOW2
             return True
 

drivers/cleanup.py

@@ -1498,6 +1498,7 @@ def _setChainRo(self, was_ro: List[str]) -> None:
     @override
     def _doCoalesce(self) -> None:
         """LVMVDI parents must first be activated, inflated, and made writable"""
+        was_ro = []
         try:
             self._activateChain()
             self.sr.lvmCache.setReadonly(self.parent.fileName, False)

drivers/cowutil.py

@@ -315,7 +315,7 @@ def _ioretry(cmd: Sequence[str], text: bool = True) -> Union[str, bytes]:
 # ------------------------------------------------------------------------------
 
 def getImageFormatFromVdiType(vdi_type: str) -> ImageFormat:
-    if vdi_type == VdiType.RAW:
+    if vdi_type == VdiType.RAW or vdi_type == VdiType.PHY:
         return ImageFormat.RAW
     if vdi_type == VdiType.VHD:
         return ImageFormat.VHD

drivers/vditype.py

@@ -19,6 +19,7 @@
 # TODO: Use StrEnum in python 3.11.
 class VdiType(object):
     RAW = "aio"
+    PHY = "phy"
     VHD = "vhd"
     QCOW2 = "qcow2"
     ISO = "iso"

tests/test_FileSR.py

@@ -49,6 +49,8 @@ def setUp(self) -> None:
         endlog_patcher = mock.patch('FileSR.util.end_log_entry',
                                       autospec=True)
         self.mock_endlog = endlog_patcher.start()
+        pathlib_path_patcher = mock.patch("pathlib.Path", autospec=True)
+        self.mock_pathlib_path = pathlib_path_patcher.start()
         os_link_patcher = mock.patch('FileSR.os.link', autospec=True)
         self.mock_os_link = os_link_patcher.start()
         os_stat_patcher = mock.patch('FileSR.os.stat')
@@ -385,7 +387,10 @@ def test_vdi_load_vhd(self, mock_chdir, mock_pathexists):
         srcmd.cmd = "vdi_create"
         srcmd.dconf = {}
         srcmd.params = {
-            'command': 'vdi_create'
+            'command': 'vdi_create',
+            'vdi_sm_config': {
+                'image-format': 'vhd'
+            },
         }
         sr = FakeSharedFileSR(srcmd, sr_uuid)
         vdi = FileSR.FileVDI(sr, vdi_uuid)

tests/test_blktap2.py

@@ -197,7 +197,8 @@ def test_linknbd(self, nbd_link2, nbd_link):
     @mock.patch('blktap2.VDI.BackendLink', autospec=True)
     @mock.patch('blktap2.VDI.NBDLink', autospec=True)
     @mock.patch('blktap2.Tapdisk')
-    def test_activate(self, mock_tapdisk, mock_nbd_link, mock_backend,
+    @mock.patch('blktap2.VDI._check_journal_coalesce_chain', autospec=True)
+    def test_activate(self, mock_checkjournalcoalesce, mock_tapdisk, mock_nbd_link, mock_backend,
                       mock_phy, mock_attach,
                       mock_this_host, mock_sleep):
         """

tests/test_cleanup.py

@@ -1487,8 +1487,9 @@ def add_vdis_for_coalesce(self, sr):
     @mock.patch('vhdutil.VhdUtil')
     @mock.patch('cleanup.journaler.Journaler', autospec=True)
     @mock.patch('cleanup.Util.runAbortable')
+    @mock.patch('cleanup.SR._create_running_file', autospec=True)
     def test_coalesce_success(
-            self, mock_abortable, mock_journaler, mock_vhdutil, mock_util,
+            self, mock_create_running_file, mock_abortable, mock_journaler, mock_vhdutil, mock_util,
             mock_unlink):
         """
         Non-leaf coalesce
@@ -1497,6 +1498,7 @@ def test_coalesce_success(
 
         mock_abortable.side_effect = self.runAbortable
         mock_vhdutil.return_value.check.return_value = cowutil.CowUtil.CheckResult.Success
+        mock_vhdutil.return_value.isCoalesceableOnRemote.return_value = False
 
         sr_uuid = uuid4()
         sr = create_cleanup_sr(self.xapi_mock, uuid=str(sr_uuid))
@@ -1537,8 +1539,9 @@ def test_coalesce_success(
     @mock.patch('vhdutil.VhdUtil')
     @mock.patch('cleanup.journaler.Journaler', autospec=True)
     @mock.patch('cleanup.Util.runAbortable')
+    @mock.patch('cleanup.SR._create_running_file', autospec=True)
     def test_coalesce_error(
-            self, mock_abortable, mock_journaler, mock_vhdutil, mock_util,
+            self, mock_running_file, mock_abortable, mock_journaler, mock_vhdutil, mock_util,
             mock_unlink):
         """
         Handle errors in coalesce
@@ -1548,6 +1551,7 @@ def test_coalesce_error(
 
         self.xapi_mock.getConfigVDI.return_value = {}
 
+
         def run_abortable(func, ret, ns, abortTest, pollInterval, timeOut):
             raise util.SMException("Timed out")
 
@@ -1565,6 +1569,7 @@ def run_abortable(func, ret, ns, abortTest, pollInterval, timeOut):
         mock_journaler.get.return_value = None
 
         mock_vhdutil.return_value.getParent.return_value = vdis['parent'].path
+        mock_vhdutil.return_value.isCoalesceableOnRemote.return_value = False
 
         sr.coalesce(vdis['vdi'], False)
 
@@ -1576,8 +1581,9 @@ def run_abortable(func, ret, ns, abortTest, pollInterval, timeOut):
     @mock.patch('vhdutil.VhdUtil')
     @mock.patch('cleanup.journaler.Journaler', autospec=True)
     @mock.patch('cleanup.Util.runAbortable')
+    @mock.patch('cleanup.SR._create_running_file', autospec=True)
     def test_coalesce_error_raw_parent(
-            self, mock_abortable, mock_journaler, mock_vhdutil, mock_util,
+            self, mock_create_running_file, mock_abortable, mock_journaler, mock_vhdutil, mock_util,
             mock_unlink):
         """
         Handle errors in coalesce with raw parent
@@ -1605,6 +1611,7 @@ def run_abortable(func, ret, ns, abortTest, pollInterval, timeOut):
         mock_journaler.get.return_value = None
 
         mock_vhdutil.return_value.getParent.return_value = vdis['parent'].path
+        mock_vhdutil.return_value.isCoalesceableOnRemote.return_value = False
 
         sr.coalesce(vdis['vdi'], False)
 

tests/test_on_slave.py

@@ -70,7 +70,7 @@ def test_is_open_nfssr_success(self):
 
     def test_is_open_lvm_success(self):
         """
-        LVM srs are uplifted to lvhd
+        LVM srs are uplifted to lvm
         """
         vdi_uuid = uuid.uuid4()
         mock_session = mock.MagicMock()
@@ -85,7 +85,7 @@ def test_is_open_lvm_success(self):
                                        'vdiUuid': vdi_uuid,
                                        'srRef': 'opaqueref:sr_mine'
                                    })
-        self.mock_sr.driver.assert_called_once_with('lvhd')
+        self.mock_sr.driver.assert_called_once_with('lvm')
         self.assertEqual('True', is_open)
 
     def test_is_open_false(self):