From 38546514e2f12cda5d2eb566662f09b8915a7a02 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 11 Aug 2017 10:07:42 -0400 Subject: [PATCH] Pull UUID into info for rackmount UUID was erroneously not pulled. The block on dense/blade should only apply to enclosure bay. --- confluent_server/confluent/discovery/handlers/imm.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/confluent_server/confluent/discovery/handlers/imm.py b/confluent_server/confluent/discovery/handlers/imm.py index 66cc4c82..983eb94e 100644 --- a/confluent_server/confluent/discovery/handlers/imm.py +++ b/confluent_server/confluent/discovery/handlers/imm.py @@ -28,10 +28,6 @@ class NodeHandler(bmchandler.NodeHandler): ff = slpattrs.get('enclosure-form-factor', [''])[0] except IndexError: return - if ff not in ('dense-computing', 'BC2'): - # do not probe unless it's a dense platform - return - self.isdense = True wronguuid = slpattrs.get('node-uuid', [''])[0] if wronguuid: # we need to fix the first three portions of the uuid @@ -43,6 +39,10 @@ class NodeHandler(bmchandler.NodeHandler): self.info['uuid'] = uuidprefix + '-' + '-'.join( wronguuid.split('-')[3:]) self.info['uuid'] = string.lower(self.info['uuid']) + if ff not in ('dense-computing', 'BC2'): + # do not probe unless it's a dense platform + return + self.isdense = True slot = int(slpattrs.get('slot', ['0'])[0]) if slot != 0: self.info['enclosure.bay'] = slot