repair pipeline

Signed-off-by: Ronan Abhamon <[email protected]>

Author: Wescoeur

drivers/LinstorSR.py

@@ -56,7 +56,7 @@
 import xmlrpc.client
 import xs_errors
 
-from cowutil import getVdiTypeFromImageFormat
+from cowutil import getCowUtil, getVdiTypeFromImageFormat
 from srmetadata import \
     NAME_LABEL_TAG, NAME_DESCRIPTION_TAG, IS_A_SNAPSHOT_TAG, SNAPSHOT_OF_TAG, \
     TYPE_TAG, VDI_TYPE_TAG, READ_ONLY_TAG, SNAPSHOT_TIME_TAG, \
@@ -1297,7 +1297,7 @@ def _get_vdi_path_and_parent(self, vdi_uuid, volume_name):
 
             # Otherwise it's a COW and a parent can exist.
             linstorcowutil = LinstorCowUtil(self.session, self._linstor, vdi_type)
-            if linstorcowutil.check(vdi_uuid) != cowutil.CheckResult.Success:
+            if linstorcowutil.check(vdi_uuid) != CowUtil.CheckResult.Success:
                 return (None, None)
 
             image_info = linstorcowutil.get_info(vdi_uuid)
@@ -2290,7 +2290,7 @@ def _create_snapshot(self, snap_vdi_type, snap_uuid, snap_of_uuid=None):
         # 2. Write the snapshot content.
         is_raw = (self.vdi_type == VdiType.RAW)
         self.linstorcowutil.snapshot(
-            snap_path, self.path, is_raw, max(self.size, cowutil.getDefaultPreallocationSizeVirt())
+            snap_path, self.path, is_raw, max(self.size, self.linstorcowutil.cowutil.getDefaultPreallocationSizeVirt())
         )
 
         # 3. Get snapshot parent.

drivers/verifyVHDsOnSR.py

@@ -28,6 +28,7 @@
 import VDI
 
 from constants import NS_PREFIX_LVM, VG_LOCATION, VG_PREFIX
+from cowutil import getCowUtil
 from lock import Lock
 from lvmcowutil import LV_PREFIX, LvmCowUtil
 from refcounter import RefCounter