Update for 4.1 (#19)

netbox_lifecycle/__init__.py

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

netbox_lifecycle/api/serializers/contract.py → netbox_lifecycle/api/_serializers/contract.py

@@ -1,32 +1,22 @@
 from rest_framework import serializers
 
-from dcim.api.nested_serializers import NestedManufacturerSerializer, NestedDeviceSerializer
+from dcim.api.serializers_.devices import DeviceSerializer
+from dcim.api.serializers_.manufacturers import ManufacturerSerializer
 from netbox.api.serializers import NetBoxModelSerializer
-from netbox_lifecycle.api.nested_serializers import NestedVendorSerializer, NestedSupportContractSerializer, \
-    NestedLicenseAssignmentSerializer
+from netbox_lifecycle.api._serializers.license import LicenseAssignmentSerializer
+from netbox_lifecycle.api._serializers.vendor import VendorSerializer
 from netbox_lifecycle.models import Vendor, SupportContract, SupportContractAssignment, SupportSKU
 
 __all__ = (
-    'VendorSerializer',
     'SupportSKUSerializer',
     'SupportContractSerializer',
     'SupportContractAssignmentSerializer',
 )
 
-from utilities.api import get_serializer_for_model
-
-
-class VendorSerializer(NetBoxModelSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='plugins-api:netbox_lifecycle-api:hardwarelifecycle-detail')
-
-    class Meta:
-        model = Vendor
-        fields = ('url', 'id', 'display', 'name')
-
 
 class SupportSKUSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='plugins-api:netbox_lifecycle-api:hardwarelifecycle-detail')
-    manufacturer = NestedManufacturerSerializer()
+    manufacturer = ManufacturerSerializer(nested=True)
 
     class Meta:
         model = SupportSKU
@@ -35,7 +25,7 @@ class Meta:
 
 class SupportContractSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='plugins-api:netbox_lifecycle-api:hardwarelifecycle-detail')
-    vendor = NestedVendorSerializer()
+    vendor = VendorSerializer(nested=True)
     start = serializers.DateField()
     renewal = serializers.DateField()
     end = serializers.DateField()
@@ -47,10 +37,10 @@ class Meta:
 
 class SupportContractAssignmentSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='plugins-api:netbox_lifecycle-api:licenseassignment-detail')
-    contract = NestedSupportContractSerializer()
+    contract = SupportContractSerializer(nested=True)
 
-    device = NestedDeviceSerializer()
-    license = NestedLicenseAssignmentSerializer()
+    device = DeviceSerializer(nested=True)
+    license = LicenseAssignmentSerializer(nested=True)
 
     class Meta:
         model = SupportContractAssignment

netbox_lifecycle/api/serializers/hardware.py → netbox_lifecycle/api/_serializers/hardware.py

@@ -4,7 +4,6 @@
 
 from netbox.api.fields import ContentTypeField
 from netbox.api.serializers import NetBoxModelSerializer
-from netbox.constants import NESTED_SERIALIZER_PREFIX
 from netbox_lifecycle.models import HardwareLifecycle
 from utilities.api import get_serializer_for_model
 
@@ -36,6 +35,6 @@ class Meta:
 
     @extend_schema_field(serializers.JSONField(allow_null=True))
     def get_assigned_object(self, instance):
-        serializer = get_serializer_for_model(instance.assigned_object, prefix=NESTED_SERIALIZER_PREFIX)
+        serializer = get_serializer_for_model(instance.assigned_object)
         context = {'request': self.context['request']}
-        return serializer(instance.assigned_object, context=context).data
+        return serializer(instance.assigned_object, context=context, nested=True).data

netbox_lifecycle/api/serializers/license.py → netbox_lifecycle/api/_serializers/license.py

@@ -1,9 +1,9 @@
 from rest_framework import serializers
 
-from dcim.api.nested_serializers import NestedManufacturerSerializer, NestedDeviceSerializer
+from dcim.api.serializers_.devices import DeviceSerializer
+from dcim.api.serializers_.manufacturers import ManufacturerSerializer
 from netbox.api.serializers import NetBoxModelSerializer
-from netbox_lifecycle.api.nested_serializers import NestedVendorSerializer
-from netbox_lifecycle.api.nested_serializers.license import NestedLicenseSerializer
+from netbox_lifecycle.api._serializers.vendor import VendorSerializer
 from netbox_lifecycle.models import License, LicenseAssignment
 
 __all__ = (
@@ -14,7 +14,7 @@
 
 class LicenseSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='plugins-api:netbox_lifecycle-api:license-detail')
-    manufacturer = NestedManufacturerSerializer()
+    manufacturer = ManufacturerSerializer(nested=True)
 
     class Meta:
         model = License
@@ -23,9 +23,9 @@ class Meta:
 
 class LicenseAssignmentSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='plugins-api:netbox_lifecycle-api:licenseassignment-detail')
-    license = NestedLicenseSerializer()
-    vendor = NestedVendorSerializer()
-    device = NestedDeviceSerializer()
+    license = LicenseSerializer(nested=True)
+    vendor = VendorSerializer(nested=True)
+    device = DeviceSerializer(nested=True)
 
     class Meta:
         model = LicenseAssignment

netbox_lifecycle/api/_serializers/vendor.py

@@ -0,0 +1,16 @@
+from rest_framework import serializers
+
+from netbox.api.serializers import NetBoxModelSerializer
+from netbox_lifecycle.models import Vendor
+
+__all__ = (
+    'VendorSerializer',
+)
+
+
+class VendorSerializer(NetBoxModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='plugins-api:netbox_lifecycle-api:hardwarelifecycle-detail')
+
+    class Meta:
+        model = Vendor
+        fields = ('url', 'id', 'display', 'name')

netbox_lifecycle/api/serializers.py

@@ -0,0 +1,14 @@
+from _serializers.contract import *
+from _serializers.hardware import *
+from _serializers.license import *
+from _serializers.vendor import *
+
+__all__ = (
+    'VendorSerializer',
+    'SupportSKUSerializer',
+    'SupportContractSerializer',
+    'SupportContractAssignmentSerializer',
+    'HardwareLifecycleSerializer',
+    'LicenseSerializer',
+    'LicenseAssignmentSerializer',
+)

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='netbox-lifecycle',
-    version='1.0.4',
+    version='1.1.0',
     description='NetBox Lifecycle',
     long_description='NetBox Support Contract and EOL/EOS management',
     url='https://github.com/dansheps/netbox-lifecycle/',