diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index d5ded90ea..1591be6f2 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -33,7 +33,7 @@
{% trans "Serial Number" %} |
- {{ object.serial_number|placeholder }} |
+ {{ object.serial|placeholder }} |
{% trans "Tenant" %} |
diff --git a/netbox/virtualization/api/serializers_/virtualmachines.py b/netbox/virtualization/api/serializers_/virtualmachines.py
index 737d2519d..d9e4f9c6f 100644
--- a/netbox/virtualization/api/serializers_/virtualmachines.py
+++ b/netbox/virtualization/api/serializers_/virtualmachines.py
@@ -49,7 +49,7 @@ class VirtualMachineSerializer(NetBoxModelSerializer):
class Meta:
model = VirtualMachine
fields = [
- 'id', 'url', 'display', 'name', 'status', 'site', 'cluster', 'device', 'serial_number', 'role', 'tenant',
+ 'id', 'url', 'display', 'name', 'status', 'site', 'cluster', 'device', 'serial', 'role', 'tenant',
'platform', 'primary_ip', 'primary_ip4', 'primary_ip6', 'vcpus', 'memory', 'disk', 'description',
'comments', 'config_template', 'local_context_data', 'tags', 'custom_fields', 'created', 'last_updated',
'interface_count', 'virtual_disk_count',
diff --git a/netbox/virtualization/filtersets.py b/netbox/virtualization/filtersets.py
index 944ae2ad2..ec0831f9f 100644
--- a/netbox/virtualization/filtersets.py
+++ b/netbox/virtualization/filtersets.py
@@ -242,7 +242,7 @@ class VirtualMachineFilterSet(
model = VirtualMachine
fields = (
'id', 'cluster', 'vcpus', 'memory', 'disk', 'description', 'interface_count', 'virtual_disk_count',
- 'serial_number'
+ 'serial'
)
def search(self, queryset, name, value):
@@ -254,7 +254,7 @@ class VirtualMachineFilterSet(
Q(comments__icontains=value) |
Q(primary_ip4__address__startswith=value) |
Q(primary_ip6__address__startswith=value) |
- Q(serial_number__icontains=value)
+ Q(serial__icontains=value)
)
def _has_primary_ip(self, queryset, name, value):
diff --git a/netbox/virtualization/forms/bulk_import.py b/netbox/virtualization/forms/bulk_import.py
index 993da1fd5..17efc567a 100644
--- a/netbox/virtualization/forms/bulk_import.py
+++ b/netbox/virtualization/forms/bulk_import.py
@@ -137,7 +137,7 @@ class VirtualMachineImportForm(NetBoxModelImportForm):
model = VirtualMachine
fields = (
'name', 'status', 'role', 'site', 'cluster', 'device', 'tenant', 'platform', 'vcpus', 'memory', 'disk',
- 'description', 'serial_number', 'config_template', 'comments', 'tags',
+ 'description', 'serial', 'config_template', 'comments', 'tags',
)
diff --git a/netbox/virtualization/forms/filtersets.py b/netbox/virtualization/forms/filtersets.py
index 6d544989c..7c040d948 100644
--- a/netbox/virtualization/forms/filtersets.py
+++ b/netbox/virtualization/forms/filtersets.py
@@ -100,7 +100,7 @@ class VirtualMachineFilterForm(
FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')),
FieldSet(
'status', 'role_id', 'platform_id', 'mac_address', 'has_primary_ip', 'config_template_id',
- 'local_context_data', 'serial_number', name=_('Attributes')
+ 'local_context_data', 'serial', name=_('Attributes')
),
FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
@@ -178,7 +178,7 @@ class VirtualMachineFilterForm(
choices=BOOLEAN_WITH_BLANK_CHOICES
)
)
- serial_number = forms.CharField(
+ serial = forms.CharField(
required=False,
label=_('Serial number')
)
diff --git a/netbox/virtualization/forms/model_forms.py b/netbox/virtualization/forms/model_forms.py
index 01f943679..2c60cb46f 100644
--- a/netbox/virtualization/forms/model_forms.py
+++ b/netbox/virtualization/forms/model_forms.py
@@ -217,7 +217,7 @@ class VirtualMachineForm(TenancyForm, NetBoxModelForm):
comments = CommentField()
fieldsets = (
- FieldSet('name', 'role', 'status', 'description', 'serial_number', 'tags', name=_('Virtual Machine')),
+ FieldSet('name', 'role', 'status', 'description', 'serial', 'tags', name=_('Virtual Machine')),
FieldSet('site', 'cluster', 'device', name=_('Site/Cluster')),
FieldSet('tenant_group', 'tenant', name=_('Tenancy')),
FieldSet('platform', 'primary_ip4', 'primary_ip6', 'config_template', name=_('Management')),
@@ -229,7 +229,7 @@ class VirtualMachineForm(TenancyForm, NetBoxModelForm):
model = VirtualMachine
fields = [
'name', 'status', 'site', 'cluster', 'device', 'role', 'tenant_group', 'tenant', 'platform', 'primary_ip4',
- 'primary_ip6', 'vcpus', 'memory', 'disk', 'description', 'serial_number', 'comments', 'tags',
+ 'primary_ip6', 'vcpus', 'memory', 'disk', 'description', 'serial', 'comments', 'tags',
'local_context_data', 'config_template',
]
diff --git a/netbox/virtualization/migrations/0039_virtualmachine_serial_number.py b/netbox/virtualization/migrations/0039_virtualmachine_serial_number.py
index 9539828ac..014cb4cab 100644
--- a/netbox/virtualization/migrations/0039_virtualmachine_serial_number.py
+++ b/netbox/virtualization/migrations/0039_virtualmachine_serial_number.py
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
operations = [
migrations.AddField(
model_name='virtualmachine',
- name='serial_number',
+ name='serial',
field=models.CharField(blank=True, max_length=50),
),
]
diff --git a/netbox/virtualization/models/virtualmachines.py b/netbox/virtualization/models/virtualmachines.py
index 1d8db591c..24f8d4390 100644
--- a/netbox/virtualization/models/virtualmachines.py
+++ b/netbox/virtualization/models/virtualmachines.py
@@ -127,7 +127,7 @@ class VirtualMachine(ContactsMixin, ImageAttachmentsMixin, RenderConfigMixin, Co
null=True,
verbose_name=_('disk (GB)')
)
- serial_number = models.CharField(
+ serial = models.CharField(
verbose_name=_('serial number'),
blank=True,
max_length=50
diff --git a/netbox/virtualization/search.py b/netbox/virtualization/search.py
index a6d9ffed0..d1f192cee 100644
--- a/netbox/virtualization/search.py
+++ b/netbox/virtualization/search.py
@@ -40,11 +40,11 @@ class VirtualMachineIndex(SearchIndex):
model = models.VirtualMachine
fields = (
('name', 100),
- ('serial_number', 300),
+ ('serial', 300),
('description', 500),
('comments', 5000),
)
- display_attrs = ('site', 'cluster', 'device', 'tenant', 'platform', 'status', 'serial_number', 'role', 'description')
+ display_attrs = ('site', 'cluster', 'device', 'tenant', 'platform', 'status', 'serial', 'role', 'description')
@register_search
diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py
index e26fc37b6..7eb7c9397 100644
--- a/netbox/virtualization/tables/virtualmachines.py
+++ b/netbox/virtualization/tables/virtualmachines.py
@@ -112,7 +112,7 @@ class VirtualMachineTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable)
fields = (
'pk', 'id', 'name', 'status', 'site', 'cluster', 'device', 'role', 'tenant', 'tenant_group', 'vcpus',
'memory', 'disk', 'primary_ip4', 'primary_ip6', 'primary_ip', 'description', 'comments', 'config_template',
- 'serial_number', 'contacts', 'tags', 'created', 'last_updated',
+ 'serial', 'contacts', 'tags', 'created', 'last_updated',
)
default_columns = (
'pk', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'vcpus', 'memory', 'disk', 'primary_ip',
diff --git a/netbox/virtualization/tests/test_filtersets.py b/netbox/virtualization/tests/test_filtersets.py
index 2c7949c06..d2e6cc05f 100644
--- a/netbox/virtualization/tests/test_filtersets.py
+++ b/netbox/virtualization/tests/test_filtersets.py
@@ -328,7 +328,7 @@ class VirtualMachineTestCase(TestCase, ChangeLoggedFilterSetTests):
disk=1,
description='foobar1',
local_context_data={"foo": 123},
- serial_number='111-aaa'
+ serial='111-aaa'
),
VirtualMachine(
name='Virtual Machine 2',
@@ -343,7 +343,7 @@ class VirtualMachineTestCase(TestCase, ChangeLoggedFilterSetTests):
memory=2,
disk=2,
description='foobar2',
- serial_number='222-bbb'
+ serial='222-bbb'
),
VirtualMachine(
name='Virtual Machine 3',
@@ -521,7 +521,7 @@ class VirtualMachineTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 0)
def test_serial_number(self):
- params = {'serial_number': ['111-aaa', '222-bbb']}
+ params = {'serial': ['111-aaa', '222-bbb']}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index eb4ecd37b..0daa55a5c 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -234,7 +234,7 @@ class VirtualMachineTestCase(ViewTestCases.PrimaryObjectViewTestCase):
'vcpus': 4,
'memory': 32768,
'disk': 4000,
- 'serial_number': 'aaa-111',
+ 'serial': 'aaa-111',
'comments': 'Some comments',
'tags': [t.pk for t in tags],
'local_context_data': None,