Update for NetBox 4.3

Author: DanSheps

netbox_lifecycle/__init__.py

@@ -13,8 +13,7 @@ class NetBoxLifeCycle(PluginConfig):
     author = metadata.get('Author')
     author_email = metadata.get('Author-email')
     base_url = 'lifecycle'
-    min_version = '4.1.0'
-    max_version = '4.2.99'
+    min_version = '4.3.0'
     required_settings = []
     default_settings = {}
     queues = []

netbox_lifecycle/graphql/filters.py

@@ -1,7 +1,11 @@
+from typing import Annotated, Union
+
+import strawberry
 import strawberry_django
+
+from core.graphql.filter_mixins import BaseObjectTypeFilterMixin
 from netbox_lifecycle import filtersets, models
 
-from netbox.graphql.filter_mixins import autotype_decorator, BaseFilterMixin
 
 __all__ = (
     'VendorFilter',
@@ -15,43 +19,58 @@
 
 
 @strawberry_django.filter(models.Vendor, lookups=True)
-@autotype_decorator(filtersets.VendorFilterSet)
-class VendorFilter(BaseFilterMixin):
+class VendorFilter(BaseObjectTypeFilterMixin):
     pass
 
 
 @strawberry_django.filter(models.SupportSKU, lookups=True)
-@autotype_decorator(filtersets.SupportSKUFilterSet)
-class SupportSKUFilter(BaseFilterMixin):
-    pass
+class SupportSKUFilter(BaseObjectTypeFilterMixin):
+    manufacturer: Annotated['ManufacturerFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
+    manufacturer_id: strawberry.ID | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter(models.SupportContract, lookups=True)
-@autotype_decorator(filtersets.SupportContractFilterSet)
-class SupportContractFilter(BaseFilterMixin):
-    pass
+class SupportContractFilter(BaseObjectTypeFilterMixin):
+    vendor: Annotated['ManufacturerFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
+    vendor_id: strawberry.ID | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter(models.SupportContractAssignment, lookups=True)
-@autotype_decorator(filtersets.SupportContractAssignmentFilterSet)
-class SupportContractAssignmentFilter(BaseFilterMixin):
-    pass
+class SupportContractAssignmentFilter(BaseObjectTypeFilterMixin):
+    contract: Annotated['SupportContractFilter', strawberry.lazy('netbox_lifecycle.graphql.filters')] | None = strawberry_django.filter_field()
+    contract_id: strawberry.ID | None = strawberry_django.filter_field()
+    sku: Annotated['SupportSKUFilter', strawberry.lazy('netbox_lifecycle.graphql.filters')] | None = strawberry_django.filter_field()
+    sku_id: strawberry.ID | None = strawberry_django.filter_field()
+    device: Annotated['DeviceFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
+    device_id: strawberry.ID | None = strawberry_django.filter_field()
+    license: Annotated['LicenseFilter', strawberry.lazy('netbox_lifecycle.graphql.filters')] | None = strawberry_django.filter_field()
+    license_id: strawberry.ID | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter(models.License, lookups=True)
-@autotype_decorator(filtersets.LicenseFilterSet)
-class LicenseFilter(BaseFilterMixin):
-    pass
-    pass
+class LicenseFilter(BaseObjectTypeFilterMixin):
+    manufacturer: Annotated['ManufacturerFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
+    manufacturer_id: strawberry.ID | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter(models.LicenseAssignment, lookups=True)
-@autotype_decorator(filtersets.LicenseAssignmentFilterSet)
-class LicenseAssignmentFilter(BaseFilterMixin):
-    pass
+class LicenseAssignmentFilter(BaseObjectTypeFilterMixin):
+    vendor: Annotated['VendorFilter', strawberry.lazy('netbox_lifecycle.graphql.filters')] | None = strawberry_django.filter_field()
+    vendor_id: strawberry.ID | None = strawberry_django.filter_field()
+    license: Annotated['LicenseFilter', strawberry.lazy('netbox_lifecycle.graphql.filters')] | None = strawberry_django.filter_field()
+    license_id: strawberry.ID | None = strawberry_django.filter_field()
+    device: Annotated['DeviceFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
+    device_id: strawberry.ID | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter(models.HardwareLifecycle, lookups=True)
-@autotype_decorator(filtersets.HardwareLifecycleFilterSet)
-class HardwareLifecycleFilter(BaseFilterMixin):
-    pass
+class HardwareLifecycleFilter(BaseObjectTypeFilterMixin):
+    device_type: Annotated['DeviceTypeFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
+    device_type_id: strawberry.ID | None = strawberry_django.filter_field()
+    module_type: Annotated['ModuleTypeFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
+    module_type_id: strawberry.ID | None = strawberry_django.filter_field()
+
+    assigned_object_type: Annotated['ContentTypeFilter', strawberry.lazy('core.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    assigned_object_id: strawberry.ID | None = strawberry_django.filter_field()

netbox_lifecycle/migrations/0001_initial.py

@@ -1,6 +1,7 @@
 # Generated by Django 4.1.7 on 2023-05-10 14:23
 
 import dcim.models.devices
+import dcim.models.modules
 from django.db import migrations, models
 import django.db.models.deletion
 import taggit.managers
@@ -67,7 +68,7 @@ class Migration(migrations.Migration):
                 ('end_of_support', models.DateField()),
                 ('notice', models.CharField(blank=True, max_length=500, null=True)),
                 ('documentation', models.CharField(blank=True, max_length=500, null=True)),
-                ('assigned_object_type', models.ForeignKey(blank=True, limit_choices_to=(dcim.models.devices.DeviceType, dcim.models.devices.ModuleType), null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype')),
+                ('assigned_object_type', models.ForeignKey(blank=True, limit_choices_to=(dcim.models.devices.DeviceType, dcim.models.modules.ModuleType), null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype')),
                 ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')),
             ],
             options={

netbox_lifecycle/template_content.py

@@ -6,23 +6,35 @@
 from .models import hardware, contract
 
 
+def log_info(message: str):
+    from logging import getLogger
+    logger = getLogger('netbox_lifecycle.template_content')
+    logger.info(f'{message}')
+
 class DeviceHardwareInfoExtension(PluginTemplateExtension):
     def right_page(self):
         object = self.context.get('object')
         support_contract = contract.SupportContractAssignment.objects.filter(device_id=self.context['object'].id).first()
+        log_info(f'Kind is: {self.kind}')
         match self.kind:
             case "device":
                 content_type = ContentType.objects.get(app_label="dcim", model="devicetype")
-                lifecycle_info = hardware.HardwareLifecycle.objects.filter(assigned_object_id=self.context['object'].device_type_id,
-                                                                           assigned_object_type_id=content_type.id).first()
+                lifecycle_info = hardware.HardwareLifecycle.objects.filter(
+                    assigned_object_id=self.context['object'].device_type_id,
+                    assigned_object_type_id=content_type.id
+                ).first()
             case "module":
                 content_type = ContentType.objects.get(app_label="dcim", model="moduletype")
-                lifecycle_info = hardware.HardwareLifecycle.objects.filter(assigned_object_id=self.context['object'].module_type_id,
-                                                                           assigned_object_type_id=content_type.id).first()
+                lifecycle_info = hardware.HardwareLifecycle.objects.filter(
+                    assigned_object_id=self.context['object'].module_type_id,
+                    assigned_object_type_id=content_type.id
+                ).first()
             case "devicetype" | "moduletype":
                 content_type = ContentType.objects.get(app_label="dcim", model=self.kind)
-                lifecycle_info = hardware.HardwareLifecycle.objects.filter(assigned_object_id=self.context['object'].id,
-                                                                           assigned_object_type_id=content_type.id).first()
+                lifecycle_info = hardware.HardwareLifecycle.objects.filter(
+                    assigned_object_id=self.context['object'].id,
+                    assigned_object_type_id=content_type.id
+                ).first()
         context = {'support_contract': support_contract, 'lifecycle_info': lifecycle_info}
         return self.render('netbox_lifecycle/inc/support_contract_info.html', extra_context=context)
 
@@ -49,22 +61,22 @@ def right_page(self):
 
 
 class DeviceHardwareLifecycleInfo(DeviceHardwareInfoExtension):
-    model = 'dcim.device'
+    models = ['dcim.device', ]
     kind = 'device'
 
 
 class ModuleHardwareLifecycleInfo(TypeInfoExtension):
-    model = 'dcim.module'
+    models = ['dcim.module', ]
     kind = 'module'
 
 
 class DeviceTypeHardwareLifecycleInfo(TypeInfoExtension):
-    model = 'dcim.devicetype'
+    models = ['dcim.devicetype', ]
     kind = 'devicetype'
 
 
 class ModuleTypeHardwareLifecycleInfo(TypeInfoExtension):
-    model = 'dcim.moduletype'
+    models = ['dcim.moduletype', ]
     kind = 'moduletype'