diff --git a/netbox/extras/tests/test_customfields.py b/netbox/extras/tests/test_customfields.py index 3fd0dc83e..e7ee778a1 100644 --- a/netbox/extras/tests/test_customfields.py +++ b/netbox/extras/tests/test_customfields.py @@ -12,6 +12,7 @@ from dcim.models import Manufacturer, Rack, Site from extras.choices import * from extras.models import CustomField from ipam.models import VLAN +from utilities.choices import CSVDelimiterChoices, ImportFormatChoices from utilities.testing import APITestCase, TestCase from virtualization.models import VirtualMachine @@ -1057,7 +1058,7 @@ class CustomFieldImportTest(TestCase): ) csv_data = '\n'.join(','.join(row) for row in data) - response = self.client.post(reverse('dcim:site_import'), {'data': csv_data, 'format': 'csv'}) + response = self.client.post(reverse('dcim:site_import'), {'data': csv_data, 'format': ImportFormatChoices.CSV, 'csv_delimiter': CSVDelimiterChoices.AUTO,}) self.assertEqual(response.status_code, 302) self.assertEqual(Site.objects.count(), 3) diff --git a/netbox/utilities/forms/bulk_import.py b/netbox/utilities/forms/bulk_import.py index 2f49e7c12..9b0e4f18a 100644 --- a/netbox/utilities/forms/bulk_import.py +++ b/netbox/utilities/forms/bulk_import.py @@ -93,7 +93,7 @@ class BulkImportForm(BootstrapMixin, SyncedDataMixin, forms.Form): 'format': _('Unable to detect data format. Please specify.') }) - def _clean_csv(self, data, delimiter=None): + def _clean_csv(self, data, delimiter=CSVDelimiterChoices.AUTO): """ Clean CSV-formatted data. The first row will be treated as column headers. """ diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py index dc17548a2..38560f886 100644 --- a/netbox/utilities/testing/views.py +++ b/netbox/utilities/testing/views.py @@ -10,7 +10,7 @@ from extras.choices import ObjectChangeActionChoices from extras.models import ObjectChange from netbox.models.features import ChangeLoggingMixin from users.models import ObjectPermission -from utilities.choices import ImportFormatChoices +from utilities.choices import CSVDelimiterChoices, ImportFormatChoices from .base import ModelTestCase from .utils import disable_warnings, post_data @@ -559,7 +559,8 @@ class ViewTestCases: def test_bulk_import_objects_without_permission(self): data = { 'data': self._get_csv_data(), - 'format': 'csv', + 'format': ImportFormatChoices.CSV, + 'csv_delimiter': CSVDelimiterChoices.AUTO, } # Test GET without permission @@ -576,7 +577,8 @@ class ViewTestCases: initial_count = self._get_queryset().count() data = { 'data': self._get_csv_data(), - 'format': 'csv', + 'format': ImportFormatChoices.CSV, + 'csv_delimiter': CSVDelimiterChoices.AUTO, } # Assign model-level permission @@ -605,6 +607,7 @@ class ViewTestCases: data = { 'format': ImportFormatChoices.CSV, 'data': csv_data, + 'csv_delimiter': CSVDelimiterChoices.AUTO, } # Assign model-level permission @@ -637,7 +640,8 @@ class ViewTestCases: initial_count = self._get_queryset().count() data = { 'data': self._get_csv_data(), - 'format': 'csv', + 'format': ImportFormatChoices.CSV, + 'csv_delimiter': CSVDelimiterChoices.AUTO, } # Assign constrained permission