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

Pull outlets into the generic hierarchy

Browse Source 
This will more easily facilitate adding pdus without dependent nodes.
This commit is contained in:
Jarrod Johnson 2022-05-10 16:05:37 -04:00
parent 6229cb23e8
commit 8dbcc804ed
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
confluent_server/confluent/core.py
View File

@ -360,10 +360,6 @@ def _init_core():
{'pluginattrs': ['hardwaremanagement.method'],
'default': 'ipmi'}),
},
'_pdu': {
'outlets': PluginCollection(
{'pluginattrs': ['hardwaremanagement.method']}),
},
'shell': {
# another special case similar to console
'sessions': PluginCollection({
@ -462,6 +458,7 @@ def _init_core():
'default': 'ipmi',
}),
'inlets': PluginCollection({'handler': 'pdu'}),
'outlets': PluginCollection({'pluginattrs': ['hardwaremanagement.method']}),
'reseat': PluginRoute({'handler': 'enclosure'}),
},
'sensors': {

2
confluent_server/confluent/plugins/hardwaremanagement/pdu.py
View File

@ -40,7 +40,7 @@ def retrieve(nodes, element, configmanager, inputdata):
pdu = outlets[node][pgroup]['pdu']
outlet = outlets[node][pgroup]['outlet']
for rsp in core.handle_path(
'/nodes/{0}/_pdu/outlets/{1}'.format(pdu, outlet),
'/nodes/{0}/power/outlets/{1}'.format(pdu, outlet),
'retrieve', configmanager):
yield msg.KeyValueData({pgroup: rsp.kvpairs['state']['value']}, node)