chore: cleanup, add device_platform in summary
Signed-off-by: Cyril Levis <git@levis.name>
This commit is contained in:
parent
9e797c376e
commit
dfb6b234ba
2 changed files with 9 additions and 9 deletions
|
|
@ -29,18 +29,18 @@ def get_device_type(type):
|
||||||
return device_type
|
return device_type
|
||||||
|
|
||||||
|
|
||||||
def get_device_platform(config):
|
def get_device_platform(device_platform):
|
||||||
if config.device.platform is None:
|
if device_platform is None:
|
||||||
try:
|
try:
|
||||||
import platform
|
import platform
|
||||||
|
|
||||||
linux_distribution = " ".join(platform.linux_distribution())
|
linux_distribution = " ".join(platform.linux_distribution())
|
||||||
if not linux_distribution:
|
if not linux_distribution:
|
||||||
return None
|
return None
|
||||||
except ModuleNotFoundError:
|
except (ModuleNotFoundError, NameError):
|
||||||
return None
|
return None
|
||||||
else:
|
else:
|
||||||
linux_distribution = config.device.platform
|
linux_distribution = device_platform
|
||||||
|
|
||||||
device_platform = nb.dcim.platforms.get(name=linux_distribution)
|
device_platform = nb.dcim.platforms.get(name=linux_distribution)
|
||||||
if device_platform is None:
|
if device_platform is None:
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ class ServerBase():
|
||||||
self.bios = dmidecode.get_by_type(self.dmi, 'BIOS')
|
self.bios = dmidecode.get_by_type(self.dmi, 'BIOS')
|
||||||
self.chassis = dmidecode.get_by_type(self.dmi, 'Chassis')
|
self.chassis = dmidecode.get_by_type(self.dmi, 'Chassis')
|
||||||
self.system = dmidecode.get_by_type(self.dmi, 'System')
|
self.system = dmidecode.get_by_type(self.dmi, 'System')
|
||||||
|
self.device_platform = get_device_platform(config.device.platform)
|
||||||
|
|
||||||
self.network = None
|
self.network = None
|
||||||
|
|
||||||
|
|
@ -262,7 +263,6 @@ class ServerBase():
|
||||||
def _netbox_create_server(self, datacenter, tenant, rack):
|
def _netbox_create_server(self, datacenter, tenant, rack):
|
||||||
device_role = get_device_role(config.device.server_role)
|
device_role = get_device_role(config.device.server_role)
|
||||||
device_type = get_device_type(self.get_product_name())
|
device_type = get_device_type(self.get_product_name())
|
||||||
device_platform = get_device_platform(config)
|
|
||||||
if not device_type:
|
if not device_type:
|
||||||
raise Exception('Chassis "{}" doesn\'t exist'.format(self.get_chassis()))
|
raise Exception('Chassis "{}" doesn\'t exist'.format(self.get_chassis()))
|
||||||
serial = self.get_service_tag()
|
serial = self.get_service_tag()
|
||||||
|
|
@ -274,7 +274,7 @@ class ServerBase():
|
||||||
serial=serial,
|
serial=serial,
|
||||||
device_role=device_role.id,
|
device_role=device_role.id,
|
||||||
device_type=device_type.id,
|
device_type=device_type.id,
|
||||||
platform=device_platform.id,
|
platform=self.device_platform,
|
||||||
site=datacenter.id if datacenter else None,
|
site=datacenter.id if datacenter else None,
|
||||||
tenant=tenant.id if tenant else None,
|
tenant=tenant.id if tenant else None,
|
||||||
rack=rack.id if rack else None,
|
rack=rack.id if rack else None,
|
||||||
|
|
@ -465,9 +465,8 @@ class ServerBase():
|
||||||
ret, server = self.update_netbox_location(server)
|
ret, server = self.update_netbox_location(server)
|
||||||
update += ret
|
update += ret
|
||||||
|
|
||||||
platform = get_device_platform(config)
|
if server.platform != self.device_platform:
|
||||||
if server.platform != platform.name:
|
server.platform = self.device_platform
|
||||||
server.platform = platform.id
|
|
||||||
update += 1
|
update += 1
|
||||||
|
|
||||||
if update:
|
if update:
|
||||||
|
|
@ -494,6 +493,7 @@ class ServerBase():
|
||||||
print('Is blade:', self.is_blade())
|
print('Is blade:', self.is_blade())
|
||||||
print('Got expansion:', self.own_expansion_slot())
|
print('Got expansion:', self.own_expansion_slot())
|
||||||
print('Product Name:', self.get_product_name())
|
print('Product Name:', self.get_product_name())
|
||||||
|
print('Platform:', self.device_platform)
|
||||||
print('Chassis:', self.get_chassis())
|
print('Chassis:', self.get_chassis())
|
||||||
print('Chassis service tag:', self.get_chassis_service_tag())
|
print('Chassis service tag:', self.get_chassis_service_tag())
|
||||||
print('Service tag:', self.get_service_tag())
|
print('Service tag:', self.get_service_tag())
|
||||||
|
|
|
||||||
Loading…
Add table
editor.link_modal.header
Reference in a new issue