DGNum/netbox-agent
6
0
Fork 0
Code Issues 28 Pull requests 9 Projects Releases 14 Packages Wiki Activity Actions

handle more PSU dmidecode format #75

Merged
Solvik merged 1 commit from fix_psu2 into master 2019-09-11 10:37:32 +02:00
Conversation 0 Commits 1 Files changed 1 +6 -2
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6cad2399c5 - Show all commits

6
netbox_agent/power.py
View file

@ -17,7 +17,7 @@ class PowerSupply():
def get_power_supply(self): def get_power_supply(self):
power_supply = [] power_supply = []
for psu in self.server.dmi.get_by_type(PSU_DMI_TYPE): 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 continue
try: try:
@ -86,7 +86,11 @@ class PowerSupply():
return True return True
def report_power_consumption(self): def report_power_consumption(self):
try:
psu_cons = self.server.get_power_consumption() 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() nb_psus = self.get_netbox_power_supply()
if not len(nb_psus) or not len(psu_cons): if not len(nb_psus) or not len(psu_cons):