mirror of
https://github.com/netbox-community/netbox.git
synced 2026-01-24 04:22:41 -06:00
Compare commits
3 Commits
20902-git-
...
21176-remo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cedbeb7b19 | ||
|
|
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
|
||||||
@@ -102,10 +102,7 @@ class GitBackend(DataBackend):
|
|||||||
clone_args['pool_manager'] = ProxyPoolManager(self.socks_proxy)
|
clone_args['pool_manager'] = ProxyPoolManager(self.socks_proxy)
|
||||||
|
|
||||||
if self.url_scheme in ('http', 'https'):
|
if self.url_scheme in ('http', 'https'):
|
||||||
# Only pass explicit credentials if URL doesn't already contain embedded username
|
if self.params.get('username'):
|
||||||
# to avoid credential conflicts
|
|
||||||
parsed_url = urlparse(self.url)
|
|
||||||
if not parsed_url.username and self.params.get('username'):
|
|
||||||
clone_args.update(
|
clone_args.update(
|
||||||
{
|
{
|
||||||
"username": self.params.get('username'),
|
"username": self.params.get('username'),
|
||||||
|
|||||||
@@ -1,59 +0,0 @@
|
|||||||
from unittest.mock import patch
|
|
||||||
|
|
||||||
from django.test import TestCase
|
|
||||||
|
|
||||||
from core.data_backends import GitBackend
|
|
||||||
|
|
||||||
|
|
||||||
class GitBackendCredentialTests(TestCase):
|
|
||||||
|
|
||||||
def _get_clone_kwargs(self, url, **params):
|
|
||||||
backend = GitBackend(url=url, **params)
|
|
||||||
|
|
||||||
with patch('dulwich.porcelain.clone') as mock_clone, \
|
|
||||||
patch('dulwich.porcelain.NoneStream'):
|
|
||||||
try:
|
|
||||||
with backend.fetch():
|
|
||||||
pass
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
if mock_clone.called:
|
|
||||||
return mock_clone.call_args.kwargs
|
|
||||||
return {}
|
|
||||||
|
|
||||||
def test_url_with_embedded_username_skips_explicit_credentials(self):
|
|
||||||
kwargs = self._get_clone_kwargs(
|
|
||||||
url='https://myuser@bitbucket.org/workspace/repo.git',
|
|
||||||
username='myuser',
|
|
||||||
password='my-api-key'
|
|
||||||
)
|
|
||||||
|
|
||||||
self.assertEqual(kwargs.get('username'), None)
|
|
||||||
self.assertEqual(kwargs.get('password'), None)
|
|
||||||
|
|
||||||
def test_url_without_embedded_username_passes_explicit_credentials(self):
|
|
||||||
kwargs = self._get_clone_kwargs(
|
|
||||||
url='https://bitbucket.org/workspace/repo.git',
|
|
||||||
username='myuser',
|
|
||||||
password='my-api-key'
|
|
||||||
)
|
|
||||||
|
|
||||||
self.assertEqual(kwargs.get('username'), 'myuser')
|
|
||||||
self.assertEqual(kwargs.get('password'), 'my-api-key')
|
|
||||||
|
|
||||||
def test_url_with_embedded_username_no_explicit_credentials(self):
|
|
||||||
kwargs = self._get_clone_kwargs(
|
|
||||||
url='https://myuser@bitbucket.org/workspace/repo.git'
|
|
||||||
)
|
|
||||||
|
|
||||||
self.assertEqual(kwargs.get('username'), None)
|
|
||||||
self.assertEqual(kwargs.get('password'), None)
|
|
||||||
|
|
||||||
def test_public_repo_no_credentials(self):
|
|
||||||
kwargs = self._get_clone_kwargs(
|
|
||||||
url='https://github.com/public/repo.git'
|
|
||||||
)
|
|
||||||
|
|
||||||
self.assertEqual(kwargs.get('username'), None)
|
|
||||||
self.assertEqual(kwargs.get('password'), None)
|
|
||||||
@@ -6,7 +6,7 @@ from django.core.files.uploadedfile import SimpleUploadedFile
|
|||||||
from django.forms import ValidationError
|
from django.forms import ValidationError
|
||||||
from django.test import tag, TestCase
|
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 dcim.models import Device, DeviceRole, DeviceType, Location, Manufacturer, Platform, Region, Site, SiteGroup
|
||||||
from extras.models import ConfigContext, ConfigContextProfile, ConfigTemplate, ImageAttachment, Tag, TaggedItem
|
from extras.models import ConfigContext, ConfigContextProfile, ConfigTemplate, ImageAttachment, Tag, TaggedItem
|
||||||
from tenancy.models import Tenant, TenantGroup
|
from tenancy.models import Tenant, TenantGroup
|
||||||
@@ -754,3 +754,53 @@ class ConfigTemplateTest(TestCase):
|
|||||||
@tag('regression')
|
@tag('regression')
|
||||||
def test_config_template_with_data_source_nested_templates(self):
|
def test_config_template_with_data_source_nested_templates(self):
|
||||||
self.assertEqual(self.BASE_TEMPLATE, self.main_config_template.render({}))
|
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")
|
||||||
|
|||||||
@@ -370,6 +370,11 @@ class AnnotatedIPAddressTable(IPAddressTable):
|
|||||||
verbose_name=_('IP Address')
|
verbose_name=_('IP Address')
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def render_pk(self, value, record, bound_column):
|
||||||
|
if type(record) is not self._meta.model:
|
||||||
|
return ''
|
||||||
|
return bound_column.column.render(value, bound_column, record)
|
||||||
|
|
||||||
class Meta(IPAddressTable.Meta):
|
class Meta(IPAddressTable.Meta):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
41
netbox/ipam/tests/test_tables.py
Normal file
41
netbox/ipam/tests/test_tables.py
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
from django.test import RequestFactory, TestCase
|
||||||
|
from netaddr import IPNetwork
|
||||||
|
|
||||||
|
from ipam.models import IPAddress, IPRange, Prefix
|
||||||
|
from ipam.tables import AnnotatedIPAddressTable
|
||||||
|
from ipam.utils import annotate_ip_space
|
||||||
|
|
||||||
|
|
||||||
|
class AnnotatedIPAddressTableTest(TestCase):
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def setUpTestData(cls):
|
||||||
|
cls.prefix = Prefix.objects.create(
|
||||||
|
prefix=IPNetwork('10.1.1.0/24'),
|
||||||
|
status='active'
|
||||||
|
)
|
||||||
|
|
||||||
|
cls.ip_address = IPAddress.objects.create(
|
||||||
|
address='10.1.1.1/24',
|
||||||
|
status='active'
|
||||||
|
)
|
||||||
|
|
||||||
|
cls.ip_range = IPRange.objects.create(
|
||||||
|
start_address=IPNetwork('10.1.1.2/24'),
|
||||||
|
end_address=IPNetwork('10.1.1.10/24'),
|
||||||
|
status='active'
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_ipaddress_has_checkbox_iprange_does_not(self):
|
||||||
|
data = annotate_ip_space(self.prefix)
|
||||||
|
table = AnnotatedIPAddressTable(data, orderable=False)
|
||||||
|
table.columns.show('pk')
|
||||||
|
|
||||||
|
request = RequestFactory().get('/')
|
||||||
|
html = table.as_html(request)
|
||||||
|
|
||||||
|
ipaddress_checkbox_count = html.count(f'name="pk" value="{self.ip_address.pk}"')
|
||||||
|
self.assertEqual(ipaddress_checkbox_count, 1)
|
||||||
|
|
||||||
|
iprange_checkbox_count = html.count(f'name="pk" value="{self.ip_range.pk}"')
|
||||||
|
self.assertEqual(iprange_checkbox_count, 0)
|
||||||
@@ -49,6 +49,9 @@ def add_requested_prefixes(parent, prefix_list, show_available=True, show_assign
|
|||||||
if prefix_list and show_available:
|
if prefix_list and show_available:
|
||||||
|
|
||||||
# Find all unallocated space, add fake Prefix objects to child_prefixes.
|
# Find all unallocated space, add fake Prefix objects to child_prefixes.
|
||||||
|
# IMPORTANT: These are unsaved Prefix instances (pk=None). If this is ever changed to use
|
||||||
|
# saved Prefix instances with real pks, bulk delete will fail for mixed-type selections
|
||||||
|
# due to single-model form validation. See: https://github.com/netbox-community/netbox/issues/21176
|
||||||
available_prefixes = netaddr.IPSet(parent) ^ netaddr.IPSet([p.prefix for p in prefix_list])
|
available_prefixes = netaddr.IPSet(parent) ^ netaddr.IPSet([p.prefix for p in prefix_list])
|
||||||
available_prefixes = [Prefix(prefix=p, status=None) for p in available_prefixes.iter_cidrs()]
|
available_prefixes = [Prefix(prefix=p, status=None) for p in available_prefixes.iter_cidrs()]
|
||||||
child_prefixes = child_prefixes + available_prefixes
|
child_prefixes = child_prefixes + available_prefixes
|
||||||
|
|||||||
@@ -569,7 +569,6 @@ class SyncedDataMixin(models.Model):
|
|||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
AutoSyncRecord.objects.filter(
|
AutoSyncRecord.objects.filter(
|
||||||
datafile=self.data_file,
|
|
||||||
object_type=object_type,
|
object_type=object_type,
|
||||||
object_id=self.pk
|
object_id=self.pk
|
||||||
).delete()
|
).delete()
|
||||||
@@ -582,7 +581,6 @@ class SyncedDataMixin(models.Model):
|
|||||||
# Delete AutoSyncRecord
|
# Delete AutoSyncRecord
|
||||||
object_type = ObjectType.objects.get_for_model(self)
|
object_type = ObjectType.objects.get_for_model(self)
|
||||||
AutoSyncRecord.objects.filter(
|
AutoSyncRecord.objects.filter(
|
||||||
datafile=self.data_file,
|
|
||||||
object_type=object_type,
|
object_type=object_type,
|
||||||
object_id=self.pk
|
object_id=self.pk
|
||||||
).delete()
|
).delete()
|
||||||
|
|||||||
Reference in New Issue
Block a user