Merge branch 'externals' into 'main'

Fix for CodeQL report

See merge request 701/netbox/cesnet_service_path_plugin!35

Author: Kani999

README.md

@@ -5,7 +5,7 @@ A NetBox plugin for managing service paths and segments in network infrastructur
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)
 [![PyPI version](https://img.shields.io/pypi/v/cesnet-service-path-plugin.svg)](https://pypi.org/project/cesnet-service-path-plugin/)
 [![Python versions](https://img.shields.io/pypi/pyversions/cesnet-service-path-plugin.svg)](https://pypi.org/project/cesnet-service-path-plugin/)
-[![NetBox compatibility](https://img.shields.io/badge/NetBox-4.2%20|%204.3%20|%204.4-blue.svg)](https://github.com/netbox-community/netbox)
+[![NetBox compatibility](https://img.shields.io/badge/NetBox-4.4-blue.svg)](https://github.com/netbox-community/netbox)
 
 ## 📑 Table of Contents
 

cesnet_service_path_plugin/api/serializers/segment.py

@@ -1,4 +1,5 @@
 import json
+import logging
 from circuits.api.serializers import CircuitSerializer, ProviderSerializer
 from dcim.api.serializers import (
     LocationSerializer,
@@ -14,6 +15,9 @@
 from django.core.exceptions import ValidationError as DjangoValidationError
 
 
+logger = logging.getLogger(__name__)
+
+
 class SegmentSerializer(NetBoxModelSerializer):
     """Default serializer Segment - now with file upload support"""
 
@@ -100,9 +104,11 @@ def update(self, instance, validated_data):
                 instance.save()
 
             except DjangoValidationError as e:
-                raise serializers.ValidationError(f"Path file error: {str(e)}")
+                logger.warning(f"Validation Path file error: {str(e)}")
+                raise serializers.ValidationError(f"Error processing file '{path_file.name}'")
             except Exception as e:
-                raise serializers.ValidationError(f"Error processing file '{path_file.name}': {str(e)}")
+                logger.error(f"Error processing file '{path_file.name}': {str(e)}")
+                raise serializers.ValidationError(f"Error processing file '{path_file.name}'")
 
         return instance
 
@@ -129,11 +135,13 @@ def create(self, validated_data):
             except DjangoValidationError as e:
                 # Clean up created instance if path processing fails
                 instance.delete()
-                raise serializers.ValidationError(f"Path file error: {str(e)}")
+                logger.warning(f"Validation Path file error: {str(e)}")
+                raise serializers.ValidationError(f"Error processing file '{path_file.name}'")
             except Exception as e:
                 # Clean up created instance if path processing fails
                 instance.delete()
-                raise serializers.ValidationError(f"Error processing file '{path_file.name}': {str(e)}")
+                logger.error(f"Error processing file '{path_file.name}': {str(e)}")
+                raise serializers.ValidationError(f"Error processing file '{path_file.name}'")
 
         return instance
 

netbox-plugin.yaml

@@ -0,0 +1,33 @@
+version: 0.1
+package_name: cesnet-service-path-plugin
+compatibility:
+  - release: 5.1.2
+    netbox_min: 4.4.0
+    netbox_max: 4.4.99
+  - release: 5.1.1
+    netbox_min: 4.4.0
+    netbox_max: 4.4.99
+  - release: 5.1.0
+    netbox_min: 4.4.0
+    netbox_max: 4.4.99
+  - release: 5.0.3
+    netbox_min: 4.3.0
+    netbox_max: 4.3.99
+  - release: 5.0.2
+    netbox_min: 4.3.0
+    netbox_max: 4.3.99
+  - release: 5.0.1
+    netbox_min: 4.3.0
+    netbox_max: 4.3.99
+  - release: 5.0.0
+    netbox_min: 4.3.0
+    netbox_max: 4.3.99
+  - release: 4.0.1
+    netbox_min: 4.2.0
+    netbox_max: 4.2.99
+  - release: 4.0.0
+    netbox_min: 4.2.0
+    netbox_max: 4.2.99
+  - release: 0.1.0
+    netbox_min: 3.7.0
+    netbox_max: 3.7.99

pyproject.toml

@@ -4,15 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cesnet_service_path_plugin"
-version = "5.1.2"
+version = "5.1.3"
 description = "Adds ability to create, edit and view service paths in the CESNET network."
 authors = [
     {name = "Jan Krupa", email = "[email protected]"},
     {name = "Jiri Vrany", email = "[email protected]"}
 ]
 license = {text = "Apache-2.0"}
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 dependencies = [
     "geopandas",
     "fiona",
@@ -21,11 +21,10 @@ dependencies = [
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
+    "Framework :: Django",
+    "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -38,10 +37,10 @@ Issues = "https://github.com/CESNET/cesnet_service_path_plugin/issues"
 
 [project.optional-dependencies]
 dev = [
-    "black==24.3.0",
+    "black",
     "autopep8",
-    "pip==24.0",
-    "check-manifest==0.49",
+    "pip",
+    "check-manifest",
 ]
 
 [tool.setuptools.packages.find]