From b3c0810574302b3d0cd480dbd748e62caec97c7a Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 5 Jan 2022 12:10:34 -0500 Subject: [PATCH] Fix XCC preconfig with SSDP change The SSDP unfortunately changes some structure, change XCC preconfig to expect the SSDP structure. --- confluent_server/confluent/discovery/handlers/xcc.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/confluent_server/confluent/discovery/handlers/xcc.py b/confluent_server/confluent/discovery/handlers/xcc.py index b65f5049..44a8c4d5 100644 --- a/confluent_server/confluent/discovery/handlers/xcc.py +++ b/confluent_server/confluent/discovery/handlers/xcc.py @@ -105,16 +105,18 @@ class NodeHandler(immhandler.NodeHandler): if ff not in ('dense-computing', [u'dense-computing']): # skip preconfig for non-SD530 servers return - currfirm = self.info.get('attributes', {}).get('firmware-image-info', [''])[0] - if not currfirm.startswith('TEI'): + currfirm = self.info.get('attributes', {}).get('firmware-image-info', [{}])[0] + if not currfirm.get('build', '').startswith('TEI'): return self.trieddefault = None # Reset state on a preconfig attempt # attempt to enable SMM #it's normal to get a 'not supported' (193) for systems without an SMM # need to branch on 3.00+ firmware - currfirm = currfirm.split(':') - if len(currfirm) > 1: - currfirm = float(currfirm[1]) + currfirm = currfirm.get('version', '0.0') + if currfirm: + currfirm = float(currfirm) + else: + currfirm = 0 disableipmi = False if currfirm >= 3: # IPMI is disabled and we need it, also we need to go to *some* password