From 68e9cf465bdaab11682ccca4393388db6e9faf3a Mon Sep 17 00:00:00 2001 From: Solvik Blum Date: Tue, 10 Sep 2019 12:58:00 +0200 Subject: [PATCH] strip dmidecode data, because vendor dont --- netbox_agent/vendors/dell.py | 6 +++--- netbox_agent/vendors/qct.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/netbox_agent/vendors/dell.py b/netbox_agent/vendors/dell.py index 3ef06ac..e7838f0 100644 --- a/netbox_agent/vendors/dell.py +++ b/netbox_agent/vendors/dell.py @@ -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): diff --git a/netbox_agent/vendors/qct.py b/netbox_agent/vendors/qct.py index 7e18e96..6051da1 100644 --- a/netbox_agent/vendors/qct.py +++ b/netbox_agent/vendors/qct.py @@ -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()