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

chore: cleanup, add device_platform in summary

Browse source 
Signed-off-by: Cyril Levis <git@levis.name>
This commit is contained in:
Cyril Levis 2022-03-31 20:58:23 +02:00
parent 9e797c376e
commit dfb6b234ba
No known key found for this signature in database
GPG key ID: 6DB88737C11F5A48
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
netbox_agent/misc.py
View file

@ -29,18 +29,18 @@ def get_device_type(type):
return device_type
def get_device_platform(config):
if config.device.platform is None:
def get_device_platform(device_platform):
if device_platform is None:
try:
import platform
linux_distribution = " ".join(platform.linux_distribution())
if not linux_distribution:
return None
except ModuleNotFoundError:
except (ModuleNotFoundError, NameError):
return None
else:
linux_distribution = config.device.platform
linux_distribution = device_platform
device_platform = nb.dcim.platforms.get(name=linux_distribution)
if device_platform is None:

10
netbox_agent/server.py
View file

@ -24,6 +24,7 @@ class ServerBase():
self.bios = dmidecode.get_by_type(self.dmi, 'BIOS')
self.chassis = dmidecode.get_by_type(self.dmi, 'Chassis')
self.system = dmidecode.get_by_type(self.dmi, 'System')
self.device_platform = get_device_platform(config.device.platform)
self.network = None
@ -262,7 +263,6 @@ class ServerBase():
def _netbox_create_server(self, datacenter, tenant, rack):
device_role = get_device_role(config.device.server_role)
device_type = get_device_type(self.get_product_name())
device_platform = get_device_platform(config)
if not device_type:
raise Exception('Chassis "{}" doesn\'t exist'.format(self.get_chassis()))
serial = self.get_service_tag()
@ -274,7 +274,7 @@ class ServerBase():
serial=serial,
device_role=device_role.id,
device_type=device_type.id,
platform=device_platform.id,
platform=self.device_platform,
site=datacenter.id if datacenter else None,
tenant=tenant.id if tenant else None,
rack=rack.id if rack else None,
@ -465,9 +465,8 @@ class ServerBase():
ret, server = self.update_netbox_location(server)
update += ret
platform = get_device_platform(config)
if server.platform != platform.name:
server.platform = platform.id
if server.platform != self.device_platform:
server.platform = self.device_platform
update += 1
if update:
@ -494,6 +493,7 @@ class ServerBase():
print('Is blade:', self.is_blade())
print('Got expansion:', self.own_expansion_slot())
print('Product Name:', self.get_product_name())
print('Platform:', self.device_platform)
print('Chassis:', self.get_chassis())
print('Chassis service tag:', self.get_chassis_service_tag())
print('Service tag:', self.get_service_tag())