Merge branch 'master' into patch-1

netbox_agent/lshw.py

@@ -104,7 +104,10 @@ class LSHW():
                         d['product'] = device["ModelNumber"]
                         d['serial'] = device["SerialNumber"]
                         d["version"] = device["Firmware"]
+                        if "UsedSize" in device:
                             d['size'] = device["UsedSize"]
+                        if "UsedBytes" in device:
+                            d['size'] = device["UsedBytes"]
                         d['description'] = "NVME Disk"
 
                         self.disks.append(d)

netbox_agent/server.py

@@ -67,7 +67,6 @@ class ServerBase():
 
     def update_netbox_location(self, server):
         dc = self.get_datacenter()
-        rack = self.get_rack()
         nb_rack = self.get_netbox_rack()
         nb_dc = self.get_netbox_datacenter()
 
@@ -80,7 +79,11 @@ class ServerBase():
             update = True
             server.site = nb_dc.id
 
-        if rack and server.rack and server.rack.id != nb_rack.id:
+        if (
+            server.rack
+            and nb_rack
+            and server.rack.id != nb_rack.id
+        ):
             logging.info('Rack location has changed from {} to {}, updating'.format(
                 server.rack,
                 nb_rack,

netbox_agent/vendors/hp.py

@@ -12,8 +12,10 @@ class HPHost(ServerBase):
 
     def is_blade(self):
         blade = self.product.startswith("ProLiant BL")
+
         blade |= self.product.startswith("ProLiant m") and \
             self.product.endswith("Server Cartridge")
+
         return blade
 
     def _find_rack_locator(self):