Make login reentrant.

Also fix some strings.

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

Author: Ythogtha

drivers/coalesce-leaf

@@ -2,8 +2,8 @@
 #
 # Copyright (C) Citrix Systems Inc.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
+# This program is free software; you can redistribute it and/or modify 
+# it under the terms of the GNU Lesser General Public License as published 
 # by the Free Software Foundation; version 2.1 only.
 #
 # This program is distributed in the hope that it will be useful, 

drivers/mpathcount.py

@@ -220,12 +220,8 @@ def _run_command(command, timeout):
         util.SMlog(f"XAPI health check failed: {stderr}")
     return returncode == 0
 
-if __name__ == '__main__':
-    try:
-        session = util.APISession("SM-mpathcount").session
-    except xs_errors.XenError:
-        sys.exit(-1)
-
+def main(session):
+    global mpath_enabled
     localhost = session.xenapi.host.get_by_uuid(get_localhost_uuid())
     check_xapi_is_enabled()
     # Check whether multipathing is enabled (either for root dev or SRs)
@@ -282,4 +278,10 @@ def add(key, val):
 
     util.SMlog("MPATH: Update done")
 
+if __name__ == '__main__':
+    try:
+        with util.APISession("SM-mpathcount") as api_session:
+            main(api_session)
+    except xs_errors.XenError:
+        sys.exit(-1)
     sys.exit(0)

drivers/util.py

@@ -773,19 +773,23 @@ def getrootdevID():
 
 
 class APISession(contextlib.AbstractContextManager):
+    session=None
+
     def __init__(self, originator="SM"):
         self.originator = originator
         # First acquire a valid session
         self.session = self._login()
-        SMlog("APISession [{}] login".format(self.originator), priority=LOG_DEBUG)
         atexit.register(self._atexit)
 
     def _login(self):
+        if self.session:
+            return self.session
         session = XenAPI.xapi_local()
         try:
             session.xenapi.login_with_password('root', '', '', self.originator)
         except Exception as exc:
             raise xs_errors.XenError(f"APISession [{self.originator}] Unable to open local XAPI session") from exc
+        SMlog("APISession [{}] login".format(self.originator), priority=LOG_DEBUG)
         return session
 
     def _logout(self, log):
@@ -810,8 +814,7 @@ def _atexit(self):
 
     @override
     def __enter__(self):
-        if not self.session:
-            raise SyntaxError("Session is already closed: wrong usage of context.")
+        self.session = self._login()
         return self.session
 
     @override
@@ -1488,7 +1491,7 @@ def is_active(self, name):
         return os.path.exists("/tmp/fist_%s" % name)
 
     def mark_sr(self, name, sruuid, started):
-        with APISession("SM-util-FistPoint-mark_sr") as session:
+        with APISession("SM-sr-fist-point") as session:
             sr = session.xenapi.SR.get_by_uuid(sruuid)
             if started:
                 session.xenapi.SR.add_to_other_config(sr, name, "active")