xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-04-12 20:01:30 +00:00
Code Issues Projects Releases Wiki Activity

Accept XCC and BMC for aliases of each other

Browse Source
This commit is contained in:
Jarrod Johnson
2025-04-09 12:19:16 -04:00
parent 7001f0d827
commit 9744e0d1b0
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,6 +55,15 @@ def get_dns_txt(qstring):
return eventlet.support.greendns.resolver.query(
qstring, 'TXT')[0].strings[0].replace('i=', '')
def match_aliases(first, second):
aliases = {
('bmc', 'xcc')
}
for alias in aliases:
if first in alias and second in alias:
return True
return False
def get_pci_text_from_ids(subdevice, subvendor, device, vendor):
fqpi = '{0}.{1}.{2}.{3}'.format(subdevice, subvendor, device, vendor)
if fqpi in pci_cache:
@@ -960,7 +969,8 @@ class IpmiHandler(object):
complist = () if component == 'all' else (component,)
for id, data in self.ipmicmd.get_firmware(complist):
if (component in ('core', 'all') or
component == simplify_name(id)):
component == simplify_name(id) or
match_aliases(component, simplify_name(id))):
items.append({id: data})
except ssl.SSLEOFError:
errorneeded = msg.ConfluentNodeError(

12
confluent_server/confluent/plugins/hardwaremanagement/redfish.py
View File

@@ -46,6 +46,15 @@ def get_dns_txt(qstring):
return eventlet.support.greendns.resolver.query(
qstring, 'TXT')[0].strings[0].replace('i=', '')
def match_aliases(first, second):
aliases = {
('bmc', 'xcc')
}
for alias in aliases:
if first in alias and second in alias:
return True
return False
def get_pci_text_from_ids(subdevice, subvendor, device, vendor):
fqpi = '{0}.{1}.{2}.{3}'.format(subdevice, subvendor, device, vendor)
if fqpi in pci_cache:
@@ -817,7 +826,8 @@ class IpmiHandler(object):
complist = () if component == 'all' else (component,)
for id, data in self.ipmicmd.get_firmware(complist):
if (component in ('core', 'all') or
component == simplify_name(id)):
component == simplify_name(id) or
match_aliases(component, simplify_name(id))):
items.append({id: data})
except ssl.SSLEOFError:
errorneeded = msg.ConfluentNodeError(