netbox_agent/inventory.py

@@ -73,7 +73,7 @@ class Inventory():
             logging.info('Creating missing manufacturer {name}'.format(name=name))
             manufacturer = nb.dcim.manufacturers.create(
                 name=name,
-                slug=name.replace(' ','-').lower(),
+                slug=name.replace(' ', '-').lower(),
             )
 
             logging.info('Creating missing manufacturer {name}'.format(name=name))
@@ -86,7 +86,7 @@ class Inventory():
                 device_id=device_id,
                 tag=tag
             )
-        except:
+        except BaseException:
             logging.info('Tag {tag} is missing, returning empty array.'.format(tag=tag))
             items = []
 
@@ -116,10 +116,10 @@ class Inventory():
         motherboards = []
 
         m = {}
-        m['serial']=self.lshw.motherboard_serial
+        m['serial'] = self.lshw.motherboard_serial
-        m['vendor']=self.lshw.vendor
+        m['vendor'] = self.lshw.vendor
-        m['name']='{} {}'.format(self.lshw.vendor, self.lshw.motherboard)
+        m['name'] = '{} {}'.format(self.lshw.vendor, self.lshw.motherboard)
-        m['description']='{} Motherboard'.format(self.lshw.motherboard)
+        m['description'] = '{} Motherboard'.format(self.lshw.motherboard)
 
         motherboards.append(m)
 
@@ -144,7 +144,7 @@ class Inventory():
         for motherboard in motherboards:
             if motherboard.get('serial') not in [x.serial for x in nb_motherboards]:
                 self.create_netbox_inventory_item(
-                    device_id = self.device_id,
+                    device_id=self.device_id,
                     tags=[INVENTORY_TAG['motherboard']['slug']],
                     vendor='{}'.format(motherboard.get('vendor', 'N/A')),
                     serial='{}'.format(motherboard.get('serial', '000000')),
@@ -156,7 +156,7 @@ class Inventory():
         manufacturer = self.find_or_create_manufacturer(iface["vendor"])
         _ = nb.dcim.inventory_items.create(
             device=self.device_id,
-            manufacturer = manufacturer.id,
+            manufacturer=manufacturer.id,
             discovered=True,
             tags=[INVENTORY_TAG['interface']['name']],
             name="{}".format(iface['product']),

netbox_agent/lshw.py

@@ -1,5 +1,4 @@
 import subprocess
-import getpass
 import json
 
 
@@ -7,9 +6,8 @@ class LSHW():
     def __init__(self):
 
         self.hw_info = json.loads(
-                subprocess.check_output(["lshw", "-quiet", "-json"],
+                                subprocess.check_output(["lshw", "-quiet", "-json"],
-                encoding='utf8')
+                                encoding='utf8'))  # noqa: E128
-                )
 
         self.info = {}
         self.memories = []
@@ -81,9 +79,8 @@ class LSHW():
 
         elif "nvme" in obj["configuration"]["driver"]:
             nvme = json.loads(
-                    subprocess.check_output(["nvme", '-list', '-o', 'json'],
+                            subprocess.check_output(["nvme", '-list', '-o', 'json'],
-                    encoding='utf8')
+                            encoding='utf8'))  # noqa: E128
-                    )
 
             d = {}
             d["vendor"] = obj["vendor"]