xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-17 21:23:18 +00:00
Code Issues Projects Releases Wiki Activity

Move 'leds' to be a hardware sensor category

Browse Source 
Rather than 'led' being distinct from 'hardware',
have 'leds' be a category of 'hardware' like 'fans'
or other things similarly hardware related.
This commit is contained in:
Jarrod Johnson 2015-09-28 11:20:44 -04:00
parent c1bd46b22a
commit 0ae2b7acc6
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
confluent_server/confluent/core.py
View File

@ -214,13 +214,12 @@ noderesources = {
'pluginattrs': ['hardwaremanagement.method'],
'default': 'ipmi',
}),
},
'led': {
'all': PluginCollection({
'leds': PluginCollection({
'pluginattrs': ['hardwaremanagement.method'],
'default': 'ipmi',
})
}),
},
},
}

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

@ -646,12 +646,12 @@ class IpmiHandler(object):
self.sensorcategory = self.element[2]
# list sensors per category
if len(self.element) == 3 and self.element[-2] == 'hardware':
if self.sensorcategory == 'leds':
return self.list_leds()
return self.list_sensors()
elif len(self.element) == 3 and self.element[-2] == 'led':
return self.list_leds()
elif len(self.element) == 4 and self.element[1] == 'led':
return self.read_leds(self.element[-1])
elif len(self.element) == 4: # resource requested
if self.sensorcategory == 'leds':
return self.read_leds(self.element[-1])
return self.read_sensors(self.element[-1])
def match_sensor(self, sensor):