From e7be24d4780b5deb46d3911fdd6b7010bcfb77a8 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 7 Sep 2018 11:44:01 -0400 Subject: [PATCH] Revert "Fix non-unique name for similar inventory items." This reverts commit 47a53a51e4bb625e28232cb8f792f2053b2e0b64. --- .../confluent/plugins/hardwaremanagement/ipmi.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py index 2052cc6e..1cd70e23 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py @@ -410,7 +410,6 @@ persistent_ipmicmds = {} class IpmiHandler(object): def __init__(self, operation, node, element, cfd, inputdata, cfg, output): self.sensormap = {} - self.usedlabels = {} self.invmap = {} self.output = output self.sensorcategory = None @@ -917,12 +916,7 @@ class IpmiHandler(object): if vstr: newinf['information']['PCI Vendor'] = vstr if dstr: - newname = dstr - instance = 1 - while newname in self.usednames: - instance += 1 - newname = dstr + ' {1}'.format(instance) - newinf['name'] = newname + newinf['name'] = dstr invitems.append(newinf) def handle_sensors(self):