Add Blade to FORM_FACTOR list and document SMBIOS spec URL

This commit is contained in:
Stephen Fromm 2012-08-02 07:22:51 -07:00
parent 1f2de09530
commit 0c9f1cbffd

4
setup
View file

@ -189,6 +189,7 @@ class LinuxHardware(Hardware):
'bios_date': '/sys/devices/virtual/dmi/id/bios_date', 'bios_date': '/sys/devices/virtual/dmi/id/bios_date',
'bios_version': '/sys/devices/virtual/dmi/id/bios_version' } 'bios_version': '/sys/devices/virtual/dmi/id/bios_version' }
# From smolt and DMI spec # From smolt and DMI spec
# See http://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.0.pdf
FORM_FACTOR = [ "Unknown", "Other", "Unknown", "Desktop", FORM_FACTOR = [ "Unknown", "Other", "Unknown", "Desktop",
"Low Profile Desktop", "Pizza Box", "Mini Tower", "Tower", "Low Profile Desktop", "Pizza Box", "Mini Tower", "Tower",
"Portable", "Laptop", "Notebook", "Hand Held", "Docking Station", "Portable", "Laptop", "Notebook", "Hand Held", "Docking Station",
@ -196,7 +197,7 @@ class LinuxHardware(Hardware):
"Main Server Chassis", "Expansion Chassis", "Sub Chassis", "Main Server Chassis", "Expansion Chassis", "Sub Chassis",
"Bus Expansion Chassis", "Peripheral Chassis", "RAID Chassis", "Bus Expansion Chassis", "Peripheral Chassis", "RAID Chassis",
"Rack Mount Chassis", "Sealed-case PC", "Multi-system", "Rack Mount Chassis", "Sealed-case PC", "Multi-system",
"CompactPCI", "AdvancedTCA" ] "CompactPCI", "AdvancedTCA", "Blade" ]
def __init__(self): def __init__(self):
Hardware.__init__(self) Hardware.__init__(self)
@ -250,7 +251,6 @@ class LinuxHardware(Hardware):
data = get_file_content(path) data = get_file_content(path)
if data is not None: if data is not None:
if key == 'form_factor': if key == 'form_factor':
try: try:
self.facts['form_factor'] = LinuxHardware.FORM_FACTOR[int(data)] self.facts['form_factor'] = LinuxHardware.FORM_FACTOR[int(data)]
except IndexError, e: except IndexError, e: