mirror of
https://github.com/netbox-community/netbox.git
synced 2026-01-23 12:08:43 -06:00
Compare commits
10 Commits
20902-git-
...
19129-mac-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
087a2adb3c | ||
|
|
a145dbc44a | ||
|
|
9b1f033c73 | ||
|
|
60e37e868b | ||
|
|
c1287de970 | ||
|
|
3891b2a25f | ||
|
|
4b4c542dce | ||
|
|
077d9b1129 | ||
|
|
e81ccb9be6 | ||
|
|
bc83d04c8f |
43
.github/ISSUE_TEMPLATE/03-performance.yaml
vendored
Normal file
43
.github/ISSUE_TEMPLATE/03-performance.yaml
vendored
Normal file
@@ -0,0 +1,43 @@
|
||||
---
|
||||
name: 🏁 Performance
|
||||
type: Performance
|
||||
description: An opportunity to improve application performance
|
||||
labels: ["netbox", "type: performance", "status: needs triage"]
|
||||
body:
|
||||
- type: input
|
||||
attributes:
|
||||
label: NetBox Version
|
||||
description: What version of NetBox are you currently running?
|
||||
placeholder: v4.5.1
|
||||
validations:
|
||||
required: true
|
||||
- type: dropdown
|
||||
attributes:
|
||||
label: Python Version
|
||||
description: What version of Python are you currently running?
|
||||
options:
|
||||
- "3.12"
|
||||
- "3.13"
|
||||
- "3.14"
|
||||
validations:
|
||||
required: true
|
||||
- type: checkboxes
|
||||
attributes:
|
||||
label: Area(s) of Concern
|
||||
description: Which application interface(s) are affected?
|
||||
options:
|
||||
- label: User Interface
|
||||
- label: REST API
|
||||
- label: GraphQL API
|
||||
- label: Python ORM
|
||||
- label: Other
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
attributes:
|
||||
label: Details
|
||||
description: >
|
||||
Describe in detail the operations being performed and the indications of a performance issue.
|
||||
Include any relevant testing parameters, benchmarks, and expected results.
|
||||
validations:
|
||||
required: true
|
||||
@@ -732,6 +732,25 @@ class BaseInterface(models.Model):
|
||||
if self.primary_mac_address:
|
||||
return self.primary_mac_address.mac_address
|
||||
|
||||
@property
|
||||
def mac_address_display(self):
|
||||
"""
|
||||
Rich representation of MAC addresses for use in table columns (e.g. InterfaceTable).
|
||||
Handles various configurations of MAC addresses for an interface:
|
||||
11:22:33:44:55:66 <-- Single MAC address on interface, assigned as primary
|
||||
11:22:33:44:55:66 (2) <-- Multiple MAC addresses on interface, one assigned as primary
|
||||
2 available <-- 1 or more MAC addresses on interface, none assigned as primary
|
||||
- <-- No MAC addresses on interface
|
||||
"""
|
||||
available_mac_count = self.mac_addresses.count()
|
||||
if self.primary_mac_address:
|
||||
if available_mac_count > 1:
|
||||
return f"{self.primary_mac_address} ({available_mac_count})"
|
||||
return self.primary_mac_address
|
||||
if available_mac_count:
|
||||
return f"{available_mac_count} available"
|
||||
return None
|
||||
|
||||
|
||||
class Interface(
|
||||
InterfaceValidationMixin,
|
||||
|
||||
@@ -616,6 +616,7 @@ class BaseInterfaceTable(NetBoxTable):
|
||||
)
|
||||
primary_mac_address = tables.Column(
|
||||
verbose_name=_('MAC Address'),
|
||||
accessor=Accessor('mac_address_display'),
|
||||
linkify=True
|
||||
)
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ IMAGEATTACHMENT_IMAGE = """
|
||||
<a href="{{ record.image.url }}" target="_blank" class="image-preview" data-bs-placement="top">
|
||||
<i class="mdi mdi-image"></i></a>
|
||||
{% endif %}
|
||||
<a href="{{ record.get_absolute_url }}">{{ record }}</a>
|
||||
<a href="{{ record.get_absolute_url }}">{{ record.filename|truncate_middle:16 }}</a>
|
||||
"""
|
||||
|
||||
NOTIFICATION_ICON = """
|
||||
|
||||
@@ -6,7 +6,7 @@ from django.core.files.uploadedfile import SimpleUploadedFile
|
||||
from django.forms import ValidationError
|
||||
from django.test import tag, TestCase
|
||||
|
||||
from core.models import DataSource, ObjectType
|
||||
from core.models import AutoSyncRecord, DataSource, ObjectType
|
||||
from dcim.models import Device, DeviceRole, DeviceType, Location, Manufacturer, Platform, Region, Site, SiteGroup
|
||||
from extras.models import ConfigContext, ConfigContextProfile, ConfigTemplate, ImageAttachment, Tag, TaggedItem
|
||||
from tenancy.models import Tenant, TenantGroup
|
||||
@@ -754,3 +754,53 @@ class ConfigTemplateTest(TestCase):
|
||||
@tag('regression')
|
||||
def test_config_template_with_data_source_nested_templates(self):
|
||||
self.assertEqual(self.BASE_TEMPLATE, self.main_config_template.render({}))
|
||||
|
||||
@tag('regression')
|
||||
def test_autosyncrecord_cleanup_on_detach(self):
|
||||
"""Test that AutoSyncRecord is deleted when detaching from DataSource."""
|
||||
with tempfile.TemporaryDirectory() as temp_dir:
|
||||
templates_dir = Path(temp_dir) / "templates"
|
||||
templates_dir.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
self._create_template_file(templates_dir, 'test.j2', 'Test content')
|
||||
|
||||
data_source = DataSource(
|
||||
name="Test DataSource for Detach",
|
||||
type="local",
|
||||
source_url=str(templates_dir),
|
||||
)
|
||||
data_source.save()
|
||||
data_source.sync()
|
||||
|
||||
data_file = data_source.datafiles.filter(path__endswith='test.j2').first()
|
||||
|
||||
# Create a ConfigTemplate with data_file and auto_sync_enabled
|
||||
config_template = ConfigTemplate(
|
||||
name="TestTemplateForDetach",
|
||||
data_file=data_file,
|
||||
auto_sync_enabled=True
|
||||
)
|
||||
config_template.clean()
|
||||
config_template.save()
|
||||
|
||||
# Verify AutoSyncRecord was created
|
||||
object_type = ObjectType.objects.get_for_model(ConfigTemplate)
|
||||
autosync_records = AutoSyncRecord.objects.filter(
|
||||
object_type=object_type,
|
||||
object_id=config_template.pk
|
||||
)
|
||||
self.assertEqual(autosync_records.count(), 1, "AutoSyncRecord should be created")
|
||||
|
||||
# Detach from DataSource
|
||||
config_template.data_file = None
|
||||
config_template.data_source = None
|
||||
config_template.auto_sync_enabled = False
|
||||
config_template.clean()
|
||||
config_template.save()
|
||||
|
||||
# Verify AutoSyncRecord was deleted
|
||||
autosync_records = AutoSyncRecord.objects.filter(
|
||||
object_type=object_type,
|
||||
object_id=config_template.pk
|
||||
)
|
||||
self.assertEqual(autosync_records.count(), 0, "AutoSyncRecord should be deleted after detaching")
|
||||
|
||||
@@ -569,7 +569,6 @@ class SyncedDataMixin(models.Model):
|
||||
)
|
||||
else:
|
||||
AutoSyncRecord.objects.filter(
|
||||
datafile=self.data_file,
|
||||
object_type=object_type,
|
||||
object_id=self.pk
|
||||
).delete()
|
||||
@@ -582,7 +581,6 @@ class SyncedDataMixin(models.Model):
|
||||
# Delete AutoSyncRecord
|
||||
object_type = ObjectType.objects.get_for_model(self)
|
||||
AutoSyncRecord.objects.filter(
|
||||
datafile=self.data_file,
|
||||
object_type=object_type,
|
||||
object_id=self.pk
|
||||
).delete()
|
||||
|
||||
@@ -143,9 +143,11 @@
|
||||
<tr>
|
||||
<th scope="row">{% trans "MAC Address" %}</th>
|
||||
<td>
|
||||
{% if object.mac_address_display %}
|
||||
<span class="font-monospace">{{ object.mac_address_display|linkify }}</span>
|
||||
{% if object.primary_mac_address %}
|
||||
<span class="font-monospace">{{ object.primary_mac_address|linkify }}</span>
|
||||
<span class="badge text-bg-primary">{% trans "Primary" %}</span>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
{{ ''|placeholder }}
|
||||
{% endif %}
|
||||
|
||||
@@ -78,9 +78,11 @@
|
||||
<tr>
|
||||
<th scope="row">{% trans "MAC Address" %}</th>
|
||||
<td>
|
||||
{% if object.mac_address %}
|
||||
<span class="font-monospace">{{ object.mac_address }}</span>
|
||||
{% if object.mac_address_display %}
|
||||
<span class="font-monospace">{{ object.mac_address_display|linkify }}</span>
|
||||
{% if object.primary_mac_address %}
|
||||
<span class="badge text-bg-primary">{% trans "Primary" %}</span>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
{{ ''|placeholder }}
|
||||
{% endif %}
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2026-01-21 05:07+0000\n"
|
||||
"POT-Creation-Date: 2026-01-22 05:07+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@@ -12037,7 +12037,7 @@ msgstr ""
|
||||
msgid "date synced"
|
||||
msgstr ""
|
||||
|
||||
#: netbox/netbox/models/features.py:623
|
||||
#: netbox/netbox/models/features.py:621
|
||||
#, python-brace-format
|
||||
msgid "{class_name} must implement a sync_data() method."
|
||||
msgstr ""
|
||||
@@ -13935,8 +13935,8 @@ msgid "No VLANs Assigned"
|
||||
msgstr ""
|
||||
|
||||
#: netbox/templates/dcim/inc/interface_vlans_table.html:44
|
||||
#: netbox/templates/ipam/prefix_list.html:16
|
||||
#: netbox/templates/ipam/prefix_list.html:33
|
||||
#: netbox/templates/ipam/inc/max_depth.html:11
|
||||
#: netbox/templates/ipam/inc/max_length.html:11
|
||||
msgid "Clear"
|
||||
msgstr ""
|
||||
|
||||
@@ -15053,8 +15053,8 @@ msgstr ""
|
||||
msgid "Date Added"
|
||||
msgstr ""
|
||||
|
||||
#: netbox/templates/ipam/aggregate/prefixes.html:8
|
||||
#: netbox/templates/ipam/prefix/prefixes.html:8
|
||||
#: netbox/templates/ipam/aggregate/prefixes.html:10
|
||||
#: netbox/templates/ipam/prefix/prefixes.html:10
|
||||
#: netbox/templates/ipam/role.html:10
|
||||
msgid "Add Prefix"
|
||||
msgstr ""
|
||||
@@ -15083,6 +15083,14 @@ msgstr ""
|
||||
msgid "Bulk Create"
|
||||
msgstr ""
|
||||
|
||||
#: netbox/templates/ipam/inc/max_depth.html:6
|
||||
msgid "Max Depth"
|
||||
msgstr ""
|
||||
|
||||
#: netbox/templates/ipam/inc/max_length.html:6
|
||||
msgid "Max Length"
|
||||
msgstr ""
|
||||
|
||||
#: netbox/templates/ipam/inc/panels/fhrp_groups.html:10
|
||||
msgid "Create Group"
|
||||
msgstr ""
|
||||
@@ -15184,14 +15192,6 @@ msgstr ""
|
||||
msgid "Hide Depth Indicators"
|
||||
msgstr ""
|
||||
|
||||
#: netbox/templates/ipam/prefix_list.html:11
|
||||
msgid "Max Depth"
|
||||
msgstr ""
|
||||
|
||||
#: netbox/templates/ipam/prefix_list.html:28
|
||||
msgid "Max Length"
|
||||
msgstr ""
|
||||
|
||||
#: netbox/templates/ipam/rir.html:10
|
||||
msgid "Add Aggregate"
|
||||
msgstr ""
|
||||
|
||||
@@ -252,3 +252,16 @@ def isodatetime(value, spec='seconds'):
|
||||
else:
|
||||
return ''
|
||||
return mark_safe(f'<span title="{naturaltime(value)}">{text}</span>')
|
||||
|
||||
|
||||
@register.filter
|
||||
def truncate_middle(value, length):
|
||||
if len(value) <= length:
|
||||
return value
|
||||
|
||||
# Calculate split points for the two parts
|
||||
half_len = (length - 1) // 2 # 1 for the ellipsis
|
||||
first_part = value[:half_len]
|
||||
second_part = value[len(value) - (length - 1 - half_len):]
|
||||
|
||||
return mark_safe(f"{first_part}…{second_part}")
|
||||
|
||||
Reference in New Issue
Block a user