Merge branch 'netbox_4_3' into 'master'

NetBox 4.3 compatibility

See merge request 701/netbox/cesnet_service_path_plugin!24

Author: Kani999

cesnet_service_path_plugin/__init__.py

@@ -1,7 +1,8 @@
 """Top-level package for Cesnet ServicePath Plugin."""
 
 from netbox.plugins import PluginConfig
-from .version import __version__, __author__, __email__, __description__, __name__
+
+from .version import __description__, __name__, __version__
 
 
 class CesnetServicePathPluginConfig(PluginConfig):

cesnet_service_path_plugin/graphql/filters.py

@@ -1,32 +1,39 @@
 import strawberry_django
-from netbox.graphql.filter_mixins import autotype_decorator, BaseFilterMixin
+from netbox.graphql.filter_mixins import BaseFilterMixin
 
-from cesnet_service_path_plugin.models import Segment, ServicePath, ServicePathSegmentMapping, SegmentCircuitMapping
 from cesnet_service_path_plugin.filtersets import (
+    SegmentCircuitMappingFilterSet,
     SegmentFilterSet,
     ServicePathFilterSet,
-    SegmentCircuitMappingFilterSet,
     ServicePathSegmentMappingFilterSet,
 )
+from cesnet_service_path_plugin.models import (
+    Segment,
+    SegmentCircuitMapping,
+    ServicePath,
+    ServicePathSegmentMapping,
+)
 
 
 @strawberry_django.filter(Segment, lookups=True)
-@autotype_decorator(SegmentFilterSet)
 class SegmentFilter(BaseFilterMixin):
-    pass
+    class Meta:
+        filterset_class = SegmentFilterSet
 
 
 @strawberry_django.filter(ServicePath, lookups=True)
-@autotype_decorator(ServicePathFilterSet)
 class ServicePathFilter(BaseFilterMixin):
-    pass
+    class Meta:
+        filterset_class = ServicePathFilterSet
 
 
 @strawberry_django.filter(SegmentCircuitMapping, lookups=True)
 class SegmentCircuitMappingFilter(SegmentCircuitMappingFilterSet):
-    pass
+    class Meta:
+        filterset_class = SegmentCircuitMappingFilterSet
 
 
 @strawberry_django.filter(ServicePathSegmentMapping, lookups=True)
 class ServicePathSegmentMappingFilter(ServicePathSegmentMappingFilterSet):
-    pass
+    class Meta:
+        filterset_class = ServicePathSegmentMappingFilterSet

cesnet_service_path_plugin/template_content.py

@@ -14,7 +14,7 @@
 
 
 class CircuitKomoraSegmentExtension(PluginTemplateExtension):
-    model = "circuits.circuit"
+    models = ["circuits.circuit"]
 
     def full_width_page(self):
         return self.render(
@@ -23,7 +23,7 @@ def full_width_page(self):
 
 
 class ProviderSegmentExtension(PluginTemplateExtension):
-    model = "circuits.provider"
+    models = ["circuits.provider"]
 
     def full_width_page(self):
         return self.render(
@@ -32,7 +32,7 @@ def full_width_page(self):
 
 
 class SiteSegmentExtension(PluginTemplateExtension):
-    model = "dcim.site"
+    models = ["dcim.site"]
 
     def full_width_page(self):
         return self.render(
@@ -41,7 +41,7 @@ def full_width_page(self):
 
 
 class LocationSegmentExtension(PluginTemplateExtension):
-    model = "dcim.location"
+    models = ["dcim.location"]
 
     def full_width_page(self):
         return self.render(
@@ -50,7 +50,7 @@ def full_width_page(self):
 
 
 class TenantProviderExtension(PluginTemplateExtension):
-    model = "tenancy.tenant"
+    models = ["tenancy.tenant"]
 
     def left_page(self):
         provider = Provider.objects.filter(

cesnet_service_path_plugin/urls.py

@@ -52,6 +52,12 @@
         ServicePathDeleteView.as_view(),
         name="servicepath_delete",
     ),
+    path(
+        "service_paths/",
+        include(
+            get_model_urls("cesnet_service_path_plugin", "servicepath", detail=False)
+        ),
+    ),
     path(
         "service_paths/<int:pk>/",
         include(get_model_urls("cesnet_service_path_plugin", "servicepath")),
@@ -82,6 +88,14 @@
         ServicePathSegmentMappingDeleteView.as_view(),
         name="servicepathsegmentmapping_delete",
     ),
+    path(
+        "service-path-segment-mappings/",
+        include(
+            get_model_urls(
+                "cesnet_service_path_plugin", "servicepathsegmentmapping", detail=False
+            )
+        ),
+    ),
     path(
         "service-path-segment-mappings/<int:pk>/",
         include(
@@ -114,6 +128,14 @@
         SegmentCircuitMappingDeleteView.as_view(),
         name="segmentcircuitmapping_delete",
     ),
+    path(
+        "segment-circuit-mappings/",
+        include(
+            get_model_urls(
+                "cesnet_service_path_plugin", "segmentcircuitmapping", detail=False
+            )
+        ),
+    ),
     path(
         "segment-circuit-mappings/<int:pk>/",
         include(get_model_urls("cesnet_service_path_plugin", "segmentcircuitmapping")),

cesnet_service_path_plugin/version.py

@@ -1,5 +1,5 @@
 __author__ = "Jan Krupa"
 __email__ = "[email protected]"
-__version__ = "4.0.0"
+__version__ = "4.3.0"
 __description__ = "Adds ability to create service path in the CESNET network."
 __name__ = "cesnet_service_path_plugin"