xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-26 03:19:48 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Fix non-unique name for similar inventory items."

Browse Source 
This reverts commit 47a53a51e4.
This commit is contained in:
Jarrod Johnson 2018-09-07 11:44:01 -04:00
parent 34b7abcb2d
commit e7be24d478
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
View File

@ -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):