Added automatic handling of 403.4 (no session ID provided)

Details: * In addition to 403.5 (session ID invalid), 403.4 (no session ID provided) is now also automatically handled by the zhmcclient in the same way, i.e. by performing a logon to the HMC and a retry of the HMC operation. Signed-off-by: Andreas Maier <maiera@de.ibm.com>
zhmcclient · May 26, 2023 · dca8d5b · dca8d5b
1 parent d8746d6
commit dca8d5b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/docs/changes.rst b/docs/changes.rst
@@ -49,6 +49,10 @@ Released: not yet
   Improved and fixed the descriptions of Session.logon(), logoff(), is_logon()
   and session_id.
 
+* In addition to 403.5 (session ID invalid), 403.4 (no session ID provided) is
+  now also automatically handled by the zhmcclient in the same way, i.e. by
+  performing a logon to the HMC and a retry of the HMC operation.
+
 **Enhancements:**
 
 **Cleanup:**

diff --git a/zhmcclient/_session.py b/zhmcclient/_session.py
@@ -992,8 +992,10 @@ def get(self, uri, logon_required=True, renew_session=True):
         if result.status_code == 403:
             result_object = _result_object(result)
             reason = result_object.get('reason', None)
-            if reason == 5:
-                # API session token expired: re-logon and retry
+
+            if reason in (4, 5):
+                # 403.4: No session ID was provided
+                # 403.5: Session ID was invalid
                 if renew_session:
                     self._do_logon()
                     return self.get(
@@ -1239,8 +1241,10 @@ def post(self, uri, body=None, logon_required=True,
             if result.status_code == 403:
                 result_object = _result_object(result)
                 reason = result_object.get('reason', None)
-                if reason == 5:
-                    # API session token expired: re-logon and retry
+
+                if reason in (4, 5):
+                    # 403.4: No session ID was provided
+                    # 403.5: Session ID was invalid
                     if renew_session:
                         self._do_logon()
                         return self.post(
@@ -1334,8 +1338,10 @@ def delete(self, uri, logon_required=True, renew_session=True):
         if result.status_code == 403:
             result_object = _result_object(result)
             reason = result_object.get('reason', None)
-            if reason == 5:
-                # API session token expired: re-logon and retry
+
+            if reason in (4, 5):
+                # 403.4: No session ID was provided
+                # 403.5: Session ID was invalid
                 if renew_session:
                     self._do_logon()
                     self.delete(uri, logon_required=False, renew_session=False)