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

strip dmidecode data, because vendor dont #72

Merged
Solvik merged 1 commit from strip_fix into master 2019-09-10 13:39:22 +02:00
Conversation 0 Commits 1 Files changed 2 +6 -6
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
netbox_agent/vendors/dell.py vendored
View file

@ -20,7 +20,7 @@ class DellHost(ServerBase):
` Location In Chassis: Slot 03`
"""
if self.is_blade():
return self.dmi.get_by_type('Baseboard')[0].get('Location In Chassis')
return self.dmi.get_by_type('Baseboard')[0].get('Location In Chassis').strip()
return None
def get_chassis_name(self):
@ -30,12 +30,12 @@ class DellHost(ServerBase):
def get_chassis(self):
if self.is_blade():
return self.dmi.get_by_type('Chassis')[0]['Version']
return self.dmi.get_by_type('Chassis')[0]['Version'].strip()
return self.get_product_name()
def get_chassis_service_tag(self):
if self.is_blade():
return self.dmi.get_by_type('Chassis')[0]['Serial Number']
return self.dmi.get_by_type('Chassis')[0]['Serial Number'].strip()
return self.get_service_tag()
def get_power_consumption(self):

6
netbox_agent/vendors/qct.py vendored
View file

@ -12,7 +12,7 @@ class QCTHost(ServerBase):
def get_blade_slot(self):
if self.is_blade():
return 'Slot {}'.format(
self.dmi.get_by_type('Baseboard')[0].get('Location In Chassis')
self.dmi.get_by_type('Baseboard')[0].get('Location In Chassis').strip()
)
return None
@ -23,10 +23,10 @@ class QCTHost(ServerBase):
def get_chassis(self):
if self.is_blade():
return self.dmi.get_by_type('Chassis')[0]['Version']
return self.dmi.get_by_type('Chassis')[0]['Version'].strip()
return self.get_product_name()
def get_chassis_service_tag(self):
if self.is_blade():
return self.dmi.get_by_type('Chassis')[0]['Serial Number']
return self.dmi.get_by_type('Chassis')[0]['Serial Number'].strip()
return self.get_service_tag()