Merge pull request #28 from Solvik/feature/blade_slot

Change blade slot behavior

README.md

@@ -42,7 +42,7 @@ Tested on:
 
 ### Blades
 
-* PowerEdge M1000e
+* PowerEdge M1000e (your `DeviceType` should have slots named `Slot 01` and so on)
 * PowerEdge M640
 * PowerEdge M630
 * PowerEdge M620
@@ -56,7 +56,7 @@ Tested on:
 
 ### Blades
 
-* HP BladeSystem c7000 Enclosure G2
+* HP BladeSystem c7000 Enclosure G2 / G3 (your `DeviceType` should have slots named `Bay 1` and so on)
 * HP ProLiant BL460c Gen8
 * HP ProLiant BL460c Gen9
 

netbox_agent/dell/dell.py

@@ -12,9 +12,14 @@ class DellHost(ServerBase):
         `        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 self.dmi.get_by_type('Baseboard')[0].get('Location In Chassis')
         return None
 
+    def get_chassis_name(self):
+        if not self.is_blade():
+            return None
+        return 'Chassis {}'.format(self.get_service_tag())
+
     def get_chassis(self):
         if self.is_blade():
             return self.dmi.get_by_type('Chassis')[0]['Version']

netbox_agent/hp/hp.py

@@ -24,7 +24,9 @@ class HPHost(ServerBase):
 
     def get_blade_slot(self):
         if self.is_blade():
-            return int(self.hp_rack_locator['Server Bay'].strip())
+            return 'Bay {}'.format(
+                int(self.hp_rack_locator['Server Bay'].strip())
+                )
         return None
 
     def get_chassis(self):
@@ -32,6 +34,11 @@ class HPHost(ServerBase):
             return self.hp_rack_locator['Enclosure Model'].strip()
         return self.get_product_name()
 
+    def get_chassis_name(self):
+        if not self.is_blade():
+            return None
+        return self.hp_rack_locator['Enclosure Name'].strip()
+
     def get_chassis_service_tag(self):
         if self.is_blade():
             return self.hp_rack_locator['Enclosure Serial'].strip()

netbox_agent/server.py

@@ -64,6 +64,9 @@ class ServerBase():
     def get_chassis(self):
         raise NotImplementedError
 
+    def get_chassis_name(self):
+        raise NotImplementedError
+
     def get_chassis_service_tag(self):
         raise NotImplementedError
 
@@ -91,7 +94,7 @@ class ServerBase():
         logging.info('Creating chassis blade (serial: {serial})'.format(
             serial=serial))
         new_chassis = nb.dcim.devices.create(
-            name=''.format(),
+            name=self.get_chassis_name(),
             device_type=device_type.id,
             serial=serial,
             device_role=device_role.id,
@@ -122,6 +125,27 @@ class ServerBase():
         )
         return new_blade
 
+    def _netbox_set_blade_slot(self, chassis, server):
+        slot = self.get_blade_slot()
+        # Find the slot and update it with our blade
+        device_bays = nb.dcim.device_bays.filter(
+            device_id=chassis.id,
+            name=slot,
+        )
+        if len(device_bays) > 0:
+            logging.info(
+                'Setting device ({serial}) new slot on {slot} '
+                '(Chassis {chassis_serial})..'.format(
+                    serial=server.serial, slot=slot, chassis_serial=chassis.serial
+                ))
+            device_bay = device_bays[0]
+            device_bay.installed_device = server
+            device_bay.save()
+        else:
+            logging.error('Could not find slot {slot} for chassis'.format(
+                slot=slot
+            ))
+
     def _netbox_create_server(self, datacenter):
         device_role = nb.dcim.device_roles.get(
             name='Server',
@@ -167,18 +191,8 @@ class ServerBase():
 
                 blade = self._netbox_create_blade(chassis, datacenter)
 
-            # Find the slot and update it with our blade
+            # Set slot for blade
-            slot = self.get_blade_slot()
+            self._netbox_set_blade_slot(chassis, blade)
-            device_bays = nb.dcim.device_bays.filter(
-                device_id=chassis.id,
-                name='Blade {}'.format(slot),
-                )
-            if len(device_bays) > 0:
-                logging.info('Updating blade ({serial}) slot on: Blade {slot}'.format(
-                    serial=serial, slot=slot))
-                device_bay = device_bays[0]
-                device_bay.installed_device = blade
-                device_bay.save()
         else:
             server = nb.dcim.devices.get(serial=self.get_service_tag())
             if not server:
@@ -187,6 +201,32 @@ class ServerBase():
         self.network.create_netbox_network_cards()
         logging.debug('Server created!')
 
+    def _netbox_update_chassis_for_blade(self, server, datacenter):
+        chassis = server.parent_device.device_bay.device
+        device_bay = nb.dcim.device_bays.get(
+            server.parent_device.device_bay.id
+        )
+        netbox_chassis_serial = server.parent_device.device_bay.device.serial
+        move_device_bay = False
+
+        # check chassis serial with dmidecode
+        if netbox_chassis_serial != self.get_chassis_service_tag():
+            move_device_bay = True
+            # try to find the new netbox chassis
+            chassis = nb.dcim.devices.get(
+                serial=self.get_chassis_service_tag()
+            )
+            if not chassis:
+                chassis = self._netbox_create_blade_chassis(datacenter)
+        if move_device_bay or device_bay.name != self.get_blade_slot():
+            logging.info('Device ({serial}) seems to have moved, reseting old slot..'.format(
+                serial=server.serial))
+            device_bay.installed_device = None
+            device_bay.save()
+
+            # Set slot for blade
+            self._netbox_set_blade_slot(chassis, server)
+
     def netbox_update(self):
         """
         Netbox method to update info about our server/blade
@@ -204,47 +244,19 @@ class ServerBase():
                             'it before updating it'.format(self.get_service_tag()))
         update = False
         if self.is_blade():
-            # get current chassis device bay
+            datacenter = self.get_netbox_datacenter()
-            device_bay = nb.dcim.device_bays.get(
+            # if it's already linked to a chassis
-                server.parent_device.device_bay.id
+            if server.parent_device:
-                )
+                self._netbox_update_chassis_for_blade(server, datacenter)
-            netbox_chassis_serial = server.parent_device.device_bay.device.serial
+            else:
-            chassis = server.parent_device.device_bay.device
+                logging.info('Blade is not in a chassis, fixing...')
-            move_device_bay = False
-
-            # check chassis serial with dmidecode
-            if netbox_chassis_serial != self.get_chassis_service_tag():
-                move_device_bay = True
-                # try to find the new netbox chassis
                 chassis = nb.dcim.devices.get(
                     serial=self.get_chassis_service_tag()
                 )
-                # create the new chassis if it doesn't exist
                 if not chassis:
-                    datacenter = self.get_netbox_datacenter()
                     chassis = self._netbox_create_blade_chassis(datacenter)
-
+                # Set slot for blade
-            if move_device_bay or device_bay.name != 'Blade {}'.format(self.get_blade_slot()):
+                self._netbox_set_blade_slot(chassis, server)
-                logging.info('Device ({serial}) seems to have moved, reseting old slot..'.format(
-                    serial=server.serial))
-                device_bay.installed_device = None
-                device_bay.save()
-
-                slot = self.get_blade_slot()
-                # Find the slot and update it with our blade
-                device_bays = nb.dcim.device_bays.filter(
-                    device_id=chassis.id,
-                    name='Blade {}'.format(slot),
-                )
-                if len(device_bays) > 0:
-                    logging.info(
-                        'Setting device ({serial}) new slot on Blade {slot} '
-                        '(Chassis {chassis_serial})..'.format(
-                            serial=server.serial, slot=slot, chassis_serial=chassis.serial
-                        ))
-                    device_bay = device_bays[0]
-                    device_bay.installed_device = server
-                    device_bay.save()
 
         # for every other specs
         # check hostname