From 2ab2fbda272f1264d275540a436caa782f8163a5 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 27 Apr 2015 17:16:45 -0400 Subject: [PATCH] Make ipmi inventory more closely resemble sensors Have the inventory data enumerate in one list rather than a bunch of distinct lists. --- .../confluent/plugins/hardwaremanagement/ipmi.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py index f22eb098..e4604fc9 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py @@ -412,16 +412,18 @@ class IpmiHandler(object): raise Exception('Unsupported scenario...') def read_inventory(self, component): + invitems = [] if component == 'all': for invdata in self.ipmicmd.get_inventory(): if invdata[1] is None: newinf = {'present': False, 'information': None} else: + sanitize_invdata(invdata[1]) newinf = {'present': True, 'information': invdata[1]} newinf['name'] = invdata[0] - newinvdata = {'inventory': [newinf]} - sanitize_invdata(newinvdata['inventory'][0]) - self.output.put(msg.KeyValueData(newinvdata, self.node)) + invitems.append(newinf) + newinvdata = {'inventory': invitems} + self.output.put(msg.KeyValueData(newinvdata, self.node)) def handle_sensors(self): if self.element[-1] == '':