Migrate blktap2.py to now APISession, remove call to XAPI.getSession in cleanup.py

Due to the rebase, some old-style session management appeared, this commit makes them use the new APISession.

Signed-off-by: Arnaud Garcia-Fernandez <arnaud.garcia-fernandez@vates.tech>

Author: Ythogtha

drivers/blktap2.py

@@ -882,7 +882,8 @@ def abort_linstor_gc(drbd_path: str) -> bool:
 
         openers = get_all_volume_openers(volume_name, "0")
 
-        session = util.timeout(5, util.get_localAPI_session)
+        api_session = util.timeout(5, util.APISession, "blktap-abort_linstor_gc")
+        session = api_session.session
         try:
             srs = util.get_linstor_srs_uuid(session)
             pbd_ref = util.find_pbd_ref_from_dconf_value(
@@ -902,7 +903,7 @@ def abort_linstor_gc(drbd_path: str) -> bool:
 
             util.SMlog(f"Unable to run tapdisk, openers of DRBD resource `{drbd_path}`: {openers}")
         finally:
-            session.xenapi.session.logout()
+            api_session.logout()
 
         return False
 

drivers/cleanup.py

@@ -3928,16 +3928,12 @@ def _abort_gc_from_openers(uuid: str, is_vdi_uuid: bool, openers: "LinstorVolume
                 if node_name == hostname:
                     continue
 
-                with util.timeout(5):
-                    session = XAPI.getSession()
-                    try:
-                        sr_uuid = util.get_sr_uuid_from_vdi_uuid(session, uuid) if is_vdi_uuid else uuid
-                        util.SMlog(f"LINSTOR volume is coalescing on `{sr_uuid}`. We're going to interrupt the GC...")
-                        return util.strtobool(session.xenapi.host.call_plugin(
-                            util.get_master_ref(session), MANAGER_PLUGIN, "abortGc", {"srUuid": sr_uuid}
-                        ))
-                    finally:
-                        session.xenapi.session.logout()
+                with util.timeout(5), util.APISession("GC-coalescing") as session:
+                    sr_uuid = util.get_sr_uuid_from_vdi_uuid(session, uuid) if is_vdi_uuid else uuid
+                    util.SMlog(f"LINSTOR volume is coalescing on `{sr_uuid}`. We're going to interrupt the GC...")
+                    return util.strtobool(session.xenapi.host.call_plugin(
+                        util.get_master_ref(session), MANAGER_PLUGIN, "abortGc", {"srUuid": sr_uuid}
+                    ))
         return False