NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-09 09:08:15 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

7537 serial_number -> serial

Browse Source
This commit is contained in:
Arthur 2024-06-11 09:50:26 -07:00
parent 47ebb51281
commit f817e657c6
12 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/templates/virtualization/virtualmachine.html
View File

@ -33,7 +33,7 @@
</tr>
<tr>
<th scope="row">{% trans "Serial Number" %}</th>
<td>{{ object.serial_number|placeholder }}</td>
<td>{{ object.serial|placeholder }}</td>
</tr>
<tr>
<th scope="row">{% trans "Tenant" %}</th>

2
netbox/virtualization/api/serializers_/virtualmachines.py
View File

@ -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',

4
netbox/virtualization/filtersets.py
View File

@ -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):

2
netbox/virtualization/forms/bulk_import.py
View File

@ -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',
)

4
netbox/virtualization/forms/filtersets.py
View File

@ -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')
)

4
netbox/virtualization/forms/model_forms.py
View File

@ -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',
]

2
netbox/virtualization/migrations/0039_virtualmachine_serial_number.py
View File

@ -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),
),
]

2
netbox/virtualization/models/virtualmachines.py
View File

@ -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

4
netbox/virtualization/search.py
View File

@ -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

2
netbox/virtualization/tables/virtualmachines.py
View File

@ -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',

6
netbox/virtualization/tests/test_filtersets.py
View File

@ -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)

2
netbox/virtualization/tests/test_views.py
View File

@ -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,