handle more PSU dmidecode format

This commit is contained in:
Solvik Blum 2019-09-10 15:20:29 +02:00
commit 6cad2399c5
No known key found for this signature in database
GPG key ID: CC12B3DC262B6C47

View file

@ -17,7 +17,7 @@ class PowerSupply():
def get_power_supply(self):
power_supply = []
for psu in self.server.dmi.get_by_type(PSU_DMI_TYPE):
if 'Present' not in psu['Status']:
if 'Present' not in psu['Status'] or psu['Status'] == 'Not Present':
continue
try:
@ -86,7 +86,11 @@ class PowerSupply():
return True
def report_power_consumption(self):
psu_cons = self.server.get_power_consumption()
try:
psu_cons = self.server.get_power_consumption()
except NotImplementedError:
logging.error('Cannot report power consumption for this vendor')
return False
nb_psus = self.get_netbox_power_supply()
if not len(nb_psus) or not len(psu_cons):