fix linstorcowutil

Author: Wescoeur

drivers/linstorcowutil.py

@@ -288,7 +288,7 @@ def get_block_bitmap(self, vdi_uuid, response):
     def get_drbd_size(self, vdi_uuid, response):
         return int(response)
 
-    def _get_drbd_size(self, cowutil_inst, path):
+    def _get_drbd_size(self, path):
         (ret, stdout, stderr) = util.doexec(['blockdev', '--getsize64', path])
         if ret == 0:
             return int(stdout.strip())
@@ -414,7 +414,7 @@ def force_deflate(self, path, newSize, oldSize, zeroize):
         }
         return self._call_method('_force_deflate', 'deflate', path, use_parent=False, **kwargs)
 
-    def _force_deflate(self, cowutil_inst, path, newSize, oldSize, zeroize):
+    def _force_deflate(self, path, newSize, oldSize, zeroize):
         self.deflate(path, newSize, oldSize, zeroize)
 
     # --------------------------------------------------------------------------
@@ -479,9 +479,13 @@ def _raise_openers_exception(self, device_path, e):
         util.SMlog('raise opener exception: {}'.format(e_wrapper))
         raise e_wrapper  # pylint: disable = E0702
 
-    def _call_local_method(self, local_method, device_path, *args, **kwargs):
+    def _sanitize_local_method(self, local_method):
         if isinstance(local_method, str):
-            local_method = getattr(self._cowutil, local_method)
+            return getattr(self if local_method.startswith('_') else self._cowutil, local_method)
+        return local_method
+
+    def _call_local_method(self, local_method, device_path, *args, **kwargs):
+        local_method = self._sanitize_local_method(local_method)
 
         try:
             def local_call():
@@ -512,8 +516,7 @@ def _call_method(self, local_method, remote_method, device_path, use_parent, *ar
         # another host using the DRBD opener list. In the other case, if the parent is required,
         # we must check where this last one is open instead of the child.
 
-        if isinstance(local_method, str):
-            local_method = getattr(self._cowutil, local_method)
+        local_method = self._sanitize_local_method(local_method)
 
         # A. Try to write locally...
         try:
@@ -530,7 +533,8 @@ def _call_method(self, local_method, remote_method, device_path, use_parent, *ar
         # B.2. Prepare remote args.
         remote_args = {
             'devicePath': device_path,
-            'groupName': self._linstor.group_name
+            'groupName': self._linstor.group_name,
+            'vdiType': self._vdi_type
         }
         remote_args.update(**kwargs)
         remote_args = {str(key): str(value) for key, value in remote_args.items()}