merge

netbox_agent/vendors/dell.py

@@ -86,10 +86,3 @@ class DellHost(ServerBase):
         Expansion slot are always the compute bay number + 1
         """
         raise NotImplementedError
-
-    def own_expansion_slot(self):
-        """
-        Say if the device can host an extension card based
-        on the product name
-        """
-        pass

netbox_agent/vendors/generic.py

@@ -8,7 +8,7 @@ class GenericHost(ServerBase):
         self.manufacturer = dmidecode.get_by_type(self.dmi, 'Baseboard')[0].get('Manufacturer')
 
     def is_blade(self):
-        return None
+        return False
 
     def get_blade_slot(self):
         return None
@@ -21,29 +21,3 @@ class GenericHost(ServerBase):
 
     def get_chassis_service_tag(self):
         return self.get_service_tag()
-
-    def get_expansion_product(self):
-        """
-        Get the extension slot that is on a pair slot number
-        next to the compute slot that is on an odd slot number
-        """
-        raise NotImplementedError
-
-    def is_expansion_slot(self, server):
-        """
-        Return True if its an extension slot
-        """
-        raise NotImplementedError
-
-    def get_blade_expansion_slot(self):
-        """
-        Expansion slot are always the compute bay number + 1
-        """
-        raise NotImplementedError
-
-    def own_expansion_slot(self):
-        """
-        Say if the device can host an extension card based
-        on the product name
-        """
-        pass

netbox_agent/vendors/hp.py

@@ -1,5 +1,6 @@
 import netbox_agent.dmidecode as dmidecode
 from netbox_agent.server import ServerBase
+from netbox_agent.inventory import Inventory
 
 
 class HPHost(ServerBase):
@@ -12,8 +13,8 @@ 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"))
+        blade |= self.product.startswith("ProLiant m") and \
+            self.product.endswith("Server Cartridge")
         return blade
 
     def _find_rack_locator(self):
@@ -67,35 +68,53 @@ class HPHost(ServerBase):
             return self.hp_rack_locator["Enclosure Serial"].strip()
         return self.get_service_tag()
 
+    def get_blade_expansion_slot(self):
+        """
+        Expansion slot are always the compute bay number + 1
+        """
+        if self.is_blade() and self.own_gpu_expansion_slot() or \
+                self.own_disk_expansion_slot() or True:
+            return 'Bay {}'.format(
+                str(int(self.hp_rack_locator['Server Bay'].strip()) + 1)
+            )
+        return None
+
     def get_expansion_product(self):
         """
         Get the extension slot that is on a pair slot number
         next to the compute slot that is on an odd slot number
         I only know on model of slot GPU extension card that.
         """
-        if self.own_expansion_slot():
+        if self.own_gpu_expansion_slot():
             return "ProLiant BL460c Graphics Expansion Blade"
-        return None
-
-    def is_expansion_slot(self, server):
-        """
-        Return True if its an extension slot, based on the name
-        """
-        return server.name.endswith(" expansion")
-
-    def get_blade_expansion_slot(self):
-        """
-        Expansion slot are always the compute bay number + 1
-        """
-        if self.is_blade() and self.own_expansion_slot():
-            return 'Bay {}'.format(
-                str(int(self.hp_rack_locator['Server Bay'].strip()) + 1)
-            )
+        elif self.own_disk_expansion_slot():
+            return "ProLiant BL460c Disk Expansion Blade"
         return None
 
     def own_expansion_slot(self):
         """
-        Say if the device can host an extension card based
+        Indicates if the device hosts an expension card
+        """
+        return self.own_gpu_expansion_slot() or self.own_disk_expansion_slot()
+
+    def own_gpu_expansion_slot(self):
+        """
+        Indicates if the device hosts a GPU expansion card based
         on the product name
         """
         return self.get_product_name().endswith('Graphics Exp')
+
+    def own_disk_expansion_slot(self):
+        """
+        Indicates if the device hosts a drive expansion card based
+        on raid card attributes.
+        """
+        # Uses already parsed inventory if available
+        # parses it otherwise
+        inventory = getattr(self, "inventory", None)
+        if inventory is None:
+            inventory = Inventory(self)
+        for raid_card in inventory.get_raid_cards():
+            if self.is_blade() and raid_card.is_external():
+                return True
+        return False

netbox_agent/vendors/supermicro.py

@@ -79,22 +79,3 @@ class SupermicroHost(ServerBase):
         I only know on model of slot GPU extension card that.
         """
         raise NotImplementedError
-
-    def is_expansion_slot(self, server):
-        """
-        Return True if its an extension slot, based on the name
-        """
-        raise NotImplementedError
-
-    def get_blade_expansion_slot(self):
-        """
-        Expansion slot are always the compute bay number + 1
-        """
-        raise NotImplementedError
-
-    def own_expansion_slot(self):
-        """
-        Say if the device can host an extension card based
-        on the product name
-        """
-        pass