more fixes
This commit is contained in:
parent
d56b02c7bd
commit
eaaf565b37
6 changed files with 14 additions and 14 deletions
|
|
@ -6,11 +6,11 @@ class DellHost(ServerBase):
|
|||
return self.get_product_name().startswith('PowerEdge M')
|
||||
|
||||
def get_blade_slot(self):
|
||||
'''
|
||||
"""
|
||||
Return blade slot
|
||||
dmidecode output is:
|
||||
` Location In Chassis: Slot 03`
|
||||
'''
|
||||
"""
|
||||
if self.is_blade():
|
||||
return int(self.dmi.get_by_type('Baseboard')[0].get('Location In Chassis').split()[1])
|
||||
return None
|
||||
|
|
|
|||
|
|
@ -58,10 +58,10 @@ for type_id, type_str in _type2str.items():
|
|||
|
||||
|
||||
def parse():
|
||||
'''
|
||||
"""
|
||||
parse the full output of the dmidecode
|
||||
command and return a dic containing the parsed information
|
||||
'''
|
||||
"""
|
||||
buffer = _execute_cmd()
|
||||
if isinstance(buffer, bytes):
|
||||
buffer = buffer.decode('utf-8')
|
||||
|
|
@ -70,7 +70,7 @@ def parse():
|
|||
|
||||
|
||||
def get_by_type(type_id):
|
||||
'''
|
||||
"""
|
||||
filter the output of dmidecode per type
|
||||
0 BIOS
|
||||
1 System
|
||||
|
|
@ -115,7 +115,7 @@ def get_by_type(type_id):
|
|||
40 Additional Information
|
||||
41 Onboard Devices Extended Information
|
||||
42 Management Controller Host Interface
|
||||
'''
|
||||
"""
|
||||
if isinstance(type_id, str):
|
||||
type_id = _str2type[type_id]
|
||||
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ class HPHost(ServerBase):
|
|||
return self.get_product_name().startswith('ProLiant BL')
|
||||
|
||||
def _find_rack_locator(self):
|
||||
'''
|
||||
"""
|
||||
Depending on the server, the type of the `HP ProLiant System/Rack Locator`
|
||||
can change.
|
||||
So we need to find it every time
|
||||
'''
|
||||
"""
|
||||
# FIXME: make a dmidecode function get_by_dminame() ?
|
||||
if self.is_blade():
|
||||
for key, value in self.dmi.parse().items():
|
||||
|
|
|
|||
|
|
@ -22,15 +22,15 @@ class ServerBase():
|
|||
self.network_cards = []
|
||||
|
||||
def get_product_name(self):
|
||||
'''
|
||||
"""
|
||||
Return the Chassis Name from dmidecode info
|
||||
'''
|
||||
"""
|
||||
return self.system[0]['Product Name']
|
||||
|
||||
def get_service_tag(self):
|
||||
'''
|
||||
"""
|
||||
Return the Service Tag from dmidecode info
|
||||
'''
|
||||
"""
|
||||
return self.system[0]['Serial Number']
|
||||
|
||||
def is_blade(self):
|
||||
|
|
|
|||
2
setup.py
2
setup.py
|
|
@ -12,7 +12,7 @@ setup(
|
|||
include_package_data=True,
|
||||
use_scm_version=True,
|
||||
packages=find_packages(),
|
||||
install_requires=open('requirements.txt').readlines(),
|
||||
install_requires=find_packages(),
|
||||
zip_safe=False,
|
||||
keywords=['netbox'],
|
||||
classifiers=[
|
||||
|
|
|
|||
2
tox.ini
2
tox.ini
|
|
@ -20,7 +20,7 @@ max-line-length = 99
|
|||
import-order-style = google
|
||||
|
||||
# Inform flake8-import-order plugin that `fact` should be treated as a local package name.
|
||||
application-import-names = fact
|
||||
application-import-names = netbox_agent
|
||||
|
||||
# [testenv]
|
||||
# setenv =
|
||||
|
|
|
|||
Loading…
Add table
editor.link_modal.header
Reference in a new issue