From 8b12047ae0101ad9b9abb54e95d9874fc925c8e8 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 31 Oct 2025 09:45:59 -0400 Subject: [PATCH] Update to handle newer XCC2 firmware --- confluent_server/confluent/discovery/handlers/xcc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/discovery/handlers/xcc.py b/confluent_server/confluent/discovery/handlers/xcc.py index a0846187..b39574d5 100644 --- a/confluent_server/confluent/discovery/handlers/xcc.py +++ b/confluent_server/confluent/discovery/handlers/xcc.py @@ -490,7 +490,7 @@ class NodeHandler(immhandler.NodeHandler): {'UserName': username}, method='PATCH') if status != 200: rsp = json.loads(rsp) - if rsp.get('error', {}).get('code', 'Unknown') in ('Base.1.8.GeneralError', 'Base.1.12.GeneralError', 'Base.1.14.GeneralError', 'Base.1.18.GeneralError'): + if rsp.get('error', {}).get('code', 'Unknown') in ('Base.1.8.GeneralError', 'Base.1.12.GeneralError', 'Base.1.14.GeneralError', 'Base.1.18.GeneralError', 'Base.1.21.GeneralError'): if tries: eventlet.sleep(4) elif tmpaccount: @@ -522,7 +522,7 @@ class NodeHandler(immhandler.NodeHandler): if userent['users_user_name'] == user: curruser = userent break - if curruser.get('users_pass_is_sha256', 0): + if curruser and curruser.get('users_pass_is_sha256', 0): self._wc = None wc = self.wc nwc = wc.dupe()