starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-04-23 01:08:45 +02:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

cleanup

Browse Source
This commit is contained in:
Arthur
2026-04-01 12:19:48 -07:00
parent 7f8dfa4427
commit 6a9ebdacca
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
netbox/extras/api/serializers_/scripts.py
View File

@@ -39,18 +39,20 @@ class ScriptModuleSerializer(ValidatedModelSerializer):
return data return data
def create(self, validated_data): def create(self, validated_data):
upload_file = validated_data.pop('file') file = validated_data.pop('file')
storage = storages.create_storage(storages.backends["scripts"]) storage = storages.create_storage(storages.backends["scripts"])
validated_data['file_path'] = storage.save(upload_file.name, upload_file) validated_data['file_path'] = storage.save(file.name, file)
created = False created = False
try: try:
instance = super().create(validated_data) instance = super().create(validated_data)
created = True created = True
return instance return instance
except IntegrityError: except IntegrityError as e:
raise serializers.ValidationError( if 'file_path' in str(e):
_("A script module with this file name already exists.") raise serializers.ValidationError(
) _("A script module with this file name already exists.")
)
raise
finally: finally:
if not created and (file_path := validated_data.get('file_path')): if not created and (file_path := validated_data.get('file_path')):
try: try:

2
netbox/extras/api/views.py
View File

@@ -1,6 +1,6 @@
from django.http import Http404 from django.http import Http404
from drf_spectacular.utils import extend_schema, extend_schema_view
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from drf_spectacular.utils import extend_schema, extend_schema_view
from django_rq.queues import get_connection from django_rq.queues import get_connection
from rest_framework import status from rest_framework import status
from rest_framework.decorators import action from rest_framework.decorators import action

21
netbox/extras/tests/test_api.py
View File

@@ -1433,6 +1433,27 @@ class ScriptModuleTest(APITestCase):
mock_storage.save.assert_called_once() mock_storage.save.assert_called_once()
self.assertTrue(ScriptModule.objects.filter(file_path='test_upload.py').exists()) self.assertTrue(ScriptModule.objects.filter(file_path='test_upload.py').exists())
def test_upload_script_module_duplicate_fails(self):
self.add_permissions('extras.add_scriptmodule', 'core.add_managedfile')
script_content = b"from extras.scripts import Script\nclass TestScript(Script):\n pass\n"
mock_storage = MagicMock()
mock_storage.save.return_value = 'test_upload.py'
with patch('extras.api.serializers_.scripts.storages') as mock_storages:
mock_storages.create_storage.return_value = mock_storage
mock_storages.backends = {'scripts': {}}
# First upload succeeds
upload_file = SimpleUploadedFile('test_upload.py', script_content, content_type='text/plain')
self.client.post(self.url, {'file': upload_file}, format='multipart', **self.header)
# Second upload with same name should fail
upload_file = SimpleUploadedFile('test_upload.py', script_content, content_type='text/plain')
response = self.client.post(
self.url,
{'file': upload_file},
format='multipart',
**self.header,
)
self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
def test_upload_script_module_without_file_fails(self): def test_upload_script_module_without_file_fails(self):
self.add_permissions('extras.add_scriptmodule', 'core.add_managedfile') self.add_permissions('extras.add_scriptmodule', 'core.add_managedfile')
response = self.client.post(self.url, {}, format='json', **self.header) response = self.client.post(self.url, {}, format='json', **self.header)