fix(LargeBlock): some style changes

Signed-off-by: Damien Thenot <[email protected]>
xcp-ng · Mar 19, 2024 · 1fa7fee · 1fa7fee
1 parent 610ea13
commit 1fa7fee
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/drivers/LargeBlockSR.py b/drivers/LargeBlockSR.py
@@ -57,7 +57,7 @@ def handles(srtype):
         return srtype == LargeBlockSR.DRIVER_TYPE
 
     def load(self, sr_uuid):
-        super(LargeBlockSR, self).load(sr_uuid=sr_uuid)
+        super(LargeBlockSR, self).load(sr_uuid)
         self.is_deleting = False
         self.vgname = LARGEBLOCK_PREFIX + sr_uuid
         self.remotepath = os.path.join("/dev", self.vgname, sr_uuid)
@@ -90,7 +90,7 @@ def delete(self, sr_uuid):
         self.is_deleting = True
         try:
             self._create_emulated_device()
-            super(LargeBlockSR, self).delete(sr_uuid=sr_uuid)
+            super(LargeBlockSR, self).delete(sr_uuid)
         except SR.SROSError as e:
             util.SMlog(e)
         finally:
@@ -152,10 +152,7 @@ def _is_vg_connection_correct(self):
         output = util.pread2(["vgs", "--noheadings", "-o", "vg_name,devices", self.vgname]).split()
         if self.vgname == output[0]:
             output[1] = output[1].split("(")[0]
-        if re.match(r"(.*\.512)|(/dev/loop[0-9]+)", output[1]):
-            return True
-        else:
-            return False
+        return bool(re.match(r"(.*\.512)|(/dev/loop[0-9]+)", output[1]))
 
     def _redo_vg_connection(self):
         """
@@ -168,10 +165,8 @@ def _redo_vg_connection(self):
 
         util.SMlog("Reconnecting VG {} to use emulated device".format(self.vgname))
         try:
-            cmd = ["vgchange", "-an", self.vgname]
-            util.pread2(cmd)
-            cmd = ["vgchange", "-ay", self.vgname, "--config", "devices{ global_filter = [ \"r|^/dev/nvme.*|\", \"a|/dev/loop.*|\" ] }"]
-            util.pread2(cmd)
+            util.pread2(["vgchange", "-an", self.vgname])
+            util.pread2(["vgchange", "-ay", self.vgname, "--config", "devices{ global_filter = [ \"r|^/dev/nvme.*|\", \"a|/dev/loop.*|\" ] }"])
         except util.CommandException as e:
             util.SMlog("Failed to reconnect the VolumeGroup {}, error: {}".format(self.vgname, e))