{default}').format(default=DEFAULT_MIME_TYPE),
+ )
+ file_name = models.CharField(
+ max_length=200,
+ blank=True,
+ help_text=_('Filename to give to the rendered export file')
+ )
+ file_extension = models.CharField(
+ verbose_name=_('file extension'),
+ max_length=15,
+ blank=True,
+ help_text=_('Extension to append to the rendered filename')
+ )
+ as_attachment = models.BooleanField(
+ verbose_name=_('as attachment'),
+ default=True,
+ help_text=_("Download file as attachment")
+ )
+
+ class Meta:
+ abstract = True
+
+ def get_context(self, context=None, queryset=None):
+ raise NotImplementedError(_("{class_name} must implement a get_context() method.").format(
+ class_name=self.__class__
+ ))
+
+ def render(self, context=None, queryset=None):
+ """
+ Render the template with the provided context. The context is passed to the Jinja2 environment as a dictionary.
+ """
+ context = self.get_context(context=context, queryset=queryset)
+ env_params = self.environment_params or {}
+ output = render_jinja2(self.template_code, context, env_params)
+
+ # Replace CRLF-style line terminators
+ output = output.replace('\r\n', '\n')
+
+ return output
+
+ def render_to_response(self, context=None, queryset=None):
+ output = self.render(context=context, queryset=queryset)
+ mime_type = self.mime_type or DEFAULT_MIME_TYPE
+
+ # Build the response
+ response = HttpResponse(output, content_type=mime_type)
+
+ if self.as_attachment:
+ extension = f'.{self.file_extension}' if self.file_extension else ''
+ if self.file_name:
+ filename = self.file_name
+ elif queryset:
+ filename = filename_from_model(queryset.model)
+ elif context:
+ filename = filename_from_object(context)
+ else:
+ filename = "output"
+ response['Content-Disposition'] = f'attachment; filename="{filename}{extension}"'
+
+ return response
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index d3e443b14..76fad1082 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -6,7 +6,6 @@ from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelatio
from django.contrib.postgres.fields import ArrayField
from django.core.validators import ValidationError
from django.db import models
-from django.http import HttpResponse
from django.urls import reverse
from django.utils import timezone
from django.utils.translation import gettext_lazy as _
@@ -17,11 +16,12 @@ from extras.choices import *
from extras.conditions import ConditionSet
from extras.constants import *
from extras.utils import image_upload
+from extras.models.mixins import RenderTemplateMixin
from netbox.config import get_config
from netbox.events import get_event_type_choices
from netbox.models import ChangeLoggedModel
from netbox.models.features import (
- CloningMixin, CustomFieldsMixin, CustomLinksMixin, ExportTemplatesMixin, SyncedDataMixin, TagsMixin,
+ CloningMixin, CustomFieldsMixin, CustomLinksMixin, ExportTemplatesMixin, SyncedDataMixin, TagsMixin
)
from utilities.html import clean_html
from utilities.jinja2 import render_jinja2
@@ -382,7 +382,7 @@ class CustomLink(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
}
-class ExportTemplate(SyncedDataMixin, CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
+class ExportTemplate(SyncedDataMixin, CloningMixin, ExportTemplatesMixin, ChangeLoggedModel, RenderTemplateMixin):
object_types = models.ManyToManyField(
to='core.ObjectType',
related_name='export_templates',
@@ -397,32 +397,9 @@ class ExportTemplate(SyncedDataMixin, CloningMixin, ExportTemplatesMixin, Change
max_length=200,
blank=True
)
- template_code = models.TextField(
- help_text=_(
- "Jinja2 template code. The list of objects being exported is passed as a context variable named "
- "queryset."
- )
- )
- mime_type = models.CharField(
- max_length=50,
- blank=True,
- verbose_name=_('MIME type'),
- help_text=_('Defaults to text/plain; charset=utf-8')
- )
- file_extension = models.CharField(
- verbose_name=_('file extension'),
- max_length=15,
- blank=True,
- help_text=_('Extension to append to the rendered filename')
- )
- as_attachment = models.BooleanField(
- verbose_name=_('as attachment'),
- default=True,
- help_text=_("Download file as attachment")
- )
clone_fields = (
- 'object_types', 'template_code', 'mime_type', 'file_extension', 'as_attachment',
+ 'object_types', 'template_code', 'mime_type', 'file_name', 'file_extension', 'as_attachment',
)
class Meta:
@@ -455,37 +432,16 @@ class ExportTemplate(SyncedDataMixin, CloningMixin, ExportTemplatesMixin, Change
self.template_code = self.data_file.data_as_string
sync_data.alters_data = True
- def render(self, queryset):
- """
- Render the contents of the template.
- """
- context = {
- 'queryset': queryset
+ def get_context(self, context=None, queryset=None):
+ _context = {
+ 'queryset': queryset,
}
- output = render_jinja2(self.template_code, context)
- # Replace CRLF-style line terminators
- output = output.replace('\r\n', '\n')
+ # Apply the provided context data, if any
+ if context is not None:
+ _context.update(context)
- return output
-
- def render_to_response(self, queryset):
- """
- Render the template to an HTTP response, delivered as a named file attachment
- """
- output = self.render(queryset)
- mime_type = 'text/plain; charset=utf-8' if not self.mime_type else self.mime_type
-
- # Build the response
- response = HttpResponse(output, content_type=mime_type)
-
- if self.as_attachment:
- basename = queryset.model._meta.verbose_name_plural.replace(' ', '_')
- extension = f'.{self.file_extension}' if self.file_extension else ''
- filename = f'netbox_{basename}{extension}'
- response['Content-Disposition'] = f'attachment; filename="{filename}"'
-
- return response
+ return _context
class SavedFilter(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
diff --git a/netbox/extras/models/staging.py b/netbox/extras/models/staging.py
deleted file mode 100644
index 68d37de7f..000000000
--- a/netbox/extras/models/staging.py
+++ /dev/null
@@ -1,150 +0,0 @@
-import logging
-import warnings
-
-from django.contrib.contenttypes.fields import GenericForeignKey
-from django.db import models, transaction
-from django.utils.translation import gettext_lazy as _
-from mptt.models import MPTTModel
-
-from extras.choices import ChangeActionChoices
-from netbox.models import ChangeLoggedModel
-from netbox.models.features import *
-from utilities.serialization import deserialize_object
-
-__all__ = (
- 'Branch',
- 'StagedChange',
-)
-
-logger = logging.getLogger('netbox.staging')
-
-
-class Branch(ChangeLoggedModel):
- """
- A collection of related StagedChanges.
- """
- name = models.CharField(
- verbose_name=_('name'),
- max_length=100,
- unique=True
- )
- description = models.CharField(
- verbose_name=_('description'),
- max_length=200,
- blank=True
- )
- user = models.ForeignKey(
- to='users.User',
- on_delete=models.SET_NULL,
- blank=True,
- null=True
- )
-
- class Meta:
- ordering = ('name',)
- verbose_name = _('branch')
- verbose_name_plural = _('branches')
-
- def __init__(self, *args, **kwargs):
- warnings.warn(
- 'The staged changes functionality has been deprecated and will be removed in a future release.',
- DeprecationWarning
- )
- super().__init__(*args, **kwargs)
-
- def __str__(self):
- return f'{self.name} ({self.pk})'
-
- def merge(self):
- logger.info(f'Merging changes in branch {self}')
- with transaction.atomic():
- for change in self.staged_changes.all():
- change.apply()
- self.staged_changes.all().delete()
-
-
-class StagedChange(CustomValidationMixin, EventRulesMixin, models.Model):
- """
- The prepared creation, modification, or deletion of an object to be applied to the active database at a
- future point.
- """
- branch = models.ForeignKey(
- to=Branch,
- on_delete=models.CASCADE,
- related_name='staged_changes'
- )
- action = models.CharField(
- verbose_name=_('action'),
- max_length=20,
- choices=ChangeActionChoices
- )
- object_type = models.ForeignKey(
- to='contenttypes.ContentType',
- on_delete=models.CASCADE,
- related_name='+'
- )
- object_id = models.PositiveBigIntegerField(
- blank=True,
- null=True
- )
- object = GenericForeignKey(
- ct_field='object_type',
- fk_field='object_id'
- )
- data = models.JSONField(
- verbose_name=_('data'),
- blank=True,
- null=True
- )
-
- class Meta:
- ordering = ('pk',)
- indexes = (
- models.Index(fields=('object_type', 'object_id')),
- )
- verbose_name = _('staged change')
- verbose_name_plural = _('staged changes')
-
- def __init__(self, *args, **kwargs):
- warnings.warn(
- 'The staged changes functionality has been deprecated and will be removed in a future release.',
- DeprecationWarning
- )
- super().__init__(*args, **kwargs)
-
- def __str__(self):
- action = self.get_action_display()
- app_label, model_name = self.object_type.natural_key()
- return f"{action} {app_label}.{model_name} ({self.object_id})"
-
- @property
- def model(self):
- return self.object_type.model_class()
-
- def apply(self):
- """
- Apply the staged create/update/delete action to the database.
- """
- if self.action == ChangeActionChoices.ACTION_CREATE:
- instance = deserialize_object(self.model, self.data, pk=self.object_id)
- logger.info(f'Creating {self.model._meta.verbose_name} {instance}')
- instance.save()
-
- if self.action == ChangeActionChoices.ACTION_UPDATE:
- instance = deserialize_object(self.model, self.data, pk=self.object_id)
- logger.info(f'Updating {self.model._meta.verbose_name} {instance}')
- instance.save()
-
- if self.action == ChangeActionChoices.ACTION_DELETE:
- instance = self.model.objects.get(pk=self.object_id)
- logger.info(f'Deleting {self.model._meta.verbose_name} {instance}')
- instance.delete()
-
- # Rebuild the MPTT tree where applicable
- if issubclass(self.model, MPTTModel):
- self.model.objects.rebuild()
-
- apply.alters_data = True
-
- def get_action_color(self):
- return ChangeActionChoices.colors.get(self.action)
diff --git a/netbox/extras/models/tags.py b/netbox/extras/models/tags.py
index d1e329f03..4c6396172 100644
--- a/netbox/extras/models/tags.py
+++ b/netbox/extras/models/tags.py
@@ -9,6 +9,7 @@ from netbox.choices import ColorChoices
from netbox.models import ChangeLoggedModel
from netbox.models.features import CloningMixin, ExportTemplatesMixin
from utilities.fields import ColorField
+from utilities.querysets import RestrictedQuerySet
__all__ = (
'Tag',
@@ -39,13 +40,17 @@ class Tag(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel, TagBase):
blank=True,
help_text=_("The object type(s) to which this tag can be applied.")
)
+ weight = models.PositiveSmallIntegerField(
+ verbose_name=_('weight'),
+ default=0,
+ )
clone_fields = (
'color', 'description', 'object_types',
)
class Meta:
- ordering = ['name']
+ ordering = ('weight', 'name')
verbose_name = _('tag')
verbose_name_plural = _('tags')
@@ -72,6 +77,7 @@ class TaggedItem(GenericTaggedItemBase):
)
_netbox_private = True
+ objects = RestrictedQuerySet.as_manager()
class Meta:
indexes = [models.Index(fields=["content_type", "object_id"])]
diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index f2bd75a1d..83195402d 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -2,10 +2,12 @@ import inspect
import json
import logging
import os
+import re
import yaml
from django import forms
from django.conf import settings
+from django.core.files.storage import storages
from django.core.validators import RegexValidator
from django.utils import timezone
from django.utils.functional import classproperty
@@ -367,9 +369,46 @@ class BaseScript:
def filename(self):
return inspect.getfile(self.__class__)
+ def findsource(self, object):
+ storage = storages.create_storage(storages.backends["scripts"])
+ with storage.open(os.path.basename(self.filename), 'r') as f:
+ data = f.read()
+
+ # Break the source code into lines
+ lines = [line + '\n' for line in data.splitlines()]
+
+ # Find the class definition
+ name = object.__name__
+ pat = re.compile(r'^(\s*)class\s*' + name + r'\b')
+ # use the class definition with the least indentation
+ candidates = []
+ for i in range(len(lines)):
+ match = pat.match(lines[i])
+ if match:
+ if lines[i][0] == 'c':
+ return lines, i
+
+ candidates.append((match.group(1), i))
+ if not candidates:
+ raise OSError('could not find class definition')
+
+ # Sort the candidates by whitespace, and by line number
+ candidates.sort()
+ return lines, candidates[0][1]
+
@property
def source(self):
- return inspect.getsource(self.__class__)
+ # Can't use inspect.getsource() as it uses os to get the file
+ # inspect uses ast, but that is overkill for this as we only do
+ # classes.
+ object = self.__class__
+
+ try:
+ lines, lnum = self.findsource(object)
+ lines = inspect.getblock(lines[lnum:])
+ return ''.join(lines)
+ except OSError:
+ return ''
@classmethod
def _get_vars(cls):
@@ -524,7 +563,12 @@ class BaseScript:
def load_yaml(self, filename):
"""
Return data from a YAML file
+ TODO: DEPRECATED: Remove this method in v4.4
"""
+ self._log(
+ _("load_yaml is deprecated and will be removed in v4.4"),
+ level=LogLevelChoices.LOG_WARNING
+ )
try:
from yaml import CLoader as Loader
except ImportError:
@@ -539,7 +583,12 @@ class BaseScript:
def load_json(self, filename):
"""
Return data from a JSON file
+ TODO: DEPRECATED: Remove this method in v4.4
"""
+ self._log(
+ _("load_json is deprecated and will be removed in v4.4"),
+ level=LogLevelChoices.LOG_WARNING
+ )
file_path = os.path.join(settings.SCRIPTS_ROOT, filename)
with open(file_path, 'r') as datafile:
data = json.load(datafile)
@@ -555,7 +604,6 @@ class BaseScript:
Run the report and save its results. Each test method will be executed in order.
"""
self.logger.info("Running report")
-
try:
for test_name in self.tests:
self._current_test = test_name
diff --git a/netbox/extras/storage.py b/netbox/extras/storage.py
new file mode 100644
index 000000000..ede4fac7f
--- /dev/null
+++ b/netbox/extras/storage.py
@@ -0,0 +1,14 @@
+from django.conf import settings
+from django.core.files.storage import FileSystemStorage
+from django.utils.functional import cached_property
+
+
+class ScriptFileSystemStorage(FileSystemStorage):
+ """
+ Custom storage for scripts - for django-storages as the default one will
+ go off media-root and raise security errors as the scripts can be outside
+ the media-root directory.
+ """
+ @cached_property
+ def base_location(self):
+ return settings.SCRIPTS_ROOT
diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py
index e538c488e..60b207058 100644
--- a/netbox/extras/tables/tables.py
+++ b/netbox/extras/tables/tables.py
@@ -183,6 +183,15 @@ class ExportTemplateTable(NetBoxTable):
object_types = columns.ContentTypesColumn(
verbose_name=_('Object Types'),
)
+ mime_type = tables.Column(
+ verbose_name=_('MIME Type')
+ )
+ file_name = tables.Column(
+ verbose_name=_('File Name'),
+ )
+ file_extension = tables.Column(
+ verbose_name=_('File Extension'),
+ )
as_attachment = columns.BooleanColumn(
verbose_name=_('As Attachment'),
false_mark=None
@@ -203,11 +212,12 @@ class ExportTemplateTable(NetBoxTable):
class Meta(NetBoxTable.Meta):
model = ExportTemplate
fields = (
- 'pk', 'id', 'name', 'object_types', 'description', 'mime_type', 'file_extension', 'as_attachment',
- 'data_source', 'data_file', 'data_synced', 'created', 'last_updated',
+ 'pk', 'id', 'name', 'object_types', 'description', 'mime_type', 'file_name', 'file_extension',
+ 'as_attachment', 'data_source', 'data_file', 'data_synced', 'created', 'last_updated',
)
default_columns = (
- 'pk', 'name', 'object_types', 'description', 'mime_type', 'file_extension', 'as_attachment', 'is_synced',
+ 'pk', 'name', 'object_types', 'description', 'mime_type', 'file_name', 'file_extension',
+ 'as_attachment', 'is_synced',
)
@@ -449,8 +459,8 @@ class TagTable(NetBoxTable):
class Meta(NetBoxTable.Meta):
model = Tag
fields = (
- 'pk', 'id', 'name', 'items', 'slug', 'color', 'description', 'object_types', 'created', 'last_updated',
- 'actions',
+ 'pk', 'id', 'name', 'items', 'slug', 'color', 'weight', 'description', 'object_types',
+ 'created', 'last_updated', 'actions',
)
default_columns = ('pk', 'name', 'items', 'slug', 'color', 'description')
@@ -526,6 +536,19 @@ class ConfigTemplateTable(NetBoxTable):
orderable=False,
verbose_name=_('Synced')
)
+ mime_type = tables.Column(
+ verbose_name=_('MIME Type')
+ )
+ file_name = tables.Column(
+ verbose_name=_('File Name'),
+ )
+ file_extension = tables.Column(
+ verbose_name=_('File Extension'),
+ )
+ as_attachment = columns.BooleanColumn(
+ verbose_name=_('As Attachment'),
+ false_mark=None
+ )
tags = columns.TagColumn(
url_name='extras:configtemplate_list'
)
@@ -553,8 +576,9 @@ class ConfigTemplateTable(NetBoxTable):
class Meta(NetBoxTable.Meta):
model = ConfigTemplate
fields = (
- 'pk', 'id', 'name', 'description', 'data_source', 'data_file', 'data_synced', 'role_count',
- 'platform_count', 'device_count', 'vm_count', 'created', 'last_updated', 'tags',
+ 'pk', 'id', 'name', 'description', 'data_source', 'data_file', 'data_synced', 'as_attachment',
+ 'mime_type', 'file_name', 'file_extension', 'role_count', 'platform_count', 'device_count',
+ 'vm_count', 'created', 'last_updated', 'tags',
)
default_columns = (
'pk', 'name', 'description', 'is_synced', 'device_count', 'vm_count',
diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py
index 63baf44d3..6e3fb37fc 100644
--- a/netbox/extras/tests/test_api.py
+++ b/netbox/extras/tests/test_api.py
@@ -479,6 +479,7 @@ class ExportTemplateTest(APIViewTestCases.APIViewTestCase):
'object_types': ['dcim.device'],
'name': 'Test Export Template 6',
'template_code': '{% for obj in queryset %}{{ obj.name }}\n{% endfor %}',
+ 'file_name': 'test_export_template_6',
},
]
bulk_update_data = {
@@ -494,7 +495,9 @@ class ExportTemplateTest(APIViewTestCases.APIViewTestCase):
),
ExportTemplate(
name='Export Template 2',
- template_code='{% for obj in queryset %}{{ obj.name }}\n{% endfor %}'
+ template_code='{% for obj in queryset %}{{ obj.name }}\n{% endfor %}',
+ file_name='export_template_2',
+ file_extension='test',
),
ExportTemplate(
name='Export Template 3',
@@ -502,8 +505,10 @@ class ExportTemplateTest(APIViewTestCases.APIViewTestCase):
),
)
ExportTemplate.objects.bulk_create(export_templates)
+
+ device_object_type = ObjectType.objects.get_for_model(Device)
for et in export_templates:
- et.object_types.set([ObjectType.objects.get_for_model(Device)])
+ et.object_types.set([device_object_type])
class TagTest(APIViewTestCases.APIViewTestCase):
@@ -513,6 +518,7 @@ class TagTest(APIViewTestCases.APIViewTestCase):
{
'name': 'Tag 4',
'slug': 'tag-4',
+ 'weight': 1000,
},
{
'name': 'Tag 5',
@@ -527,6 +533,24 @@ class TagTest(APIViewTestCases.APIViewTestCase):
'description': 'New description',
}
+ @classmethod
+ def setUpTestData(cls):
+
+ tags = (
+ Tag(name='Tag 1', slug='tag-1'),
+ Tag(name='Tag 2', slug='tag-2'),
+ Tag(name='Tag 3', slug='tag-3', weight=26),
+ )
+ Tag.objects.bulk_create(tags)
+
+
+class TaggedItemTest(
+ APIViewTestCases.GetObjectViewTestCase,
+ APIViewTestCases.ListObjectsViewTestCase
+):
+ model = TaggedItem
+ brief_fields = ['display', 'id', 'object', 'object_id', 'object_type', 'tag', 'url']
+
@classmethod
def setUpTestData(cls):
@@ -537,6 +561,16 @@ class TagTest(APIViewTestCases.APIViewTestCase):
)
Tag.objects.bulk_create(tags)
+ sites = (
+ Site(name='Site 1', slug='site-1'),
+ Site(name='Site 2', slug='site-2'),
+ Site(name='Site 3', slug='site-3'),
+ )
+ Site.objects.bulk_create(sites)
+ sites[0].tags.set([tags[0], tags[1]])
+ sites[1].tags.set([tags[1], tags[2]])
+ sites[2].tags.set([tags[2], tags[0]])
+
# TODO: Standardize to APIViewTestCase (needs create & update tests)
class ImageAttachmentTest(
@@ -721,6 +755,10 @@ class ConfigTemplateTest(APIViewTestCases.APIViewTestCase):
{
'name': 'Config Template 4',
'template_code': 'Foo: {{ foo }}',
+ 'mime_type': 'text/plain',
+ 'file_name': 'output4',
+ 'file_extension': 'txt',
+ 'as_attachment': True,
},
{
'name': 'Config Template 5',
@@ -744,7 +782,7 @@ class ConfigTemplateTest(APIViewTestCases.APIViewTestCase):
),
ConfigTemplate(
name='Config Template 2',
- template_code='Bar: {{ bar }}'
+ template_code='Bar: {{ bar }}',
),
ConfigTemplate(
name='Config Template 3',
diff --git a/netbox/extras/tests/test_filtersets.py b/netbox/extras/tests/test_filtersets.py
index cf914e665..987dfe0ff 100644
--- a/netbox/extras/tests/test_filtersets.py
+++ b/netbox/extras/tests/test_filtersets.py
@@ -616,16 +616,39 @@ class BookmarkTestCase(TestCase, BaseFilterSetTests):
class ExportTemplateTestCase(TestCase, ChangeLoggedFilterSetTests):
queryset = ExportTemplate.objects.all()
filterset = ExportTemplateFilterSet
- ignore_fields = ('template_code', 'data_path')
+ ignore_fields = ('template_code', 'environment_params', 'data_path')
@classmethod
def setUpTestData(cls):
object_types = ObjectType.objects.filter(model__in=['site', 'rack', 'device'])
export_templates = (
- ExportTemplate(name='Export Template 1', template_code='TESTING', description='foobar1'),
- ExportTemplate(name='Export Template 2', template_code='TESTING', description='foobar2'),
- ExportTemplate(name='Export Template 3', template_code='TESTING'),
+ ExportTemplate(
+ name='Export Template 1',
+ template_code='TESTING',
+ description='foobar1',
+ mime_type='text/foo',
+ file_name='foo',
+ file_extension='foo',
+ as_attachment=True,
+ ),
+ ExportTemplate(
+ name='Export Template 2',
+ template_code='TESTING',
+ description='foobar2',
+ mime_type='text/bar',
+ file_name='bar',
+ file_extension='bar',
+ as_attachment=True,
+ ),
+ ExportTemplate(
+ name='Export Template 3',
+ template_code='TESTING',
+ mime_type='text/baz',
+ file_name='baz',
+ file_extension='baz',
+ as_attachment=False,
+ ),
)
ExportTemplate.objects.bulk_create(export_templates)
for i, et in enumerate(export_templates):
@@ -649,6 +672,22 @@ class ExportTemplateTestCase(TestCase, ChangeLoggedFilterSetTests):
params = {'description': ['foobar1', 'foobar2']}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+ def test_mime_type(self):
+ params = {'mime_type': ['text/foo', 'text/bar']}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+ def test_file_name(self):
+ params = {'file_name': ['foo', 'bar']}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+ def test_file_extension(self):
+ params = {'file_extension': ['foo', 'bar']}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+ def test_as_attachment(self):
+ params = {'as_attachment': True}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
class ImageAttachmentTestCase(TestCase, ChangeLoggedFilterSetTests):
queryset = ImageAttachment.objects.all()
@@ -884,7 +923,8 @@ class ConfigContextTestCase(TestCase, ChangeLoggedFilterSetTests):
DeviceRole(name='Device Role 2', slug='device-role-2'),
DeviceRole(name='Device Role 3', slug='device-role-3'),
)
- DeviceRole.objects.bulk_create(device_roles)
+ for device_role in device_roles:
+ device_role.save()
platforms = (
Platform(name='Platform 1', slug='platform-1'),
@@ -1067,9 +1107,32 @@ class ConfigTemplateTestCase(TestCase, ChangeLoggedFilterSetTests):
@classmethod
def setUpTestData(cls):
config_templates = (
- ConfigTemplate(name='Config Template 1', template_code='TESTING', description='foobar1'),
- ConfigTemplate(name='Config Template 2', template_code='TESTING', description='foobar2'),
- ConfigTemplate(name='Config Template 3', template_code='TESTING'),
+ ConfigTemplate(
+ name='Config Template 1',
+ template_code='TESTING',
+ description='foobar1',
+ mime_type='text/foo',
+ file_name='foo',
+ file_extension='foo',
+ as_attachment=True,
+ ),
+ ConfigTemplate(
+ name='Config Template 2',
+ template_code='TESTING',
+ description='foobar2',
+ mime_type='text/bar',
+ file_name='bar',
+ file_extension='bar',
+ as_attachment=True,
+ ),
+ ConfigTemplate(
+ name='Config Template 3',
+ template_code='TESTING',
+ mime_type='text/baz',
+ file_name='baz',
+ file_extension='baz',
+ as_attachment=False,
+ ),
)
ConfigTemplate.objects.bulk_create(config_templates)
@@ -1085,6 +1148,22 @@ class ConfigTemplateTestCase(TestCase, ChangeLoggedFilterSetTests):
params = {'description': ['foobar1', 'foobar2']}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+ def test_mime_type(self):
+ params = {'mime_type': ['text/foo', 'text/bar']}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+ def test_file_name(self):
+ params = {'file_name': ['foo', 'bar']}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+ def test_file_extension(self):
+ params = {'file_extension': ['foo', 'bar']}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+ def test_as_attachment(self):
+ params = {'as_attachment': True}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
class TagTestCase(TestCase, ChangeLoggedFilterSetTests):
queryset = Tag.objects.all()
@@ -1140,6 +1219,7 @@ class TagTestCase(TestCase, ChangeLoggedFilterSetTests):
'module',
'modulebay',
'moduletype',
+ 'moduletypeprofile',
'platform',
'powerfeed',
'poweroutlet',
@@ -1196,7 +1276,7 @@ class TagTestCase(TestCase, ChangeLoggedFilterSetTests):
tags = (
Tag(name='Tag 1', slug='tag-1', color='ff0000', description='foobar1'),
Tag(name='Tag 2', slug='tag-2', color='00ff00', description='foobar2'),
- Tag(name='Tag 3', slug='tag-3', color='0000ff'),
+ Tag(name='Tag 3', slug='tag-3', color='0000ff', weight=1000),
)
Tag.objects.bulk_create(tags)
tags[0].object_types.add(object_types['site'])
@@ -1249,6 +1329,69 @@ class TagTestCase(TestCase, ChangeLoggedFilterSetTests):
['Tag 2', 'Tag 3']
)
+ def test_weight(self):
+ params = {'weight': [1000]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
+
+ params = {'weight': [0]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
+
+
+class TaggedItemFilterSetTestCase(TestCase):
+ queryset = TaggedItem.objects.all()
+ filterset = TaggedItemFilterSet
+
+ @classmethod
+ def setUpTestData(cls):
+ tags = (
+ Tag(name='Tag 1', slug='tag-1'),
+ Tag(name='Tag 2', slug='tag-2'),
+ Tag(name='Tag 3', slug='tag-3'),
+ )
+ Tag.objects.bulk_create(tags)
+
+ sites = (
+ Site(name='Site 1', slug='site-1'),
+ Site(name='Site 2', slug='site-2'),
+ Site(name='Site 3', slug='site-3'),
+ )
+ Site.objects.bulk_create(sites)
+ sites[0].tags.add(tags[0])
+ sites[1].tags.add(tags[1])
+ sites[2].tags.add(tags[2])
+
+ tenants = (
+ Tenant(name='Tenant 1', slug='tenant-1'),
+ Tenant(name='Tenant 2', slug='tenant-2'),
+ Tenant(name='Tenant 3', slug='tenant-3'),
+ )
+ Tenant.objects.bulk_create(tenants)
+ tenants[0].tags.add(tags[0])
+ tenants[1].tags.add(tags[1])
+ tenants[2].tags.add(tags[2])
+
+ def test_tag(self):
+ tags = Tag.objects.all()[:2]
+ params = {'tag': [tags[0].slug, tags[1].slug]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+ params = {'tag_id': [tags[0].pk, tags[1].pk]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+
+ def test_object_type(self):
+ object_type = ObjectType.objects.get_for_model(Site)
+ params = {'object_type': 'dcim.site'}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
+ params = {'object_type_id': [object_type.pk]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
+
+ def test_object_id(self):
+ site_ids = Site.objects.values_list('pk', flat=True)
+ params = {
+ 'object_type': 'dcim.site',
+ 'object_id': site_ids[:2],
+ }
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
class ChangeLoggedFilterSetTestCase(TestCase):
"""
diff --git a/netbox/extras/tests/test_models.py b/netbox/extras/tests/test_models.py
index c90390dd1..bf05a8c18 100644
--- a/netbox/extras/tests/test_models.py
+++ b/netbox/extras/tests/test_models.py
@@ -10,6 +10,40 @@ from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMac
class TagTest(TestCase):
+ def test_default_ordering_weight_then_name_is_set(self):
+ Tag.objects.create(name='Tag 1', slug='tag-1', weight=100)
+ Tag.objects.create(name='Tag 2', slug='tag-2')
+ Tag.objects.create(name='Tag 3', slug='tag-3', weight=10)
+ Tag.objects.create(name='Tag 4', slug='tag-4', weight=10)
+
+ tags = Tag.objects.all()
+
+ self.assertEqual(tags[0].slug, 'tag-2')
+ self.assertEqual(tags[1].slug, 'tag-3')
+ self.assertEqual(tags[2].slug, 'tag-4')
+ self.assertEqual(tags[3].slug, 'tag-1')
+
+ def test_tag_related_manager_ordering_weight_then_name(self):
+ tags = [
+ Tag.objects.create(name='Tag 1', slug='tag-1', weight=100),
+ Tag.objects.create(name='Tag 2', slug='tag-2'),
+ Tag.objects.create(name='Tag 3', slug='tag-3', weight=10),
+ Tag.objects.create(name='Tag 4', slug='tag-4', weight=10),
+ ]
+
+ site = Site.objects.create(name='Site 1')
+ for tag in tags:
+ site.tags.add(tag)
+ site.save()
+
+ site = Site.objects.first()
+ tags = site.tags.all()
+
+ self.assertEqual(tags[0].slug, 'tag-2')
+ self.assertEqual(tags[1].slug, 'tag-3')
+ self.assertEqual(tags[2].slug, 'tag-4')
+ self.assertEqual(tags[3].slug, 'tag-1')
+
def test_create_tag_unicode(self):
tag = Tag(name='Testing Unicode: 台灣')
tag.save()
diff --git a/netbox/extras/tests/test_utils.py b/netbox/extras/tests/test_utils.py
new file mode 100644
index 000000000..b851acab8
--- /dev/null
+++ b/netbox/extras/tests/test_utils.py
@@ -0,0 +1,19 @@
+from django.test import TestCase
+
+from extras.models import ExportTemplate
+from extras.utils import filename_from_model
+from tenancy.models import ContactGroup, TenantGroup
+from wireless.models import WirelessLANGroup
+
+
+class FilenameFromModelTests(TestCase):
+ def test_expected_output(self):
+ cases = (
+ (ExportTemplate, 'netbox_export_templates'),
+ (ContactGroup, 'netbox_contact_groups'),
+ (TenantGroup, 'netbox_tenant_groups'),
+ (WirelessLANGroup, 'netbox_wireless_lan_groups'),
+ )
+
+ for model, expected in cases:
+ self.assertEqual(filename_from_model(model), expected)
diff --git a/netbox/extras/tests/test_views.py b/netbox/extras/tests/test_views.py
index 5d82fae4c..6378b29b8 100644
--- a/netbox/extras/tests/test_views.py
+++ b/netbox/extras/tests/test_views.py
@@ -301,11 +301,14 @@ class ExportTemplateTestCase(ViewTestCases.PrimaryObjectViewTestCase):
def setUpTestData(cls):
site_type = ObjectType.objects.get_for_model(Site)
TEMPLATE_CODE = """{% for object in queryset %}{{ object }}{% endfor %}"""
+ ENVIRONMENT_PARAMS = """{"trim_blocks": true}"""
export_templates = (
ExportTemplate(name='Export Template 1', template_code=TEMPLATE_CODE),
- ExportTemplate(name='Export Template 2', template_code=TEMPLATE_CODE),
- ExportTemplate(name='Export Template 3', template_code=TEMPLATE_CODE),
+ ExportTemplate(
+ name='Export Template 2', template_code=TEMPLATE_CODE, environment_params={"trim_blocks": True}
+ ),
+ ExportTemplate(name='Export Template 3', template_code=TEMPLATE_CODE, file_name='export_template_3')
)
ExportTemplate.objects.bulk_create(export_templates)
for et in export_templates:
@@ -315,13 +318,15 @@ class ExportTemplateTestCase(ViewTestCases.PrimaryObjectViewTestCase):
'name': 'Export Template X',
'object_types': [site_type.pk],
'template_code': TEMPLATE_CODE,
+ 'environment_params': ENVIRONMENT_PARAMS,
+ 'file_name': 'template_x',
}
cls.csv_data = (
- "name,object_types,template_code",
- f"Export Template 4,dcim.site,{TEMPLATE_CODE}",
- f"Export Template 5,dcim.site,{TEMPLATE_CODE}",
- f"Export Template 6,dcim.site,{TEMPLATE_CODE}",
+ "name,object_types,template_code,file_name",
+ f"Export Template 4,dcim.site,{TEMPLATE_CODE},",
+ f"Export Template 5,dcim.site,{TEMPLATE_CODE},template_5",
+ f"Export Template 6,dcim.site,{TEMPLATE_CODE},",
)
cls.csv_update_data = (
@@ -441,8 +446,8 @@ class TagTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
tags = (
Tag(name='Tag 1', slug='tag-1'),
- Tag(name='Tag 2', slug='tag-2'),
- Tag(name='Tag 3', slug='tag-3'),
+ Tag(name='Tag 2', slug='tag-2', weight=1),
+ Tag(name='Tag 3', slug='tag-3', weight=32767),
)
Tag.objects.bulk_create(tags)
@@ -451,13 +456,14 @@ class TagTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
'slug': 'tag-x',
'color': 'c0c0c0',
'comments': 'Some comments',
+ 'weight': 11,
}
cls.csv_data = (
- "name,slug,color,description",
- "Tag 4,tag-4,ff0000,Fourth tag",
- "Tag 5,tag-5,00ff00,Fifth tag",
- "Tag 6,tag-6,0000ff,Sixth tag",
+ "name,slug,color,description,weight",
+ "Tag 4,tag-4,ff0000,Fourth tag,0",
+ "Tag 5,tag-5,00ff00,Fifth tag,1111",
+ "Tag 6,tag-6,0000ff,Sixth tag,0",
)
cls.csv_update_data = (
@@ -535,11 +541,23 @@ class ConfigTemplateTestCase(
@classmethod
def setUpTestData(cls):
TEMPLATE_CODE = """Foo: {{ foo }}"""
+ ENVIRONMENT_PARAMS = """{"trim_blocks": true}"""
config_templates = (
- ConfigTemplate(name='Config Template 1', template_code=TEMPLATE_CODE),
- ConfigTemplate(name='Config Template 2', template_code=TEMPLATE_CODE),
- ConfigTemplate(name='Config Template 3', template_code=TEMPLATE_CODE),
+ ConfigTemplate(
+ name='Config Template 1',
+ template_code=TEMPLATE_CODE)
+ ,
+ ConfigTemplate(
+ name='Config Template 2',
+ template_code=TEMPLATE_CODE,
+ environment_params={"trim_blocks": True},
+ ),
+ ConfigTemplate(
+ name='Config Template 3',
+ template_code=TEMPLATE_CODE,
+ file_name='config_template_3',
+ ),
)
ConfigTemplate.objects.bulk_create(config_templates)
@@ -547,6 +565,8 @@ class ConfigTemplateTestCase(
'name': 'Config Template X',
'description': 'Config template',
'template_code': TEMPLATE_CODE,
+ 'environment_params': ENVIRONMENT_PARAMS,
+ 'file_name': 'config_x',
}
cls.csv_update_data = (
@@ -558,6 +578,10 @@ class ConfigTemplateTestCase(
cls.bulk_edit_data = {
'description': 'New description',
+ 'mime_type': 'text/html',
+ 'file_name': 'output',
+ 'file_extension': 'html',
+ 'as_attachment': True,
}
diff --git a/netbox/extras/utils.py b/netbox/extras/utils.py
index efe7ada5b..155597c30 100644
--- a/netbox/extras/utils.py
+++ b/netbox/extras/utils.py
@@ -1,6 +1,7 @@
import importlib
from django.core.exceptions import ImproperlyConfigured
+from django.db import models
from taggit.managers import _TaggableManager
from netbox.context import current_request
@@ -15,6 +16,23 @@ __all__ = (
)
+def filename_from_model(model: models.Model) -> str:
+ """Standardises how we generate filenames from model class for exports"""
+ base = model._meta.verbose_name_plural.lower().replace(' ', '_')
+ return f'netbox_{base}'
+
+
+def filename_from_object(context: dict) -> str:
+ """Standardises how we generate filenames from model class for exports"""
+ if 'device' in context:
+ base = f"{context['device'].name or 'config'}"
+ elif 'virtualmachine' in context:
+ base = f"{context['virtualmachine'].name or 'config'}"
+ else:
+ base = 'config'
+ return base
+
+
def is_taggable(obj):
"""
Return True if the instance can have Tags assigned to it; False otherwise.
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 9cb9dd54a..2833cec0d 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -12,7 +12,6 @@ from django.utils.translation import gettext as _
from django.views.generic import View
from core.choices import ManagedFileRootPathChoices
-from core.forms import ManagedFileForm
from core.models import Job
from core.tables import JobTable
from dcim.models import Device, DeviceRole, Platform
@@ -1163,7 +1162,7 @@ class DashboardWidgetDeleteView(LoginRequiredMixin, View):
@register_model_view(ScriptModule, 'edit')
class ScriptModuleCreateView(generic.ObjectEditView):
queryset = ScriptModule.objects.all()
- form = ManagedFileForm
+ form = forms.ScriptFileForm
def alter_object(self, obj, *args, **kwargs):
obj.file_root = ManagedFileRootPathChoices.SCRIPTS
diff --git a/netbox/extras/webhooks.py b/netbox/extras/webhooks.py
index 889c97ac2..368075217 100644
--- a/netbox/extras/webhooks.py
+++ b/netbox/extras/webhooks.py
@@ -3,10 +3,10 @@ import hmac
import logging
import requests
-from django.conf import settings
from django_rq import job
from jinja2.exceptions import TemplateError
+from utilities.proxy import resolve_proxies
from .constants import WEBHOOK_EVENT_TYPES
logger = logging.getLogger('netbox.webhooks')
@@ -63,9 +63,10 @@ def send_webhook(event_rule, model_name, event_type, data, timestamp, username,
raise e
# Prepare the HTTP request
+ url = webhook.render_payload_url(context)
params = {
'method': webhook.http_method,
- 'url': webhook.render_payload_url(context),
+ 'url': url,
'headers': headers,
'data': body.encode('utf8'),
}
@@ -88,7 +89,8 @@ def send_webhook(event_rule, model_name, event_type, data, timestamp, username,
session.verify = webhook.ssl_verification
if webhook.ca_file_path:
session.verify = webhook.ca_file_path
- response = session.send(prepared_request, proxies=settings.HTTP_PROXIES)
+ proxies = resolve_proxies(url=url, context={'client': webhook})
+ response = session.send(prepared_request, proxies=proxies)
if 200 <= response.status_code <= 299:
logger.info(f"Request succeeded; response status {response.status_code}")
diff --git a/netbox/ipam/api/serializers_/ip.py b/netbox/ipam/api/serializers_/ip.py
index bfc7ac546..6f815b5ce 100644
--- a/netbox/ipam/api/serializers_/ip.py
+++ b/netbox/ipam/api/serializers_/ip.py
@@ -147,7 +147,8 @@ class IPRangeSerializer(NetBoxModelSerializer):
fields = [
'id', 'url', 'display_url', 'display', 'family', 'start_address', 'end_address', 'size', 'vrf', 'tenant',
'status', 'role', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
- 'mark_utilized', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
+ 'mark_populated', 'mark_utilized', 'description', 'comments', 'tags', 'custom_fields', 'created',
+ 'last_updated',
]
brief_fields = ('id', 'url', 'display', 'family', 'start_address', 'end_address', 'description')
diff --git a/netbox/ipam/api/serializers_/vlans.py b/netbox/ipam/api/serializers_/vlans.py
index 9b5501dc5..a6f428343 100644
--- a/netbox/ipam/api/serializers_/vlans.py
+++ b/netbox/ipam/api/serializers_/vlans.py
@@ -37,6 +37,7 @@ class VLANGroupSerializer(NetBoxModelSerializer):
scope = serializers.SerializerMethodField(read_only=True)
vid_ranges = IntegerRangeSerializer(many=True, required=False)
utilization = serializers.CharField(read_only=True)
+ tenant = TenantSerializer(nested=True, required=False, allow_null=True)
# Related object counts
vlan_count = RelatedObjectCountField('vlans')
@@ -45,7 +46,7 @@ class VLANGroupSerializer(NetBoxModelSerializer):
model = VLANGroup
fields = [
'id', 'url', 'display_url', 'display', 'name', 'slug', 'scope_type', 'scope_id', 'scope', 'vid_ranges',
- 'description', 'tags', 'custom_fields', 'created', 'last_updated', 'vlan_count', 'utilization'
+ 'tenant', 'description', 'tags', 'custom_fields', 'created', 'last_updated', 'vlan_count', 'utilization'
]
brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'vlan_count')
validators = []
diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py
index 12a36fbe1..ba8b45e14 100644
--- a/netbox/ipam/filtersets.py
+++ b/netbox/ipam/filtersets.py
@@ -478,7 +478,7 @@ class IPRangeFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
class Meta:
model = IPRange
- fields = ('id', 'mark_utilized', 'size', 'description')
+ fields = ('id', 'mark_populated', 'mark_utilized', 'size', 'description')
def search(self, queryset, name, value):
if not value.strip():
@@ -867,7 +867,7 @@ class FHRPGroupAssignmentFilterSet(ChangeLoggedModelFilterSet):
)
-class VLANGroupFilterSet(OrganizationalModelFilterSet):
+class VLANGroupFilterSet(OrganizationalModelFilterSet, TenancyFilterSet):
scope_type = ContentTypeFilter()
region = django_filters.NumberFilter(
method='filter_scope'
diff --git a/netbox/ipam/forms/bulk_edit.py b/netbox/ipam/forms/bulk_edit.py
index 2a071da8c..411208eeb 100644
--- a/netbox/ipam/forms/bulk_edit.py
+++ b/netbox/ipam/forms/bulk_edit.py
@@ -296,6 +296,11 @@ class IPRangeBulkEditForm(NetBoxModelBulkEditForm):
queryset=Role.objects.all(),
required=False
)
+ mark_populated = forms.NullBooleanField(
+ required=False,
+ widget=BulkEditNullBooleanSelect(),
+ label=_('Treat as populated')
+ )
mark_utilized = forms.NullBooleanField(
required=False,
widget=BulkEditNullBooleanSelect(),
@@ -435,11 +440,17 @@ class VLANGroupBulkEditForm(NetBoxModelBulkEditForm):
label=_('VLAN ID ranges'),
required=False
)
+ tenant = DynamicModelChoiceField(
+ label=_('Tenant'),
+ queryset=Tenant.objects.all(),
+ required=False
+ )
model = VLANGroup
fieldsets = (
FieldSet('site', 'vid_ranges', 'description'),
FieldSet('scope_type', 'scope', name=_('Scope')),
+ FieldSet('tenant', name=_('Tenancy')),
)
nullable_fields = ('description', 'scope')
diff --git a/netbox/ipam/forms/bulk_import.py b/netbox/ipam/forms/bulk_import.py
index 65a6e5601..8cc034696 100644
--- a/netbox/ipam/forms/bulk_import.py
+++ b/netbox/ipam/forms/bulk_import.py
@@ -268,8 +268,8 @@ class IPRangeImportForm(NetBoxModelImportForm):
class Meta:
model = IPRange
fields = (
- 'start_address', 'end_address', 'vrf', 'tenant', 'status', 'role', 'mark_utilized', 'description',
- 'comments', 'tags',
+ 'start_address', 'end_address', 'vrf', 'tenant', 'status', 'role', 'mark_populated', 'mark_utilized',
+ 'description', 'comments', 'tags',
)
@@ -445,10 +445,17 @@ class VLANGroupImportForm(NetBoxModelImportForm):
vid_ranges = NumericRangeArrayField(
required=False
)
+ tenant = CSVModelChoiceField(
+ label=_('Tenant'),
+ queryset=Tenant.objects.all(),
+ required=False,
+ to_field_name='name',
+ help_text=_('Assigned tenant')
+ )
class Meta:
model = VLANGroup
- fields = ('name', 'slug', 'scope_type', 'scope_id', 'vid_ranges', 'description', 'tags')
+ fields = ('name', 'slug', 'scope_type', 'scope_id', 'vid_ranges', 'tenant', 'description', 'tags')
labels = {
'scope_id': 'Scope ID',
}
diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py
index e6aef3054..f8184a0fb 100644
--- a/netbox/ipam/forms/filtersets.py
+++ b/netbox/ipam/forms/filtersets.py
@@ -266,7 +266,7 @@ class IPRangeFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
model = IPRange
fieldsets = (
FieldSet('q', 'filter_id', 'tag'),
- FieldSet('family', 'vrf_id', 'status', 'role_id', 'mark_utilized', name=_('Attributes')),
+ FieldSet('family', 'vrf_id', 'status', 'role_id', 'mark_populated', 'mark_utilized', name=_('Attributes')),
FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
)
family = forms.ChoiceField(
@@ -291,6 +291,13 @@ class IPRangeFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
null_option='None',
label=_('Role')
)
+ mark_populated = forms.NullBooleanField(
+ required=False,
+ label=_('Treat as populated'),
+ widget=forms.Select(
+ choices=BOOLEAN_WITH_BLANK_CHOICES
+ )
+ )
mark_utilized = forms.NullBooleanField(
required=False,
label=_('Treat as fully utilized'),
@@ -416,12 +423,13 @@ class FHRPGroupFilterForm(NetBoxModelFilterSetForm):
tag = TagFilterField(model)
-class VLANGroupFilterForm(NetBoxModelFilterSetForm):
+class VLANGroupFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
fieldsets = (
FieldSet('q', 'filter_id', 'tag'),
FieldSet('region', 'sitegroup', 'site', 'location', 'rack', name=_('Location')),
FieldSet('cluster_group', 'cluster', name=_('Cluster')),
FieldSet('contains_vid', name=_('VLANs')),
+ FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
)
model = VLANGroup
region = DynamicModelMultipleChoiceField(
diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py
index d7c6b17df..5ce3e9851 100644
--- a/netbox/ipam/forms/model_forms.py
+++ b/netbox/ipam/forms/model_forms.py
@@ -257,8 +257,8 @@ class IPRangeForm(TenancyForm, NetBoxModelForm):
fieldsets = (
FieldSet(
- 'vrf', 'start_address', 'end_address', 'role', 'status', 'mark_utilized', 'description', 'tags',
- name=_('IP Range')
+ 'vrf', 'start_address', 'end_address', 'role', 'status', 'mark_populated', 'mark_utilized', 'description',
+ 'tags', name=_('IP Range')
),
FieldSet('tenant_group', 'tenant', name=_('Tenancy')),
)
@@ -266,8 +266,8 @@ class IPRangeForm(TenancyForm, NetBoxModelForm):
class Meta:
model = IPRange
fields = [
- 'vrf', 'start_address', 'end_address', 'status', 'role', 'tenant_group', 'tenant', 'mark_utilized',
- 'description', 'comments', 'tags',
+ 'vrf', 'start_address', 'end_address', 'status', 'role', 'tenant_group', 'tenant', 'mark_populated',
+ 'mark_utilized', 'description', 'comments', 'tags',
]
@@ -616,7 +616,7 @@ class FHRPGroupAssignmentForm(forms.ModelForm):
return group
-class VLANGroupForm(NetBoxModelForm):
+class VLANGroupForm(TenancyForm, NetBoxModelForm):
slug = SlugField()
vid_ranges = NumericRangeArrayField(
label=_('VLAN IDs')
@@ -639,12 +639,13 @@ class VLANGroupForm(NetBoxModelForm):
FieldSet('name', 'slug', 'description', 'tags', name=_('VLAN Group')),
FieldSet('vid_ranges', name=_('Child VLANs')),
FieldSet('scope_type', 'scope', name=_('Scope')),
+ FieldSet('tenant_group', 'tenant', name=_('Tenancy')),
)
class Meta:
model = VLANGroup
fields = [
- 'name', 'slug', 'description', 'vid_ranges', 'scope_type', 'tags',
+ 'name', 'slug', 'description', 'vid_ranges', 'scope_type', 'tenant_group', 'tenant', 'tags',
]
def __init__(self, *args, **kwargs):
diff --git a/netbox/ipam/graphql/enums.py b/netbox/ipam/graphql/enums.py
new file mode 100644
index 000000000..34fb1a6fd
--- /dev/null
+++ b/netbox/ipam/graphql/enums.py
@@ -0,0 +1,27 @@
+import strawberry
+
+from ipam.choices import *
+
+__all__ = (
+ 'FHRPGroupAuthTypeEnum',
+ 'FHRPGroupProtocolEnum',
+ 'IPAddressFamilyEnum',
+ 'IPAddressRoleEnum',
+ 'IPAddressStatusEnum',
+ 'IPRangeStatusEnum',
+ 'PrefixStatusEnum',
+ 'ServiceProtocolEnum',
+ 'VLANStatusEnum',
+ 'VLANQinQRoleEnum',
+)
+
+FHRPGroupAuthTypeEnum = strawberry.enum(FHRPGroupAuthTypeChoices.as_enum())
+FHRPGroupProtocolEnum = strawberry.enum(FHRPGroupProtocolChoices.as_enum())
+IPAddressFamilyEnum = strawberry.enum(IPAddressFamilyChoices.as_enum())
+IPAddressRoleEnum = strawberry.enum(IPAddressRoleChoices.as_enum())
+IPAddressStatusEnum = strawberry.enum(IPAddressStatusChoices.as_enum())
+IPRangeStatusEnum = strawberry.enum(IPRangeStatusChoices.as_enum())
+PrefixStatusEnum = strawberry.enum(PrefixStatusChoices.as_enum())
+ServiceProtocolEnum = strawberry.enum(ServiceProtocolChoices.as_enum())
+VLANStatusEnum = strawberry.enum(VLANStatusChoices.as_enum())
+VLANQinQRoleEnum = strawberry.enum(VLANQinQRoleChoices.as_enum())
diff --git a/netbox/ipam/graphql/filter_mixins.py b/netbox/ipam/graphql/filter_mixins.py
new file mode 100644
index 000000000..511850285
--- /dev/null
+++ b/netbox/ipam/graphql/filter_mixins.py
@@ -0,0 +1,25 @@
+from dataclasses import dataclass
+from typing import Annotated, TYPE_CHECKING
+
+import strawberry
+import strawberry_django
+
+from core.graphql.filter_mixins import BaseFilterMixin
+
+if TYPE_CHECKING:
+ from netbox.graphql.filter_lookups import IntegerLookup
+ from .enums import *
+
+__all__ = (
+ 'ServiceBaseFilterMixin',
+)
+
+
+@dataclass
+class ServiceBaseFilterMixin(BaseFilterMixin):
+ protocol: Annotated['ServiceProtocolEnum', strawberry.lazy('ipam.graphql.enums')] | None = (
+ strawberry_django.filter_field()
+ )
+ ports: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
+ strawberry_django.filter_field()
+ )
diff --git a/netbox/ipam/graphql/filters.py b/netbox/ipam/graphql/filters.py
index 1b0e0133b..2f4e185f1 100644
--- a/netbox/ipam/graphql/filters.py
+++ b/netbox/ipam/graphql/filters.py
@@ -1,7 +1,28 @@
-import strawberry_django
+from datetime import date
+from typing import Annotated, TYPE_CHECKING
-from ipam import filtersets, models
-from netbox.graphql.filter_mixins import autotype_decorator, BaseFilterMixin
+import netaddr
+import strawberry
+import strawberry_django
+from django.db.models import Q
+from netaddr.core import AddrFormatError
+from strawberry.scalars import ID
+from strawberry_django import FilterLookup, DateFilterLookup
+
+from core.graphql.filter_mixins import BaseObjectTypeFilterMixin, ChangeLogFilterMixin
+from dcim.graphql.filter_mixins import ScopedFilterMixin
+from ipam import models
+from ipam.graphql.filter_mixins import ServiceBaseFilterMixin
+from netbox.graphql.filter_mixins import NetBoxModelFilterMixin, OrganizationalModelFilterMixin, PrimaryModelFilterMixin
+from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin
+
+if TYPE_CHECKING:
+ from netbox.graphql.filter_lookups import IntegerArrayLookup, IntegerLookup
+ from core.graphql.filters import ContentTypeFilter
+ from dcim.graphql.filters import DeviceFilter, SiteFilter
+ from virtualization.graphql.filters import VirtualMachineFilter
+ from vpn.graphql.filters import L2VPNFilter
+ from .enums import *
__all__ = (
'ASNFilter',
@@ -26,108 +47,258 @@ __all__ = (
@strawberry_django.filter(models.ASN, lookups=True)
-@autotype_decorator(filtersets.ASNFilterSet)
-class ASNFilter(BaseFilterMixin):
- pass
+class ASNFilter(TenancyFilterMixin, PrimaryModelFilterMixin):
+ rir: Annotated['RIRFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
+ rir_id: ID | None = strawberry_django.filter_field()
+ asn: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
+ strawberry_django.filter_field()
+ )
@strawberry_django.filter(models.ASNRange, lookups=True)
-@autotype_decorator(filtersets.ASNRangeFilterSet)
-class ASNRangeFilter(BaseFilterMixin):
- pass
+class ASNRangeFilter(TenancyFilterMixin, OrganizationalModelFilterMixin):
+ name: FilterLookup[str] | None = strawberry_django.filter_field()
+ slug: FilterLookup[str] | None = strawberry_django.filter_field()
+ rir: Annotated['RIRFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
+ rir_id: ID | None = strawberry_django.filter_field()
+ start: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
+ strawberry_django.filter_field()
+ )
+ end: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
+ strawberry_django.filter_field()
+ )
@strawberry_django.filter(models.Aggregate, lookups=True)
-@autotype_decorator(filtersets.AggregateFilterSet)
-class AggregateFilter(BaseFilterMixin):
- pass
+class AggregateFilter(ContactFilterMixin, TenancyFilterMixin, PrimaryModelFilterMixin):
+ prefix: Annotated['PrefixFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
+ prefix_id: ID | None = strawberry_django.filter_field()
+ rir: Annotated['RIRFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
+ rir_id: ID | None = strawberry_django.filter_field()
+ date_added: DateFilterLookup[date] | None = strawberry_django.filter_field()
@strawberry_django.filter(models.FHRPGroup, lookups=True)
-@autotype_decorator(filtersets.FHRPGroupFilterSet)
-class FHRPGroupFilter(BaseFilterMixin):
- pass
+class FHRPGroupFilter(PrimaryModelFilterMixin):
+ group_id: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
+ strawberry_django.filter_field()
+ )
+ name: FilterLookup[str] | None = strawberry_django.filter_field()
+ protocol: Annotated['FHRPGroupProtocolEnum', strawberry.lazy('ipam.graphql.enums')] | None = (
+ strawberry_django.filter_field()
+ )
+ auth_type: Annotated['FHRPGroupAuthTypeEnum', strawberry.lazy('ipam.graphql.enums')] | None = (
+ strawberry_django.filter_field()
+ )
+ auth_key: FilterLookup[str] | None = strawberry_django.filter_field()
+ ip_addresses: Annotated['IPAddressFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
@strawberry_django.filter(models.FHRPGroupAssignment, lookups=True)
-@autotype_decorator(filtersets.FHRPGroupAssignmentFilterSet)
-class FHRPGroupAssignmentFilter(BaseFilterMixin):
- pass
+class FHRPGroupAssignmentFilter(BaseObjectTypeFilterMixin, ChangeLogFilterMixin):
+ interface_type: Annotated['ContentTypeFilter', strawberry.lazy('core.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
+ interface_id: FilterLookup[str] | None = strawberry_django.filter_field()
+ group: Annotated['FHRPGroupFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
+ group_id: ID | None = strawberry_django.filter_field()
+ priority: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
+ strawberry_django.filter_field()
+ )
@strawberry_django.filter(models.IPAddress, lookups=True)
-@autotype_decorator(filtersets.IPAddressFilterSet)
-class IPAddressFilter(BaseFilterMixin):
- pass
+class IPAddressFilter(ContactFilterMixin, TenancyFilterMixin, PrimaryModelFilterMixin):
+ address: FilterLookup[str] | None = strawberry_django.filter_field()
+ vrf: Annotated['VRFFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
+ vrf_id: ID | None = strawberry_django.filter_field()
+ status: Annotated['IPAddressStatusEnum', strawberry.lazy('ipam.graphql.enums')] | None = (
+ strawberry_django.filter_field()
+ )
+ role: Annotated['IPAddressRoleEnum', strawberry.lazy('ipam.graphql.enums')] | None = (
+ strawberry_django.filter_field()
+ )
+ assigned_object_type: Annotated['ContentTypeFilter', strawberry.lazy('core.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
+ assigned_object_id: ID | None = strawberry_django.filter_field()
+ nat_inside: Annotated['IPAddressFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
+ nat_inside_id: ID | None = strawberry_django.filter_field()
+ nat_outside: Annotated['IPAddressFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
+ nat_outside_id: ID | None = strawberry_django.filter_field()
+ dns_name: FilterLookup[str] | None = strawberry_django.filter_field()
+
+ @strawberry_django.filter_field()
+ def parent(self, value: list[str], prefix) -> Q:
+ if not value:
+ return Q()
+ q = Q()
+ for subnet in value:
+ try:
+ query = str(netaddr.IPNetwork(subnet.strip()).cidr)
+ q |= Q(address__net_host_contained=query)
+ except (AddrFormatError, ValueError):
+ return Q()
+ return q
@strawberry_django.filter(models.IPRange, lookups=True)
-@autotype_decorator(filtersets.IPRangeFilterSet)
-class IPRangeFilter(BaseFilterMixin):
- pass
+class IPRangeFilter(ContactFilterMixin, TenancyFilterMixin, PrimaryModelFilterMixin):
+ start_address: FilterLookup[str] | None = strawberry_django.filter_field()
+ end_address: FilterLookup[str] | None = strawberry_django.filter_field()
+ size: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
+ strawberry_django.filter_field()
+ )
+ vrf: Annotated['VRFFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
+ vrf_id: ID | None = strawberry_django.filter_field()
+ status: Annotated['IPRangeStatusEnum', strawberry.lazy('ipam.graphql.enums')] | None = (
+ strawberry_django.filter_field()
+ )
+ role: Annotated['IPAddressRoleEnum', strawberry.lazy('ipam.graphql.enums')] | None = (
+ strawberry_django.filter_field()
+ )
+ mark_utilized: FilterLookup[bool] | None = strawberry_django.filter_field()
+
+ @strawberry_django.filter_field()
+ def parent(self, value: list[str], prefix) -> Q:
+ if not value:
+ return Q()
+ q = Q()
+ for subnet in value:
+ try:
+ query = str(netaddr.IPNetwork(subnet.strip()).cidr)
+ q |= Q(start_address__net_host_contained=query, end_address__net_host_contained=query)
+ except (AddrFormatError, ValueError):
+ return Q()
+ return q
@strawberry_django.filter(models.Prefix, lookups=True)
-@autotype_decorator(filtersets.PrefixFilterSet)
-class PrefixFilter(BaseFilterMixin):
- pass
+class PrefixFilter(ContactFilterMixin, ScopedFilterMixin, TenancyFilterMixin, PrimaryModelFilterMixin):
+ prefix: FilterLookup[str] | None = strawberry_django.filter_field()
+ vrf: Annotated['VRFFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
+ vrf_id: ID | None = strawberry_django.filter_field()
+ vlan: Annotated['VLANFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
+ vlan_id: ID | None = strawberry_django.filter_field()
+ status: Annotated['PrefixStatusEnum', strawberry.lazy('ipam.graphql.enums')] | None = (
+ strawberry_django.filter_field()
+ )
+ role: Annotated['RoleFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
+ role_id: ID | None = strawberry_django.filter_field()
+ is_pool: FilterLookup[bool] | None = strawberry_django.filter_field()
+ mark_utilized: FilterLookup[bool] | None = strawberry_django.filter_field()
@strawberry_django.filter(models.RIR, lookups=True)
-@autotype_decorator(filtersets.RIRFilterSet)
-class RIRFilter(BaseFilterMixin):
- pass
+class RIRFilter(OrganizationalModelFilterMixin):
+ is_private: FilterLookup[bool] | None = strawberry_django.filter_field()
@strawberry_django.filter(models.Role, lookups=True)
-@autotype_decorator(filtersets.RoleFilterSet)
-class RoleFilter(BaseFilterMixin):
- pass
+class RoleFilter(OrganizationalModelFilterMixin):
+ weight: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
+ strawberry_django.filter_field()
+ )
@strawberry_django.filter(models.RouteTarget, lookups=True)
-@autotype_decorator(filtersets.RouteTargetFilterSet)
-class RouteTargetFilter(BaseFilterMixin):
- pass
+class RouteTargetFilter(TenancyFilterMixin, PrimaryModelFilterMixin):
+ name: FilterLookup[str] | None = strawberry_django.filter_field()
@strawberry_django.filter(models.Service, lookups=True)
-@autotype_decorator(filtersets.ServiceFilterSet)
-class ServiceFilter(BaseFilterMixin):
- pass
+class ServiceFilter(ContactFilterMixin, ServiceBaseFilterMixin, PrimaryModelFilterMixin):
+ device: Annotated['DeviceFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
+ device_id: ID | None = strawberry_django.filter_field()
+ virtual_machine: Annotated['VirtualMachineFilter', strawberry.lazy('virtualization.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
+ virtual_machine_id: ID | None = strawberry_django.filter_field()
+ name: FilterLookup[str] | None = strawberry_django.filter_field()
+ ipaddresses: Annotated['IPAddressFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
@strawberry_django.filter(models.ServiceTemplate, lookups=True)
-@autotype_decorator(filtersets.ServiceTemplateFilterSet)
-class ServiceTemplateFilter(BaseFilterMixin):
- pass
+class ServiceTemplateFilter(ServiceBaseFilterMixin, PrimaryModelFilterMixin):
+ name: FilterLookup[str] | None = strawberry_django.filter_field()
@strawberry_django.filter(models.VLAN, lookups=True)
-@autotype_decorator(filtersets.VLANFilterSet)
-class VLANFilter(BaseFilterMixin):
- pass
+class VLANFilter(TenancyFilterMixin, PrimaryModelFilterMixin):
+ site: Annotated['SiteFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field()
+ site_id: ID | None = strawberry_django.filter_field()
+ group: Annotated['VLANGroupFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
+ group_id: ID | None = strawberry_django.filter_field()
+ vid: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
+ strawberry_django.filter_field()
+ )
+ name: FilterLookup[str] | None = strawberry_django.filter_field()
+ status: Annotated['VLANStatusEnum', strawberry.lazy('ipam.graphql.enums')] | None = strawberry_django.filter_field()
+ role: Annotated['RoleFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
+ role_id: ID | None = strawberry_django.filter_field()
+ qinq_svlan: Annotated['VLANFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
+ qinq_svlan_id: ID | None = strawberry_django.filter_field()
+ qinq_cvlan: Annotated['VLANFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
+ qinq_cvlan_id: ID | None = strawberry_django.filter_field()
+ qinq_role: Annotated['VLANQinQRoleEnum', strawberry.lazy('ipam.graphql.enums')] | None = (
+ strawberry_django.filter_field()
+ )
+ l2vpn_terminations: Annotated['L2VPNFilter', strawberry.lazy('vpn.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
@strawberry_django.filter(models.VLANGroup, lookups=True)
-@autotype_decorator(filtersets.VLANGroupFilterSet)
-class VLANGroupFilter(BaseFilterMixin):
- pass
+class VLANGroupFilter(ScopedFilterMixin, OrganizationalModelFilterMixin):
+ vid_ranges: Annotated['IntegerArrayLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
+ strawberry_django.filter_field()
+ )
@strawberry_django.filter(models.VLANTranslationPolicy, lookups=True)
-@autotype_decorator(filtersets.VLANTranslationPolicyFilterSet)
-class VLANTranslationPolicyFilter(BaseFilterMixin):
- pass
+class VLANTranslationPolicyFilter(PrimaryModelFilterMixin):
+ name: FilterLookup[str] | None = strawberry_django.filter_field()
@strawberry_django.filter(models.VLANTranslationRule, lookups=True)
-@autotype_decorator(filtersets.VLANTranslationRuleFilterSet)
-class VLANTranslationRuleFilter(BaseFilterMixin):
- pass
+class VLANTranslationRuleFilter(NetBoxModelFilterMixin):
+ policy: Annotated['VLANTranslationPolicyFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
+ policy_id: ID | None = strawberry_django.filter_field()
+ description: FilterLookup[str] | None = strawberry_django.filter_field()
+ local_vid: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
+ strawberry_django.filter_field()
+ )
+ remote_vid: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = (
+ strawberry_django.filter_field()
+ )
@strawberry_django.filter(models.VRF, lookups=True)
-@autotype_decorator(filtersets.VRFFilterSet)
-class VRFFilter(BaseFilterMixin):
- pass
+class VRFFilter(TenancyFilterMixin, PrimaryModelFilterMixin):
+ name: FilterLookup[str] | None = strawberry_django.filter_field()
+ rd: FilterLookup[str] | None = strawberry_django.filter_field()
+ enforce_unique: FilterLookup[bool] | None = strawberry_django.filter_field()
+ import_targets: Annotated['RouteTargetFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
+ export_targets: Annotated['RouteTargetFilter', strawberry.lazy('ipam.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
diff --git a/netbox/ipam/graphql/types.py b/netbox/ipam/graphql/types.py
index 446ac2f2e..5a4c87dbe 100644
--- a/netbox/ipam/graphql/types.py
+++ b/netbox/ipam/graphql/types.py
@@ -1,4 +1,4 @@
-from typing import Annotated, List, Union
+from typing import Annotated, List, TYPE_CHECKING, Union
import strawberry
import strawberry_django
@@ -11,6 +11,21 @@ from netbox.graphql.types import BaseObjectType, NetBoxObjectType, Organizationa
from .filters import *
from .mixins import IPAddressesMixin
+if TYPE_CHECKING:
+ from dcim.graphql.types import (
+ DeviceType,
+ InterfaceType,
+ LocationType,
+ RackType,
+ RegionType,
+ SiteGroupType,
+ SiteType,
+ )
+ from tenancy.graphql.types import TenantType
+ from virtualization.graphql.types import ClusterGroupType, ClusterType, VMInterfaceType, VirtualMachineType
+ from vpn.graphql.types import L2VPNType, TunnelTerminationType
+ from wireless.graphql.types import WirelessLANType
+
__all__ = (
'ASNType',
'ASNRangeType',
@@ -55,7 +70,8 @@ class BaseIPAddressFamilyType:
@strawberry_django.type(
models.ASN,
fields='__all__',
- filters=ASNFilter
+ filters=ASNFilter,
+ pagination=True
)
class ASNType(NetBoxObjectType):
asn: BigInt
@@ -69,7 +85,8 @@ class ASNType(NetBoxObjectType):
@strawberry_django.type(
models.ASNRange,
fields='__all__',
- filters=ASNRangeFilter
+ filters=ASNRangeFilter,
+ pagination=True
)
class ASNRangeType(NetBoxObjectType):
start: BigInt
@@ -81,7 +98,8 @@ class ASNRangeType(NetBoxObjectType):
@strawberry_django.type(
models.Aggregate,
fields='__all__',
- filters=AggregateFilter
+ filters=AggregateFilter,
+ pagination=True
)
class AggregateType(NetBoxObjectType, BaseIPAddressFamilyType):
prefix: str
@@ -92,7 +110,8 @@ class AggregateType(NetBoxObjectType, BaseIPAddressFamilyType):
@strawberry_django.type(
models.FHRPGroup,
fields='__all__',
- filters=FHRPGroupFilter
+ filters=FHRPGroupFilter,
+ pagination=True
)
class FHRPGroupType(NetBoxObjectType, IPAddressesMixin):
@@ -101,8 +120,9 @@ class FHRPGroupType(NetBoxObjectType, IPAddressesMixin):
@strawberry_django.type(
models.FHRPGroupAssignment,
- exclude=('interface_type', 'interface_id'),
- filters=FHRPGroupAssignmentFilter
+ exclude=['interface_type', 'interface_id'],
+ filters=FHRPGroupAssignmentFilter,
+ pagination=True
)
class FHRPGroupAssignmentType(BaseObjectType):
group: Annotated["FHRPGroupType", strawberry.lazy('ipam.graphql.types')]
@@ -117,8 +137,9 @@ class FHRPGroupAssignmentType(BaseObjectType):
@strawberry_django.type(
models.IPAddress,
- exclude=('assigned_object_type', 'assigned_object_id', 'address'),
- filters=IPAddressFilter
+ exclude=['assigned_object_type', 'assigned_object_id', 'address'],
+ filters=IPAddressFilter,
+ pagination=True
)
class IPAddressType(NetBoxObjectType, BaseIPAddressFamilyType):
address: str
@@ -143,7 +164,8 @@ class IPAddressType(NetBoxObjectType, BaseIPAddressFamilyType):
@strawberry_django.type(
models.IPRange,
fields='__all__',
- filters=IPRangeFilter
+ filters=IPRangeFilter,
+ pagination=True
)
class IPRangeType(NetBoxObjectType):
start_address: str
@@ -155,8 +177,9 @@ class IPRangeType(NetBoxObjectType):
@strawberry_django.type(
models.Prefix,
- exclude=('scope_type', 'scope_id', '_location', '_region', '_site', '_site_group'),
- filters=PrefixFilter
+ exclude=['scope_type', 'scope_id', '_location', '_region', '_site', '_site_group'],
+ filters=PrefixFilter,
+ pagination=True
)
class PrefixType(NetBoxObjectType, BaseIPAddressFamilyType):
prefix: str
@@ -178,7 +201,8 @@ class PrefixType(NetBoxObjectType, BaseIPAddressFamilyType):
@strawberry_django.type(
models.RIR,
fields='__all__',
- filters=RIRFilter
+ filters=RIRFilter,
+ pagination=True
)
class RIRType(OrganizationalObjectType):
@@ -190,7 +214,8 @@ class RIRType(OrganizationalObjectType):
@strawberry_django.type(
models.Role,
fields='__all__',
- filters=RoleFilter
+ filters=RoleFilter,
+ pagination=True
)
class RoleType(OrganizationalObjectType):
@@ -202,7 +227,8 @@ class RoleType(OrganizationalObjectType):
@strawberry_django.type(
models.RouteTarget,
fields='__all__',
- filters=RouteTargetFilter
+ filters=RouteTargetFilter,
+ pagination=True
)
class RouteTargetType(NetBoxObjectType):
tenant: Annotated["TenantType", strawberry.lazy('tenancy.graphql.types')] | None
@@ -216,7 +242,8 @@ class RouteTargetType(NetBoxObjectType):
@strawberry_django.type(
models.Service,
fields='__all__',
- filters=ServiceFilter
+ filters=ServiceFilter,
+ pagination=True
)
class ServiceType(NetBoxObjectType):
ports: List[int]
@@ -229,7 +256,8 @@ class ServiceType(NetBoxObjectType):
@strawberry_django.type(
models.ServiceTemplate,
fields='__all__',
- filters=ServiceTemplateFilter
+ filters=ServiceTemplateFilter,
+ pagination=True
)
class ServiceTemplateType(NetBoxObjectType):
ports: List[int]
@@ -237,8 +265,9 @@ class ServiceTemplateType(NetBoxObjectType):
@strawberry_django.type(
models.VLAN,
- exclude=('qinq_svlan',),
- filters=VLANFilter
+ exclude=['qinq_svlan'],
+ filters=VLANFilter,
+ pagination=True
)
class VLANType(NetBoxObjectType):
site: Annotated["SiteType", strawberry.lazy('ipam.graphql.types')] | None
@@ -260,13 +289,15 @@ class VLANType(NetBoxObjectType):
@strawberry_django.type(
models.VLANGroup,
- exclude=('scope_type', 'scope_id'),
- filters=VLANGroupFilter
+ exclude=['scope_type', 'scope_id'],
+ filters=VLANGroupFilter,
+ pagination=True
)
class VLANGroupType(OrganizationalObjectType):
vlans: List[VLANType]
vid_ranges: List[str]
+ tenant: Annotated["TenantType", strawberry.lazy('tenancy.graphql.types')] | None
@strawberry_django.field
def scope(self) -> Annotated[Union[
@@ -284,7 +315,8 @@ class VLANGroupType(OrganizationalObjectType):
@strawberry_django.type(
models.VLANTranslationPolicy,
fields='__all__',
- filters=VLANTranslationPolicyFilter
+ filters=VLANTranslationPolicyFilter,
+ pagination=True
)
class VLANTranslationPolicyType(NetBoxObjectType):
rules: List[Annotated["VLANTranslationRuleType", strawberry.lazy('ipam.graphql.types')]]
@@ -293,7 +325,8 @@ class VLANTranslationPolicyType(NetBoxObjectType):
@strawberry_django.type(
models.VLANTranslationRule,
fields='__all__',
- filters=VLANTranslationRuleFilter
+ filters=VLANTranslationRuleFilter,
+ pagination=True
)
class VLANTranslationRuleType(NetBoxObjectType):
policy: Annotated[
@@ -305,7 +338,8 @@ class VLANTranslationRuleType(NetBoxObjectType):
@strawberry_django.type(
models.VRF,
fields='__all__',
- filters=VRFFilter
+ filters=VRFFilter,
+ pagination=True
)
class VRFType(NetBoxObjectType):
tenant: Annotated["TenantType", strawberry.lazy('tenancy.graphql.types')] | None
diff --git a/netbox/ipam/migrations/0001_squashed.py b/netbox/ipam/migrations/0001_squashed.py
index 896d7c4c9..15fb71dde 100644
--- a/netbox/ipam/migrations/0001_squashed.py
+++ b/netbox/ipam/migrations/0001_squashed.py
@@ -13,9 +13,9 @@ class Migration(migrations.Migration):
dependencies = [
('contenttypes', '0002_remove_content_type_name'),
- ('dcim', '0002_auto_20160622_1821'),
- ('extras', '0001_initial'),
- ('tenancy', '0001_initial'),
+ ('dcim', '0002_squashed'),
+ ('extras', '0001_squashed'),
+ ('tenancy', '0001_squashed_0012'),
]
replaces = [
@@ -195,12 +195,6 @@ class Migration(migrations.Migration):
'scope_type',
models.ForeignKey(
blank=True,
- limit_choices_to=models.Q(
- (
- 'model__in',
- ('region', 'sitegroup', 'site', 'location', 'rack', 'clustergroup', 'cluster'),
- )
- ),
null=True,
on_delete=django.db.models.deletion.CASCADE,
to='contenttypes.contenttype',
diff --git a/netbox/ipam/migrations/0002_squashed_0046.py b/netbox/ipam/migrations/0002_squashed_0046.py
index 6c03753d8..43b1223d0 100644
--- a/netbox/ipam/migrations/0002_squashed_0046.py
+++ b/netbox/ipam/migrations/0002_squashed_0046.py
@@ -5,12 +5,12 @@ import taggit.managers
class Migration(migrations.Migration):
dependencies = [
- ('dcim', '0003_auto_20160628_1721'),
- ('virtualization', '0001_virtualization'),
+ ('dcim', '0003_squashed_0130'),
+ ('virtualization', '0001_squashed_0022'),
('contenttypes', '0002_remove_content_type_name'),
- ('ipam', '0001_initial'),
- ('extras', '0002_custom_fields'),
- ('tenancy', '0001_initial'),
+ ('ipam', '0001_squashed'),
+ ('extras', '0002_squashed_0059'),
+ ('tenancy', '0001_squashed_0012'),
]
replaces = [
@@ -154,13 +154,6 @@ class Migration(migrations.Migration):
name='assigned_object_type',
field=models.ForeignKey(
blank=True,
- limit_choices_to=models.Q(
- models.Q(
- models.Q(('app_label', 'dcim'), ('model', 'interface')),
- models.Q(('app_label', 'virtualization'), ('model', 'vminterface')),
- _connector='OR',
- )
- ),
null=True,
on_delete=django.db.models.deletion.PROTECT,
related_name='+',
diff --git a/netbox/ipam/migrations/0047_squashed_0053.py b/netbox/ipam/migrations/0047_squashed_0053.py
index a05d0cb81..151792eb6 100644
--- a/netbox/ipam/migrations/0047_squashed_0053.py
+++ b/netbox/ipam/migrations/0047_squashed_0053.py
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
]
dependencies = [
- ('ipam', '0046_set_vlangroup_scope_types'),
+ ('ipam', '0002_squashed_0046'),
('tenancy', '0001_squashed_0012'),
('extras', '0002_squashed_0059'),
('contenttypes', '0002_remove_content_type_name'),
@@ -136,14 +136,6 @@ class Migration(migrations.Migration):
name='assigned_object_type',
field=models.ForeignKey(
blank=True,
- limit_choices_to=models.Q(
- models.Q(
- models.Q(('app_label', 'dcim'), ('model', 'interface')),
- models.Q(('app_label', 'ipam'), ('model', 'fhrpgroup')),
- models.Q(('app_label', 'virtualization'), ('model', 'vminterface')),
- _connector='OR',
- )
- ),
null=True,
on_delete=django.db.models.deletion.PROTECT,
related_name='+',
diff --git a/netbox/ipam/migrations/0054_squashed_0067.py b/netbox/ipam/migrations/0054_squashed_0067.py
index 929a27fda..26bd54115 100644
--- a/netbox/ipam/migrations/0054_squashed_0067.py
+++ b/netbox/ipam/migrations/0054_squashed_0067.py
@@ -28,11 +28,11 @@ class Migration(migrations.Migration):
]
dependencies = [
- ('tenancy', '0007_contact_link'),
+ ('tenancy', '0002_squashed_0011'),
('contenttypes', '0002_remove_content_type_name'),
('extras', '0060_squashed_0086'),
- ('ipam', '0053_asn_model'),
- ('tenancy', '0009_standardize_description_comments'),
+ ('ipam', '0047_squashed_0053'),
+ ('tenancy', '0002_squashed_0011'),
]
operations = [
@@ -304,14 +304,6 @@ class Migration(migrations.Migration):
(
'assigned_object_type',
models.ForeignKey(
- limit_choices_to=models.Q(
- models.Q(
- models.Q(('app_label', 'dcim'), ('model', 'interface')),
- models.Q(('app_label', 'ipam'), ('model', 'vlan')),
- models.Q(('app_label', 'virtualization'), ('model', 'vminterface')),
- _connector='OR',
- )
- ),
on_delete=django.db.models.deletion.PROTECT,
related_name='+',
to='contenttypes.contenttype',
diff --git a/netbox/ipam/migrations/0068_move_l2vpn.py b/netbox/ipam/migrations/0068_move_l2vpn.py
index 9240240bc..16935b1a6 100644
--- a/netbox/ipam/migrations/0068_move_l2vpn.py
+++ b/netbox/ipam/migrations/0068_move_l2vpn.py
@@ -16,7 +16,7 @@ def update_content_types(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
- ('ipam', '0067_ipaddress_index_host'),
+ ('ipam', '0054_squashed_0067'),
]
operations = [
diff --git a/netbox/ipam/migrations/0071_prefix_scope.py b/netbox/ipam/migrations/0071_prefix_scope.py
index 2ab54d023..47a971750 100644
--- a/netbox/ipam/migrations/0071_prefix_scope.py
+++ b/netbox/ipam/migrations/0071_prefix_scope.py
@@ -33,7 +33,6 @@ class Migration(migrations.Migration):
name='scope_type',
field=models.ForeignKey(
blank=True,
- limit_choices_to=models.Q(('model__in', ('region', 'sitegroup', 'site', 'location'))),
null=True,
on_delete=django.db.models.deletion.PROTECT,
related_name='+',
diff --git a/netbox/ipam/migrations/0077_vlangroup_tenant.py b/netbox/ipam/migrations/0077_vlangroup_tenant.py
new file mode 100644
index 000000000..9fb67cf53
--- /dev/null
+++ b/netbox/ipam/migrations/0077_vlangroup_tenant.py
@@ -0,0 +1,26 @@
+# Generated by Django 5.1.3 on 2025-02-20 17:49
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('ipam', '0076_natural_ordering'),
+ ('tenancy', '0017_natural_ordering'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='vlangroup',
+ name='tenant',
+ field=models.ForeignKey(
+ blank=True,
+ null=True,
+ on_delete=django.db.models.deletion.PROTECT,
+ related_name='vlan_groups',
+ to='tenancy.tenant',
+ ),
+ ),
+ ]
diff --git a/netbox/ipam/migrations/0078_iprange_mark_utilized.py b/netbox/ipam/migrations/0078_iprange_mark_utilized.py
new file mode 100644
index 000000000..95da5387b
--- /dev/null
+++ b/netbox/ipam/migrations/0078_iprange_mark_utilized.py
@@ -0,0 +1,16 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('ipam', '0077_vlangroup_tenant'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='iprange',
+ name='mark_populated',
+ field=models.BooleanField(default=False),
+ ),
+ ]
diff --git a/netbox/ipam/migrations/0077_ipaddress_prefix.py b/netbox/ipam/migrations/0079_ipaddress_prefix.py
similarity index 97%
rename from netbox/ipam/migrations/0077_ipaddress_prefix.py
rename to netbox/ipam/migrations/0079_ipaddress_prefix.py
index 216fa166a..8d3c3b67c 100644
--- a/netbox/ipam/migrations/0077_ipaddress_prefix.py
+++ b/netbox/ipam/migrations/0079_ipaddress_prefix.py
@@ -48,7 +48,7 @@ def unset_prefix(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
- ('ipam', '0076_natural_ordering'),
+ ('ipam', '0078_iprange_mark_utilized'),
]
operations = [
diff --git a/netbox/ipam/models/ip.py b/netbox/ipam/models/ip.py
index 3db12f761..f356fb8ba 100644
--- a/netbox/ipam/models/ip.py
+++ b/netbox/ipam/models/ip.py
@@ -383,14 +383,15 @@ class Prefix(ContactsMixin, GetAvailablePrefixesMixin, CachedScopeMixin, Primary
else:
return Prefix.objects.filter(prefix__net_contained=str(self.prefix), vrf=self.vrf)
- def get_child_ranges(self):
+ def get_child_ranges(self, **kwargs):
"""
Return all IPRanges within this Prefix and VRF.
"""
return IPRange.objects.filter(
vrf=self.vrf,
start_address__net_host_contained=str(self.prefix),
- end_address__net_host_contained=str(self.prefix)
+ end_address__net_host_contained=str(self.prefix),
+ **kwargs
)
def get_child_ips(self):
@@ -407,15 +408,14 @@ class Prefix(ContactsMixin, GetAvailablePrefixesMixin, CachedScopeMixin, Primary
"""
Return all available IPs within this prefix as an IPSet.
"""
- if self.mark_utilized:
- return netaddr.IPSet()
-
prefix = netaddr.IPSet(self.prefix)
- child_ips = netaddr.IPSet([ip.address.ip for ip in self.ip_addresses.all()])
- child_ranges = []
- for iprange in self.get_child_ranges():
- child_ranges.append(iprange.range)
- available_ips = prefix - child_ips - netaddr.IPSet(child_ranges)
+ child_ips = netaddr.IPSet([
+ ip.address.ip for ip in self.get_child_ips()
+ ])
+ child_ranges = netaddr.IPSet([
+ iprange.range for iprange in self.get_child_ranges().filter(mark_populated=True)
+ ])
+ available_ips = prefix - child_ips - child_ranges
# IPv6 /127's, pool, or IPv4 /31-/32 sets are fully usable
if (self.family == 6 and self.prefix.prefixlen >= 127) or self.is_pool or (
@@ -433,6 +433,7 @@ class Prefix(ContactsMixin, GetAvailablePrefixesMixin, CachedScopeMixin, Primary
# For IPv6 prefixes, omit the Subnet-Router anycast address
# per RFC 4291
available_ips -= netaddr.IPSet([netaddr.IPAddress(self.prefix.first)])
+
return available_ips
def get_first_available_ip(self):
@@ -461,9 +462,11 @@ class Prefix(ContactsMixin, GetAvailablePrefixesMixin, CachedScopeMixin, Primary
utilization = float(child_prefixes.size) / self.prefix.size * 100
else:
# Compile an IPSet to avoid counting duplicate IPs
- child_ips = netaddr.IPSet(
- [_.range for _ in self.get_child_ranges()] + [_.address.ip for _ in self.ip_addresses.all()]
- )
+ child_ips = netaddr.IPSet()
+ for iprange in self.get_child_ranges().filter(mark_utilized=True):
+ child_ips.add(iprange.range)
+ for ip in self.get_child_ips():
+ child_ips.add(ip.address.ip)
prefix_size = self.prefix.size
if self.prefix.version == 4 and self.prefix.prefixlen < 31 and not self.is_pool:
@@ -519,14 +522,19 @@ class IPRange(ContactsMixin, PrimaryModel):
null=True,
help_text=_('The primary function of this range')
)
+ mark_populated = models.BooleanField(
+ verbose_name=_('mark populated'),
+ default=False,
+ help_text=_("Prevent the creation of IP addresses within this range")
+ )
mark_utilized = models.BooleanField(
verbose_name=_('mark utilized'),
default=False,
- help_text=_("Treat as fully utilized")
+ help_text=_("Report space as 100% utilized")
)
clone_fields = (
- 'vrf', 'tenant', 'status', 'role', 'description',
+ 'vrf', 'tenant', 'status', 'role', 'description', 'mark_populated', 'mark_utilized',
)
class Meta:
@@ -663,6 +671,9 @@ class IPRange(ContactsMixin, PrimaryModel):
"""
Return all available IPs within this range as an IPSet.
"""
+ if self.mark_populated:
+ return netaddr.IPSet()
+
range = netaddr.IPRange(self.start_address.ip, self.end_address.ip)
child_ips = netaddr.IPSet([ip.address.ip for ip in self.get_child_ips()])
@@ -750,7 +761,6 @@ class IPAddress(ContactsMixin, PrimaryModel):
)
assigned_object_type = models.ForeignKey(
to='contenttypes.ContentType',
- limit_choices_to=IPADDRESS_ASSIGNMENT_MODELS,
on_delete=models.PROTECT,
related_name='+',
blank=True,
@@ -889,6 +899,20 @@ class IPAddress(ContactsMixin, PrimaryModel):
)
})
+ # Disallow the creation of IPAddresses within an IPRange with mark_populated=True
+ parent_range = IPRange.objects.filter(
+ start_address__lte=self.address,
+ end_address__gte=self.address,
+ vrf=self.vrf,
+ mark_populated=True
+ ).first()
+ if parent_range:
+ raise ValidationError({
+ 'address': _(
+ "Cannot create IP address {ip} inside range {range}."
+ ).format(ip=self.address, range=parent_range)
+ })
+
if self._original_assigned_object_id and self._original_assigned_object_type_id:
parent = getattr(self.assigned_object, 'parent_object', None)
ct = ObjectType.objects.get_for_id(self._original_assigned_object_type_id)
diff --git a/netbox/ipam/models/vlans.py b/netbox/ipam/models/vlans.py
index 91e39c6d3..98491ad23 100644
--- a/netbox/ipam/models/vlans.py
+++ b/netbox/ipam/models/vlans.py
@@ -45,7 +45,6 @@ class VLANGroup(OrganizationalModel):
scope_type = models.ForeignKey(
to='contenttypes.ContentType',
on_delete=models.CASCADE,
- limit_choices_to=Q(model__in=VLANGROUP_SCOPE_TYPES),
blank=True,
null=True
)
@@ -62,6 +61,13 @@ class VLANGroup(OrganizationalModel):
verbose_name=_('VLAN ID ranges'),
default=default_vid_ranges
)
+ tenant = models.ForeignKey(
+ to='tenancy.Tenant',
+ on_delete=models.PROTECT,
+ related_name='vlan_groups',
+ blank=True,
+ null=True
+ )
_total_vlan_ids = models.PositiveBigIntegerField(
default=VLAN_VID_MAX - VLAN_VID_MIN + 1
)
diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py
index 0ad984248..7818e66ad 100644
--- a/netbox/ipam/tables/ip.py
+++ b/netbox/ipam/tables/ip.py
@@ -10,6 +10,7 @@ from .template_code import *
__all__ = (
'AggregateTable',
+ 'AnnotatedIPAddressTable',
'AssignedIPAddressesTable',
'IPAddressAssignTable',
'IPAddressTable',
@@ -268,6 +269,10 @@ class IPRangeTable(TenancyColumnsMixin, NetBoxTable):
verbose_name=_('Role'),
linkify=True
)
+ mark_populated = columns.BooleanColumn(
+ verbose_name=_('Marked Populated'),
+ false_mark=None
+ )
mark_utilized = columns.BooleanColumn(
verbose_name=_('Marked Utilized'),
false_mark=None
@@ -288,7 +293,8 @@ class IPRangeTable(TenancyColumnsMixin, NetBoxTable):
model = IPRange
fields = (
'pk', 'id', 'start_address', 'end_address', 'size', 'vrf', 'status', 'role', 'tenant', 'tenant_group',
- 'mark_utilized', 'utilization', 'description', 'comments', 'tags', 'created', 'last_updated',
+ 'mark_populated', 'mark_utilized', 'utilization', 'description', 'comments', 'tags', 'created',
+ 'last_updated',
)
default_columns = (
'pk', 'start_address', 'end_address', 'size', 'vrf', 'status', 'role', 'tenant', 'description',
@@ -303,8 +309,8 @@ class IPRangeTable(TenancyColumnsMixin, NetBoxTable):
#
class IPAddressTable(TenancyColumnsMixin, NetBoxTable):
- address = tables.TemplateColumn(
- template_code=IPADDRESS_LINK,
+ address = tables.Column(
+ linkify=True,
verbose_name=_('IP Address')
)
prefix = tables.Column(
@@ -373,6 +379,16 @@ class IPAddressTable(TenancyColumnsMixin, NetBoxTable):
}
+class AnnotatedIPAddressTable(IPAddressTable):
+ address = tables.TemplateColumn(
+ template_code=IPADDRESS_LINK,
+ verbose_name=_('IP Address')
+ )
+
+ class Meta(IPAddressTable.Meta):
+ pass
+
+
class IPAddressAssignTable(NetBoxTable):
address = tables.TemplateColumn(
template_code=IPADDRESS_ASSIGN_LINK,
diff --git a/netbox/ipam/tables/template_code.py b/netbox/ipam/tables/template_code.py
index fb969345e..cc3a344bc 100644
--- a/netbox/ipam/tables/template_code.py
+++ b/netbox/ipam/tables/template_code.py
@@ -26,12 +26,12 @@ PREFIX_LINK_WITH_DEPTH = """
""" + PREFIX_LINK
IPADDRESS_LINK = """
-{% if record.pk %}
- {{ record.address }}
+{% if record.address or record.start_address %}
+ {{ record }}
{% elif perms.ipam.add_ipaddress %}
- {% if record.0 <= 65536 %}{{ record.0 }}{% else %}Many{% endif %} IP{{ record.0|pluralize }} available
+ {{ record.title }}
{% else %}
- {% if record.0 <= 65536 %}{{ record.0 }}{% else %}Many{% endif %} IP{{ record.0|pluralize }} available
+ {{ record.title }}
{% endif %}
"""
diff --git a/netbox/ipam/tables/vlans.py b/netbox/ipam/tables/vlans.py
index aa1900e41..c22975be0 100644
--- a/netbox/ipam/tables/vlans.py
+++ b/netbox/ipam/tables/vlans.py
@@ -28,7 +28,7 @@ AVAILABLE_LABEL = mark_safe('Available first_ip_in_prefix:
- skipped_count = int(ipaddress_list[0].address.ip - first_ip_in_prefix)
- first_skipped = '{}/{}'.format(first_ip_in_prefix, prefix.prefixlen)
- output.append((skipped_count, first_skipped))
+ if records[0][0] > first_ip_in_prefix:
+ output.append(AvailableIPSpace(
+ size=int(records[0][0] - first_ip_in_prefix),
+ first_ip=f'{first_ip_in_prefix}/{prefix.mask_length}'
+ ))
- # Iterate through existing IPs and annotate free ranges
- for ip in ipaddress_list:
+ # Add IP ranges & addresses, annotating available space in between records
+ for record in records:
if prev_ip:
- diff = int(ip.address.ip - prev_ip.address.ip)
- if diff > 1:
- first_skipped = '{}/{}'.format(prev_ip.address.ip + 1, prefix.prefixlen)
- output.append((diff - 1, first_skipped))
- output.append(ip)
- prev_ip = ip
+ # Annotate available space
+ if (diff := int(record[0]) - int(prev_ip)) > 1:
+ first_skipped = f'{prev_ip + 1}/{prefix.mask_length}'
+ output.append(AvailableIPSpace(
+ size=diff - 1,
+ first_ip=first_skipped
+ ))
+
+ output.append(record[1])
+
+ # Update the previous IP address
+ if hasattr(record[1], 'end_address'):
+ prev_ip = record[1].end_address.ip
+ else:
+ prev_ip = record[0]
# Include any remaining available IPs
- if prev_ip.address.ip < last_ip_in_prefix:
- skipped_count = int(last_ip_in_prefix - prev_ip.address.ip)
- first_skipped = '{}/{}'.format(prev_ip.address.ip + 1, prefix.prefixlen)
- output.append((skipped_count, first_skipped))
+ if prev_ip < last_ip_in_prefix:
+ output.append(AvailableIPSpace(
+ size=int(last_ip_in_prefix - prev_ip),
+ first_ip=f'{prev_ip + 1}/{prefix.mask_length}'
+ ))
return output
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 944aa211e..75170ef6e 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -11,7 +11,6 @@ from dcim.forms import InterfaceFilterForm
from dcim.models import Interface, Site
from ipam.tables import VLANTranslationRuleTable
from netbox.views import generic
-from tenancy.views import ObjectContactsView
from utilities.query import count_related
from utilities.tables import get_table_ordering
from utilities.views import GetRelatedModelsMixin, ViewTab, register_model_view
@@ -22,7 +21,7 @@ from . import filtersets, forms, tables
from .choices import PrefixStatusChoices
from .constants import *
from .models import *
-from .utils import add_requested_prefixes, add_available_ipaddresses, add_available_vlans
+from .utils import add_requested_prefixes, add_available_vlans, annotate_ip_space
#
@@ -434,11 +433,6 @@ class AggregateBulkDeleteView(generic.BulkDeleteView):
table = tables.AggregateTable
-@register_model_view(Aggregate, 'contacts')
-class AggregateContactsView(ObjectContactsView):
- queryset = Aggregate.objects.all()
-
-
#
# Prefix/VLAN roles
#
@@ -625,7 +619,7 @@ class PrefixIPRangesView(generic.ObjectChildrenView):
class PrefixIPAddressesView(generic.ObjectChildrenView):
queryset = Prefix.objects.all()
child_model = IPAddress
- table = tables.IPAddressTable
+ table = tables.AnnotatedIPAddressTable
filterset = filtersets.IPAddressFilterSet
filterset_form = forms.IPAddressFilterForm
template_name = 'ipam/prefix/ip_addresses.html'
@@ -641,7 +635,7 @@ class PrefixIPAddressesView(generic.ObjectChildrenView):
def prep_table_data(self, request, queryset, parent):
if not request.GET.get('q') and not get_table_ordering(request, self.table):
- return add_available_ipaddresses(parent.prefix, queryset, parent.is_pool)
+ return annotate_ip_space(parent)
return queryset
def get_extra_context(self, request, instance):
@@ -684,11 +678,6 @@ class PrefixBulkDeleteView(generic.BulkDeleteView):
table = tables.PrefixTable
-@register_model_view(Prefix, 'contacts')
-class PrefixContactsView(ObjectContactsView):
- queryset = Prefix.objects.all()
-
-
#
# IP Ranges
#
@@ -778,11 +767,6 @@ class IPRangeBulkDeleteView(generic.BulkDeleteView):
table = tables.IPRangeTable
-@register_model_view(IPRange, 'contacts')
-class IPRangeContactsView(ObjectContactsView):
- queryset = IPRange.objects.all()
-
-
#
# IP addresses
#
@@ -964,11 +948,6 @@ class IPAddressRelatedIPsView(generic.ObjectChildrenView):
return parent.get_related_ips().restrict(request.user, 'view')
-@register_model_view(IPAddress, 'contacts')
-class IPAddressContactsView(ObjectContactsView):
- queryset = IPAddress.objects.all()
-
-
#
# VLAN groups
#
@@ -1476,8 +1455,3 @@ class ServiceBulkDeleteView(generic.BulkDeleteView):
queryset = Service.objects.prefetch_related('device', 'virtual_machine')
filterset = filtersets.ServiceFilterSet
table = tables.ServiceTable
-
-
-@register_model_view(Service, 'contacts')
-class ServiceContactsView(ObjectContactsView):
- queryset = Service.objects.all()
diff --git a/netbox/netbox/api/fields.py b/netbox/netbox/api/fields.py
index e7d1ef574..db5ec184d 100644
--- a/netbox/netbox/api/fields.py
+++ b/netbox/netbox/api/fields.py
@@ -9,6 +9,7 @@ from rest_framework.exceptions import ValidationError
from rest_framework.relations import PrimaryKeyRelatedField, RelatedField
__all__ = (
+ 'AttributesField',
'ChoiceField',
'ContentTypeField',
'IPNetworkSerializer',
@@ -172,3 +173,19 @@ class IntegerRangeSerializer(serializers.Serializer):
def to_representation(self, instance):
return instance.lower, instance.upper - 1
+
+
+class AttributesField(serializers.JSONField):
+ """
+ Custom attributes stored as JSON data.
+ """
+ def to_internal_value(self, data):
+ data = super().to_internal_value(data)
+
+ # If updating an object, start with the initial attribute data. This enables the client to modify
+ # individual attributes without having to rewrite the entire field.
+ if data and self.parent.instance:
+ initial_data = getattr(self.parent.instance, self.source, None) or {}
+ return {**initial_data, **data}
+
+ return data
diff --git a/netbox/netbox/api/views.py b/netbox/netbox/api/views.py
index d58d1affe..1befda371 100644
--- a/netbox/netbox/api/views.py
+++ b/netbox/netbox/api/views.py
@@ -4,15 +4,15 @@ from django import __version__ as DJANGO_VERSION
from django.apps import apps
from django.conf import settings
from django_rq.queues import get_connection
-from drf_spectacular.utils import extend_schema
from drf_spectacular.types import OpenApiTypes
+from drf_spectacular.utils import extend_schema
from rest_framework.response import Response
from rest_framework.reverse import reverse
from rest_framework.views import APIView
from rq.worker import Worker
-from netbox.plugins.utils import get_installed_plugins
from netbox.api.authentication import IsAuthenticatedOrLoginNotRequired
+from netbox.plugins.utils import get_installed_plugins
class APIRootView(APIView):
@@ -66,7 +66,8 @@ class StatusView(APIView):
return Response({
'django-version': DJANGO_VERSION,
'installed-apps': installed_apps,
- 'netbox-version': settings.RELEASE.full_version,
+ 'netbox-version': settings.RELEASE.version,
+ 'netbox-full-version': settings.RELEASE.full_version,
'plugins': get_installed_plugins(),
'python-version': platform.python_version(),
'rq-workers-running': Worker.count(get_connection('default')),
diff --git a/netbox/netbox/api/viewsets/mixins.py b/netbox/netbox/api/viewsets/mixins.py
index e07e2c78b..e21be2348 100644
--- a/netbox/netbox/api/viewsets/mixins.py
+++ b/netbox/netbox/api/viewsets/mixins.py
@@ -45,7 +45,7 @@ class ExportTemplatesMixin:
if et is None:
raise Http404
queryset = self.filter_queryset(self.get_queryset())
- return et.render_to_response(queryset)
+ return et.render_to_response(queryset=queryset)
return super().list(request, *args, **kwargs)
diff --git a/netbox/netbox/configuration_example.py b/netbox/netbox/configuration_example.py
index 84ead5339..27d44a2ff 100644
--- a/netbox/netbox/configuration_example.py
+++ b/netbox/netbox/configuration_example.py
@@ -12,14 +12,16 @@ ALLOWED_HOSTS = []
# PostgreSQL database configuration. See the Django documentation for a complete list of available parameters:
# https://docs.djangoproject.com/en/stable/ref/settings/#databases
-DATABASE = {
- 'ENGINE': 'django.db.backends.postgresql', # Database engine
- 'NAME': 'netbox', # Database name
- 'USER': '', # PostgreSQL username
- 'PASSWORD': '', # PostgreSQL password
- 'HOST': 'localhost', # Database server
- 'PORT': '', # Database port (leave blank for default)
- 'CONN_MAX_AGE': 300, # Max database connection age
+DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.postgresql', # Database engine
+ 'NAME': 'netbox', # Database name
+ 'USER': '', # PostgreSQL username
+ 'PASSWORD': '', # PostgreSQL password
+ 'HOST': 'localhost', # Database server
+ 'PORT': '', # Database port (leave blank for default)
+ 'CONN_MAX_AGE': 300, # Max database connection age
+ }
}
# Redis database settings. Redis is used for caching and for queuing background tasks such as webhook events. A separate
@@ -164,6 +166,9 @@ LOGIN_REQUIRED = True
# re-authenticate. (Default: 1209600 [14 days])
LOGIN_TIMEOUT = None
+# Hide the login form. Useful when only allowing SSO authentication.
+LOGIN_FORM_HIDDEN = False
+
# The view name or URL to which users are redirected after logging out.
LOGOUT_REDIRECT_URL = 'home'
diff --git a/netbox/netbox/configuration_testing.py b/netbox/netbox/configuration_testing.py
index cec05cabb..52973e94d 100644
--- a/netbox/netbox/configuration_testing.py
+++ b/netbox/netbox/configuration_testing.py
@@ -5,13 +5,15 @@
ALLOWED_HOSTS = ['*']
-DATABASE = {
- 'NAME': 'netbox',
- 'USER': 'netbox',
- 'PASSWORD': 'netbox',
- 'HOST': 'localhost',
- 'PORT': '',
- 'CONN_MAX_AGE': 300,
+DATABASES = {
+ 'default': {
+ 'NAME': 'netbox',
+ 'USER': 'netbox',
+ 'PASSWORD': 'netbox',
+ 'HOST': 'localhost',
+ 'PORT': '',
+ 'CONN_MAX_AGE': 300,
+ }
}
PLUGINS = [
@@ -41,6 +43,8 @@ SECRET_KEY = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
DEFAULT_PERMISSIONS = {}
+ALLOW_TOKEN_RETRIEVAL = True
+
LOGGING = {
'version': 1,
'disable_existing_loggers': True
diff --git a/netbox/netbox/filtersets.py b/netbox/netbox/filtersets.py
index b8fbe7ad5..ffae9b7ff 100644
--- a/netbox/netbox/filtersets.py
+++ b/netbox/netbox/filtersets.py
@@ -1,3 +1,5 @@
+import json
+
import django_filters
from copy import deepcopy
from django.contrib.contenttypes.models import ContentType
@@ -20,6 +22,7 @@ from utilities.forms.fields import MACAddressField
from utilities import filters
__all__ = (
+ 'AttributeFiltersMixin',
'BaseFilterSet',
'ChangeLoggedModelFilterSet',
'NetBoxModelFilterSet',
@@ -329,3 +332,48 @@ class OrganizationalModelFilterSet(NetBoxModelFilterSet):
models.Q(slug__icontains=value) |
models.Q(description__icontains=value)
)
+
+
+class NestedGroupModelFilterSet(NetBoxModelFilterSet):
+ """
+ A base FilterSet for models that inherit from NestedGroupModel
+ """
+ def search(self, queryset, name, value):
+ if value.strip():
+ queryset = queryset.filter(
+ models.Q(name__icontains=value) |
+ models.Q(slug__icontains=value) |
+ models.Q(description__icontains=value) |
+ models.Q(comments__icontains=value)
+ )
+
+ return queryset
+
+
+class AttributeFiltersMixin:
+ attributes_field_name = 'attribute_data'
+ attribute_filter_prefix = 'attr_'
+
+ def __init__(self, data=None, queryset=None, *, request=None, prefix=None):
+ self.attr_filters = {}
+
+ # Extract JSONField-based filters from the incoming data
+ if data is not None:
+ for key, value in data.items():
+ if field := self._get_field_lookup(key):
+ # Attempt to cast the value to a native JSON type
+ try:
+ self.attr_filters[field] = json.loads(value)
+ except (ValueError, json.JSONDecodeError):
+ self.attr_filters[field] = value
+
+ super().__init__(data=data, queryset=queryset, request=request, prefix=prefix)
+
+ def _get_field_lookup(self, key):
+ if not key.startswith(self.attribute_filter_prefix):
+ return
+ lookup = key.split(self.attribute_filter_prefix, 1)[1] # Strip prefix
+ return f'{self.attributes_field_name}__{lookup}'
+
+ def filter_queryset(self, queryset):
+ return super().filter_queryset(queryset).filter(**self.attr_filters)
diff --git a/netbox/netbox/graphql/enums.py b/netbox/netbox/graphql/enums.py
new file mode 100644
index 000000000..df62f8b3d
--- /dev/null
+++ b/netbox/netbox/graphql/enums.py
@@ -0,0 +1,13 @@
+import strawberry
+
+from netbox.choices import *
+
+__all__ = (
+ 'ColorEnum',
+ 'DistanceUnitEnum',
+ 'WeightUnitEnum',
+)
+
+ColorEnum = strawberry.enum(ColorChoices.as_enum())
+DistanceUnitEnum = strawberry.enum(DistanceUnitChoices.as_enum())
+WeightUnitEnum = strawberry.enum(WeightUnitChoices.as_enum())
diff --git a/netbox/netbox/graphql/filter_lookups.py b/netbox/netbox/graphql/filter_lookups.py
new file mode 100644
index 000000000..859236e4d
--- /dev/null
+++ b/netbox/netbox/graphql/filter_lookups.py
@@ -0,0 +1,219 @@
+from enum import Enum
+from typing import TypeVar, Tuple, Generic
+
+import strawberry
+import strawberry_django
+from django.core.exceptions import FieldDoesNotExist
+from django.db.models import Q, QuerySet
+from django.db.models.fields.related import ForeignKey, ManyToManyField, ManyToManyRel, ManyToOneRel
+from strawberry import ID
+from strawberry.types import Info
+from strawberry_django import (
+ ComparisonFilterLookup,
+ DateFilterLookup,
+ DatetimeFilterLookup,
+ FilterLookup,
+ RangeLookup,
+ TimeFilterLookup,
+ process_filters,
+)
+
+__all__ = (
+ 'ArrayLookup',
+ 'FloatArrayLookup',
+ 'FloatLookup',
+ 'IntegerArrayLookup',
+ 'IntegerLookup',
+ 'JSONFilter',
+ 'StringArrayLookup',
+ 'TreeNodeFilter',
+)
+
+T = TypeVar('T')
+SKIP_MSG = 'Filter will be skipped on `null` value'
+
+
+@strawberry.input(one_of=True, description='Lookup for JSON field. Only one of the lookup fields can be set.')
+class JSONLookup:
+ string_lookup: FilterLookup[str] | None = strawberry_django.filter_field()
+ int_range_lookup: RangeLookup[int] | None = strawberry_django.filter_field()
+ int_comparison_lookup: ComparisonFilterLookup[int] | None = strawberry_django.filter_field()
+ float_range_lookup: RangeLookup[float] | None = strawberry_django.filter_field()
+ float_comparison_lookup: ComparisonFilterLookup[float] | None = strawberry_django.filter_field()
+ date_lookup: DateFilterLookup[str] | None = strawberry_django.filter_field()
+ datetime_lookup: DatetimeFilterLookup[str] | None = strawberry_django.filter_field()
+ time_lookup: TimeFilterLookup[str] | None = strawberry_django.filter_field()
+ boolean_lookup: FilterLookup[bool] | None = strawberry_django.filter_field()
+
+ def get_filter(self):
+ for field in self.__strawberry_definition__.fields:
+ value = getattr(self, field.name, None)
+ if value is not strawberry.UNSET:
+ return value
+ return None
+
+
+@strawberry.input(one_of=True, description='Lookup for Integer fields. Only one of the lookup fields can be set.')
+class IntegerLookup:
+ filter_lookup: FilterLookup[int] | None = strawberry_django.filter_field()
+ range_lookup: RangeLookup[int] | None = strawberry_django.filter_field()
+ comparison_lookup: ComparisonFilterLookup[int] | None = strawberry_django.filter_field()
+
+ def get_filter(self):
+ for field in self.__strawberry_definition__.fields:
+ value = getattr(self, field.name, None)
+ if value is not strawberry.UNSET:
+ return value
+ return None
+
+ @strawberry_django.filter_field
+ def filter(self, info: Info, queryset: QuerySet, prefix: str = '') -> Tuple[QuerySet, Q]:
+ filters = self.get_filter()
+
+ if not filters:
+ return queryset, Q()
+
+ return process_filters(filters=filters, queryset=queryset, info=info, prefix=prefix)
+
+
+@strawberry.input(one_of=True, description='Lookup for Float fields. Only one of the lookup fields can be set.')
+class FloatLookup:
+ filter_lookup: FilterLookup[float] | None = strawberry_django.filter_field()
+ range_lookup: RangeLookup[float] | None = strawberry_django.filter_field()
+ comparison_lookup: ComparisonFilterLookup[float] | None = strawberry_django.filter_field()
+
+ def get_filter(self):
+ for field in self.__strawberry_definition__.fields:
+ value = getattr(self, field.name, None)
+ if value is not strawberry.UNSET:
+ return value
+ return None
+
+ @strawberry_django.filter_field
+ def filter(self, info: Info, queryset: QuerySet, prefix: str = '') -> Tuple[QuerySet, Q]:
+ filters = self.get_filter()
+
+ if not filters:
+ return queryset, Q()
+
+ return process_filters(filters=filters, queryset=queryset, info=info, prefix=prefix)
+
+
+@strawberry.input
+class JSONFilter:
+ """
+ Class for JSON field lookups with paths
+ """
+
+ path: str
+ lookup: JSONLookup
+
+ @strawberry_django.filter_field
+ def filter(self, info: Info, queryset: QuerySet, prefix: str = '') -> Tuple[QuerySet, Q]:
+ filters = self.lookup.get_filter()
+
+ if not filters:
+ return queryset, Q()
+
+ json_path = f'{prefix}{self.path}__'
+ return process_filters(filters=filters, queryset=queryset, info=info, prefix=json_path)
+
+
+@strawberry.enum
+class TreeNodeMatch(Enum):
+ EXACT = 'exact' # Just the node itself
+ DESCENDANTS = 'descendants' # Node and all descendants
+ SELF_AND_DESCENDANTS = 'self_and_descendants' # Node and all descendants
+ CHILDREN = 'children' # Just immediate children
+ SIBLINGS = 'siblings' # Nodes with same parent
+ ANCESTORS = 'ancestors' # All parent nodes
+ PARENT = 'parent' # Just immediate parent
+
+
+@strawberry.input
+class TreeNodeFilter:
+ id: ID
+ match_type: TreeNodeMatch
+
+ @strawberry_django.filter_field
+ def filter(self, info: Info, queryset: QuerySet, prefix: str = '') -> Tuple[QuerySet, Q]:
+ model_field_name = prefix.removesuffix('__').removesuffix('_id')
+ model_field = None
+ try:
+ model_field = queryset.model._meta.get_field(model_field_name)
+ except FieldDoesNotExist:
+ try:
+ model_field = queryset.model._meta.get_field(f'{model_field_name}s')
+ except FieldDoesNotExist:
+ return queryset, Q(pk__in=[])
+
+ if hasattr(model_field, 'related_model'):
+ related_model = model_field.related_model
+ else:
+ return queryset, Q(pk__in=[])
+
+ # Generate base Q filter for the related model without prefix
+ q_filter = generate_tree_node_q_filter(related_model, self)
+
+ # Handle different relationship types
+ if isinstance(model_field, (ManyToManyField, ManyToManyRel)):
+ return queryset, Q(**{f'{model_field_name}__in': related_model.objects.filter(q_filter)})
+ elif isinstance(model_field, ForeignKey):
+ return queryset, Q(**{f'{model_field_name}__{k}': v for k, v in q_filter.children})
+ elif isinstance(model_field, ManyToOneRel):
+ return queryset, Q(**{f'{model_field_name}__in': related_model.objects.filter(q_filter)})
+ else:
+ return queryset, Q(**{f'{model_field_name}__{k}': v for k, v in q_filter.children})
+
+
+def generate_tree_node_q_filter(model_class, filter_value: TreeNodeFilter) -> Q:
+ """
+ Generate appropriate Q filter for MPTT tree filtering based on match type
+ """
+ try:
+ node = model_class.objects.get(id=filter_value.id)
+ except model_class.DoesNotExist:
+ return Q(pk__in=[])
+
+ if filter_value.match_type == TreeNodeMatch.EXACT:
+ return Q(id=filter_value.id)
+ elif filter_value.match_type == TreeNodeMatch.DESCENDANTS:
+ return Q(tree_id=node.tree_id, lft__gt=node.lft, rght__lt=node.rght)
+ elif filter_value.match_type == TreeNodeMatch.SELF_AND_DESCENDANTS:
+ return Q(tree_id=node.tree_id, lft__gte=node.lft, rght__lte=node.rght)
+ elif filter_value.match_type == TreeNodeMatch.CHILDREN:
+ return Q(tree_id=node.tree_id, level=node.level + 1, lft__gt=node.lft, rght__lt=node.rght)
+ elif filter_value.match_type == TreeNodeMatch.SIBLINGS:
+ return Q(tree_id=node.tree_id, level=node.level, parent=node.parent) & ~Q(id=node.id)
+ elif filter_value.match_type == TreeNodeMatch.ANCESTORS:
+ return Q(tree_id=node.tree_id, lft__lt=node.lft, rght__gt=node.rght)
+ elif filter_value.match_type == TreeNodeMatch.PARENT:
+ return Q(id=node.parent_id) if node.parent_id else Q(pk__in=[])
+ return Q()
+
+
+@strawberry.input(one_of=True, description='Lookup for Array fields. Only one of the lookup fields can be set.')
+class ArrayLookup(Generic[T]):
+ """
+ Class for Array field lookups
+ """
+
+ contains: list[T] | None = strawberry_django.filter_field(description='Contains the value')
+ contained_by: list[T] | None = strawberry_django.filter_field(description='Contained by the value')
+ overlap: list[T] | None = strawberry_django.filter_field(description='Overlaps with the value')
+ length: int | None = strawberry_django.filter_field(description='Length of the array')
+
+
+@strawberry.input(one_of=True, description='Lookup for Array fields. Only one of the lookup fields can be set.')
+class IntegerArrayLookup(ArrayLookup[int]):
+ pass
+
+
+@strawberry.input(one_of=True, description='Lookup for Array fields. Only one of the lookup fields can be set.')
+class FloatArrayLookup(ArrayLookup[float]):
+ pass
+
+
+@strawberry.input(one_of=True, description='Lookup for Array fields. Only one of the lookup fields can be set.')
+class StringArrayLookup(ArrayLookup[str]):
+ pass
diff --git a/netbox/netbox/graphql/filter_mixins.py b/netbox/netbox/graphql/filter_mixins.py
index 2044a1dde..ce6d81a86 100644
--- a/netbox/netbox/graphql/filter_mixins.py
+++ b/netbox/netbox/graphql/filter_mixins.py
@@ -1,209 +1,109 @@
-from functools import partialmethod
-from typing import List
+from dataclasses import dataclass
+from datetime import datetime
+from typing import TypeVar, TYPE_CHECKING, Annotated
-import django_filters
import strawberry
import strawberry_django
-from django.core.exceptions import FieldDoesNotExist
-from strawberry import auto
+from strawberry import ID
+from strawberry_django import FilterLookup, DatetimeFilterLookup
-from ipam.fields import ASNField
-from netbox.graphql.scalars import BigInt
-from utilities.fields import ColorField, CounterCacheField
-from utilities.filters import *
+from core.graphql.filter_mixins import BaseFilterMixin, BaseObjectTypeFilterMixin, ChangeLogFilterMixin
+from extras.graphql.filter_mixins import CustomFieldsFilterMixin, JournalEntriesFilterMixin, TagsFilterMixin
+from netbox.graphql.filter_lookups import IntegerLookup
+
+__all__ = (
+ 'DistanceFilterMixin',
+ 'ImageAttachmentFilterMixin',
+ 'NestedGroupModelFilterMixin',
+ 'NetBoxModelFilterMixin',
+ 'OrganizationalModelFilterMixin',
+ 'PrimaryModelFilterMixin',
+ 'SyncedDataFilterMixin',
+ 'WeightFilterMixin',
+)
+
+T = TypeVar('T')
-def map_strawberry_type(field):
- should_create_function = False
- attr_type = None
-
- # NetBox Filter types - put base classes after derived classes
- if isinstance(field, ContentTypeFilter):
- should_create_function = True
- attr_type = str | None
- elif isinstance(field, MultiValueArrayFilter):
- pass
- elif isinstance(field, MultiValueCharFilter):
- # Note: Need to use the legacy FilterLookup from filters, not from
- # strawberry_django.FilterLookup as we currently have USE_DEPRECATED_FILTERS
- attr_type = strawberry_django.filters.FilterLookup[str] | None
- elif isinstance(field, MultiValueDateFilter):
- attr_type = auto
- elif isinstance(field, MultiValueDateTimeFilter):
- attr_type = auto
- elif isinstance(field, MultiValueDecimalFilter):
- pass
- elif isinstance(field, MultiValueMACAddressFilter):
- should_create_function = True
- attr_type = List[str] | None
- elif isinstance(field, MultiValueNumberFilter):
- should_create_function = True
- attr_type = List[str] | None
- elif isinstance(field, MultiValueTimeFilter):
- pass
- elif isinstance(field, MultiValueWWNFilter):
- should_create_function = True
- attr_type = List[str] | None
- elif isinstance(field, NullableCharFieldFilter):
- pass
- elif isinstance(field, NumericArrayFilter):
- should_create_function = True
- attr_type = int | None
- elif isinstance(field, TreeNodeMultipleChoiceFilter):
- should_create_function = True
- attr_type = List[str] | None
-
- # From django_filters - ordering of these matters as base classes must
- # come after derived classes so the base class doesn't get matched first
- # a pass for the check (no attr_type) means we don't currently handle
- # or use that type
- elif issubclass(type(field), django_filters.OrderingFilter):
- pass
- elif issubclass(type(field), django_filters.BaseRangeFilter):
- pass
- elif issubclass(type(field), django_filters.BaseInFilter):
- pass
- elif issubclass(type(field), django_filters.LookupChoiceFilter):
- pass
- elif issubclass(type(field), django_filters.AllValuesMultipleFilter):
- pass
- elif issubclass(type(field), django_filters.AllValuesFilter):
- pass
- elif issubclass(type(field), django_filters.TimeRangeFilter):
- pass
- elif issubclass(type(field), django_filters.IsoDateTimeFromToRangeFilter):
- should_create_function = True
- attr_type = str | None
- elif issubclass(type(field), django_filters.DateTimeFromToRangeFilter):
- should_create_function = True
- attr_type = str | None
- elif issubclass(type(field), django_filters.DateFromToRangeFilter):
- should_create_function = True
- attr_type = str | None
- elif issubclass(type(field), django_filters.DateRangeFilter):
- should_create_function = True
- attr_type = str | None
- elif issubclass(type(field), django_filters.RangeFilter):
- pass
- elif issubclass(type(field), django_filters.NumericRangeFilter):
- pass
- elif issubclass(type(field), django_filters.NumberFilter):
- should_create_function = True
- attr_type = int | None
- elif issubclass(type(field), django_filters.ModelMultipleChoiceFilter):
- should_create_function = True
- attr_type = List[str] | None
- elif issubclass(type(field), django_filters.ModelChoiceFilter):
- should_create_function = True
- attr_type = str | None
- elif issubclass(type(field), django_filters.DurationFilter):
- pass
- elif issubclass(type(field), django_filters.IsoDateTimeFilter):
- pass
- elif issubclass(type(field), django_filters.DateTimeFilter):
- attr_type = auto
- elif issubclass(type(field), django_filters.TimeFilter):
- attr_type = auto
- elif issubclass(type(field), django_filters.DateFilter):
- attr_type = auto
- elif issubclass(type(field), django_filters.TypedMultipleChoiceFilter):
- pass
- elif issubclass(type(field), django_filters.MultipleChoiceFilter):
- attr_type = str | None
- elif issubclass(type(field), django_filters.TypedChoiceFilter):
- pass
- elif issubclass(type(field), django_filters.ChoiceFilter):
- pass
- elif issubclass(type(field), django_filters.BooleanFilter):
- should_create_function = True
- attr_type = bool | None
- elif issubclass(type(field), django_filters.UUIDFilter):
- should_create_function = True
- attr_type = str | None
- elif issubclass(type(field), django_filters.CharFilter):
- # looks like only used by 'q'
- should_create_function = True
- attr_type = str | None
-
- return should_create_function, attr_type
+if TYPE_CHECKING:
+ from .enums import *
+ from core.graphql.filters import *
+ from extras.graphql.filters import *
-def autotype_decorator(filterset):
- """
- Decorator used to auto creates a dataclass used by Strawberry based on a filterset.
- Must go after the Strawberry decorator as follows:
-
- @strawberry_django.filter(models.Example, lookups=True)
- @autotype_decorator(filtersets.ExampleFilterSet)
- class ExampleFilter(BaseFilterMixin):
- pass
-
- The Filter itself must be derived from BaseFilterMixin. For items listed in meta.fields
- of the filterset, usually just a type specifier is generated, so for
- `fields = [created, ]` the dataclass would be:
-
- class ExampleFilter(BaseFilterMixin):
- created: auto
-
- For other filter fields a function needs to be created for Strawberry with the
- naming convention `filter_{fieldname}` which is auto detected and called by
- Strawberry, this function uses the filterset to handle the query.
- """
- def create_attribute_and_function(cls, fieldname, attr_type, should_create_function):
- if fieldname not in cls.__annotations__ and attr_type:
- cls.__annotations__[fieldname] = attr_type
-
- filter_name = f"filter_{fieldname}"
- if should_create_function and not hasattr(cls, filter_name):
- filter_by_filterset = getattr(cls, 'filter_by_filterset')
- setattr(cls, filter_name, partialmethod(filter_by_filterset, key=fieldname))
-
- def wrapper(cls):
- cls.filterset = filterset
- fields = filterset.get_fields()
- model = filterset._meta.model
- for fieldname in fields.keys():
- should_create_function = False
- attr_type = auto
- if fieldname not in cls.__annotations__:
- try:
- field = model._meta.get_field(fieldname)
- except FieldDoesNotExist:
- continue
-
- if isinstance(field, CounterCacheField):
- should_create_function = True
- attr_type = BigInt | None
- elif isinstance(field, ASNField):
- should_create_function = True
- attr_type = List[str] | None
- elif isinstance(field, ColorField):
- should_create_function = True
- attr_type = List[str] | None
-
- create_attribute_and_function(cls, fieldname, attr_type, should_create_function)
-
- declared_filters = filterset.declared_filters
- for fieldname, field in declared_filters.items():
-
- should_create_function, attr_type = map_strawberry_type(field)
- if attr_type is None:
- raise NotImplementedError(f"GraphQL Filter field unknown: {fieldname}: {field}")
-
- create_attribute_and_function(cls, fieldname, attr_type, should_create_function)
-
- return cls
-
- return wrapper
+class NetBoxModelFilterMixin(
+ ChangeLogFilterMixin,
+ CustomFieldsFilterMixin,
+ JournalEntriesFilterMixin,
+ TagsFilterMixin,
+ BaseObjectTypeFilterMixin,
+):
+ pass
-@strawberry.input
-class BaseFilterMixin:
+@dataclass
+class NestedGroupModelFilterMixin(NetBoxModelFilterMixin):
+ name: FilterLookup[str] | None = strawberry_django.filter_field()
+ slug: FilterLookup[str] | None = strawberry_django.filter_field()
+ description: FilterLookup[str] | None = strawberry_django.filter_field()
+ lft: IntegerLookup | None = strawberry_django.filter_field()
+ rght: IntegerLookup | None = strawberry_django.filter_field()
+ tree_id: IntegerLookup | None = strawberry_django.filter_field()
+ level: IntegerLookup | None = strawberry_django.filter_field()
+ parent_id: ID | None = strawberry_django.filter_field()
- def filter_by_filterset(self, queryset, key):
- filterset = self.filterset(data={key: getattr(self, key)}, queryset=queryset)
- if not filterset.is_valid():
- # We could raise validation error but strawberry logs it all to the
- # console i.e. raise ValidationError(f"{k}: {v[0]}")
- return filterset.qs.none()
- return filterset.qs
+
+@dataclass
+class OrganizationalModelFilterMixin(
+ ChangeLogFilterMixin,
+ CustomFieldsFilterMixin,
+ TagsFilterMixin,
+ BaseObjectTypeFilterMixin,
+):
+ name: FilterLookup[str] | None = strawberry_django.filter_field()
+ slug: FilterLookup[str] | None = strawberry_django.filter_field()
+ description: FilterLookup[str] | None = strawberry_django.filter_field()
+
+
+@dataclass
+class PrimaryModelFilterMixin(NetBoxModelFilterMixin):
+ description: FilterLookup[str] | None = strawberry_django.filter_field()
+ comments: FilterLookup[str] | None = strawberry_django.filter_field()
+
+
+@dataclass
+class ImageAttachmentFilterMixin(BaseFilterMixin):
+ images: Annotated['ImageAttachmentFilter', strawberry.lazy('extras.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
+
+
+@dataclass
+class WeightFilterMixin(BaseFilterMixin):
+ weight: FilterLookup[float] | None = strawberry_django.filter_field()
+ weight_unit: Annotated['WeightUnitEnum', strawberry.lazy('netbox.graphql.enums')] | None = (
+ strawberry_django.filter_field()
+ )
+
+
+@dataclass
+class SyncedDataFilterMixin(BaseFilterMixin):
+ data_source: Annotated['DataSourceFilter', strawberry.lazy('core.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
+ data_source_id: FilterLookup[int] | None = strawberry_django.filter_field()
+ data_file: Annotated['DataFileFilter', strawberry.lazy('core.graphql.filters')] | None = (
+ strawberry_django.filter_field()
+ )
+ data_file_id: FilterLookup[int] | None = strawberry_django.filter_field()
+ data_path: FilterLookup[str] | None = strawberry_django.filter_field()
+ auto_sync_enabled: FilterLookup[bool] | None = strawberry_django.filter_field()
+ data_synced: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()
+
+
+@dataclass
+class DistanceFilterMixin(BaseFilterMixin):
+ distance: FilterLookup[float] | None = strawberry_django.filter_field()
+ distance_unit: Annotated['DistanceUnitEnum', strawberry.lazy('netbox.graphql.enums')] | None = (
+ strawberry_django.filter_field()
+ )
diff --git a/netbox/netbox/graphql/schema.py b/netbox/netbox/graphql/schema.py
index a7609c9d2..c840e769c 100644
--- a/netbox/netbox/graphql/schema.py
+++ b/netbox/netbox/graphql/schema.py
@@ -1,7 +1,7 @@
import strawberry
from django.conf import settings
from strawberry_django.optimizer import DjangoOptimizerExtension
-from strawberry.extensions import MaxAliasesLimiter
+from strawberry.extensions import MaxAliasesLimiter # , SchemaExtension
from strawberry.schema.config import StrawberryConfig
from circuits.graphql.schema import CircuitsQuery
diff --git a/netbox/netbox/graphql/types.py b/netbox/netbox/graphql/types.py
index a4fc99080..653462630 100644
--- a/netbox/netbox/graphql/types.py
+++ b/netbox/netbox/graphql/types.py
@@ -8,6 +8,7 @@ from extras.graphql.mixins import CustomFieldsMixin, JournalEntriesMixin, TagsMi
__all__ = (
'BaseObjectType',
+ 'ContentTypeType',
'ObjectType',
'OrganizationalObjectType',
'NetBoxObjectType',
@@ -83,6 +84,7 @@ class NetBoxObjectType(
@strawberry_django.type(
ContentType,
fields=['id', 'app_label', 'model'],
+ pagination=True
)
class ContentTypeType:
pass
@@ -91,6 +93,7 @@ class ContentTypeType:
@strawberry_django.type(
ObjectType_,
fields=['id', 'app_label', 'model'],
+ pagination=True
)
class ObjectTypeType:
pass
diff --git a/netbox/netbox/middleware.py b/netbox/netbox/middleware.py
index b9424bd7c..714c20e56 100644
--- a/netbox/netbox/middleware.py
+++ b/netbox/netbox/middleware.py
@@ -2,6 +2,7 @@ from contextlib import ExitStack
import logging
import uuid
+import warnings
from django.conf import settings
from django.contrib import auth, messages
@@ -37,7 +38,10 @@ class CoreMiddleware:
# Apply all registered request processors
with ExitStack() as stack:
for request_processor in registry['request_processors']:
- stack.enter_context(request_processor(request))
+ try:
+ stack.enter_context(request_processor(request))
+ except Exception as e:
+ warnings.warn(f'Failed to initialize request processor {request_processor}: {e}')
response = self.get_response(request)
# Check if language cookie should be renewed
@@ -94,18 +98,23 @@ class RemoteUserMiddleware(RemoteUserMiddleware_):
"""
Custom implementation of Django's RemoteUserMiddleware which allows for a user-configurable HTTP header name.
"""
+ async_capable = False
force_logout_if_no_header = False
+ def __init__(self, get_response):
+ if get_response is None:
+ raise ValueError("get_response must be provided.")
+ self.get_response = get_response
+
@property
def header(self):
return settings.REMOTE_AUTH_HEADER
- def process_request(self, request):
- logger = logging.getLogger(
- 'netbox.authentication.RemoteUserMiddleware')
+ def __call__(self, request):
+ logger = logging.getLogger('netbox.authentication.RemoteUserMiddleware')
# Bypass middleware if remote authentication is not enabled
if not settings.REMOTE_AUTH_ENABLED:
- return
+ return self.get_response(request)
# AuthenticationMiddleware is required so that request.user exists.
if not hasattr(request, 'user'):
raise ImproperlyConfigured(
@@ -122,13 +131,13 @@ class RemoteUserMiddleware(RemoteUserMiddleware_):
# AnonymousUser by the AuthenticationMiddleware).
if self.force_logout_if_no_header and request.user.is_authenticated:
self._remove_invalid_user(request)
- return
+ return self.get_response(request)
# If the user is already authenticated and that user is the user we are
# getting passed in the headers, then the correct user is already
# persisted in the session and we don't need to continue.
if request.user.is_authenticated:
if request.user.get_username() == self.clean_username(username, request):
- return
+ return self.get_response(request)
else:
# An authenticated user is associated with the request, but
# it does not match the authorized user in the header.
@@ -158,6 +167,8 @@ class RemoteUserMiddleware(RemoteUserMiddleware_):
request.user = user
auth.login(request, user)
+ return self.get_response(request)
+
def _get_groups(self, request):
logger = logging.getLogger(
'netbox.authentication.RemoteUserMiddleware')
diff --git a/netbox/netbox/models/__init__.py b/netbox/netbox/models/__init__.py
index b1f7cfd48..3ad0ac556 100644
--- a/netbox/netbox/models/__init__.py
+++ b/netbox/netbox/models/__init__.py
@@ -150,6 +150,10 @@ class NestedGroupModel(NetBoxFeatureSet, MPTTModel):
max_length=200,
blank=True
)
+ comments = models.TextField(
+ verbose_name=_('comments'),
+ blank=True
+ )
objects = TreeManager()
diff --git a/netbox/netbox/models/features.py b/netbox/netbox/models/features.py
index a97227770..55093e69d 100644
--- a/netbox/netbox/models/features.py
+++ b/netbox/netbox/models/features.py
@@ -5,6 +5,7 @@ from functools import cached_property
from django.contrib.contenttypes.fields import GenericRelation
from django.core.validators import ValidationError
from django.db import models
+from django.db.models import Q
from django.utils import timezone
from django.utils.translation import gettext_lazy as _
from taggit.managers import TaggableManager
@@ -19,7 +20,6 @@ from netbox.registry import registry
from netbox.signals import post_clean
from utilities.json import CustomFieldJSONEncoder
from utilities.serialization import serialize_object
-from utilities.views import register_model_view
__all__ = (
'BookmarksMixin',
@@ -352,7 +352,7 @@ class ImageAttachmentsMixin(models.Model):
class ContactsMixin(models.Model):
"""
- Enables the assignments of Contacts (via ContactAssignment).
+ Enables the assignment of Contacts to a model (via ContactAssignment).
"""
contacts = GenericRelation(
to='tenancy.ContactAssignment',
@@ -363,6 +363,27 @@ class ContactsMixin(models.Model):
class Meta:
abstract = True
+ def get_contacts(self, inherited=True):
+ """
+ Return a `QuerySet` matching all contacts assigned to this object.
+
+ Args:
+ inherited: If `True`, inherited contacts from parent objects are included.
+ """
+ from tenancy.models import ContactAssignment
+ from . import NestedGroupModel
+
+ filter = Q(
+ object_type=ObjectType.objects.get_for_model(self),
+ object_id__in=(
+ self.get_ancestors(include_self=True)
+ if (isinstance(self, NestedGroupModel) and inherited)
+ else [self.pk]
+ ),
+ )
+
+ return ContactAssignment.objects.filter(filter)
+
class BookmarksMixin(models.Model):
"""
@@ -434,7 +455,8 @@ class TagsMixin(models.Model):
which is a `TaggableManager` instance.
"""
tags = TaggableManager(
- through='extras.TaggedItem'
+ through='extras.TaggedItem',
+ ordering=('weight', 'name'),
)
class Meta:
@@ -617,6 +639,8 @@ def register_models(*models):
register_model() should be called for each relevant model under the ready() of an app's AppConfig class.
"""
+ from utilities.views import register_model_view
+
for model in models:
app_label, model_name = model._meta.label_lower.split('.')
@@ -637,6 +661,10 @@ def register_models(*models):
)
# Register applicable feature views for the model
+ if issubclass(model, ContactsMixin):
+ register_model_view(model, 'contacts', kwargs={'model': model})(
+ 'netbox.views.generic.ObjectContactsView'
+ )
if issubclass(model, JournalingMixin):
register_model_view(model, 'journal', kwargs={'model': model})(
'netbox.views.generic.ObjectJournalView'
diff --git a/netbox/netbox/navigation/menu.py b/netbox/netbox/navigation/menu.py
index 9148caa8e..778f0d67c 100644
--- a/netbox/netbox/navigation/menu.py
+++ b/netbox/netbox/navigation/menu.py
@@ -85,6 +85,7 @@ DEVICES_MENU = Menu(
items=(
get_model_item('dcim', 'devicetype', _('Device Types')),
get_model_item('dcim', 'moduletype', _('Module Types')),
+ get_model_item('dcim', 'moduletypeprofile', _('Module Type Profiles')),
get_model_item('dcim', 'manufacturer', _('Manufacturers')),
),
),
diff --git a/netbox/netbox/plugins/__init__.py b/netbox/netbox/plugins/__init__.py
index bb3280ac4..b7bb0ef9f 100644
--- a/netbox/netbox/plugins/__init__.py
+++ b/netbox/netbox/plugins/__init__.py
@@ -6,6 +6,7 @@ from django.core.exceptions import ImproperlyConfigured
from django.utils.module_loading import import_string
from packaging import version
+from core.exceptions import IncompatiblePluginError
from netbox.registry import registry
from netbox.search import register_search
from netbox.utils import register_data_backend
@@ -140,14 +141,14 @@ class PluginConfig(AppConfig):
if cls.min_version is not None:
min_version = version.parse(cls.min_version)
if current_version < min_version:
- raise ImproperlyConfigured(
+ raise IncompatiblePluginError(
f"Plugin {cls.__module__} requires NetBox minimum version {cls.min_version} (current: "
f"{netbox_version})."
)
if cls.max_version is not None:
max_version = version.parse(cls.max_version)
if current_version > max_version:
- raise ImproperlyConfigured(
+ raise IncompatiblePluginError(
f"Plugin {cls.__module__} requires NetBox maximum version {cls.max_version} (current: "
f"{netbox_version})."
)
diff --git a/netbox/netbox/plugins/registration.py b/netbox/netbox/plugins/registration.py
index 515405f1b..0001d50c9 100644
--- a/netbox/netbox/plugins/registration.py
+++ b/netbox/netbox/plugins/registration.py
@@ -1,7 +1,7 @@
import inspect
-import warnings
from django.utils.translation import gettext_lazy as _
+
from netbox.registry import registry
from .navigation import PluginMenu, PluginMenuButton, PluginMenuItem
from .templates import PluginTemplateExtension
@@ -35,16 +35,8 @@ def register_template_extensions(class_list):
)
if template_extension.models:
- # Registration for multiple models
+ # Registration for specific models
models = template_extension.models
- elif template_extension.model:
- # Registration for a single model (deprecated)
- warnings.warn(
- "PluginTemplateExtension.model is deprecated and will be removed in a future release. Use "
- "'models' instead.",
- DeprecationWarning
- )
- models = [template_extension.model]
else:
# Global registration (no specific models)
models = [None]
diff --git a/netbox/netbox/plugins/templates.py b/netbox/netbox/plugins/templates.py
index 4ea90b4db..586391d4f 100644
--- a/netbox/netbox/plugins/templates.py
+++ b/netbox/netbox/plugins/templates.py
@@ -11,8 +11,14 @@ class PluginTemplateExtension:
This class is used to register plugin content to be injected into core NetBox templates. It contains methods
that are overridden by plugin authors to return template content.
- The `model` attribute on the class defines the which model detail page this class renders content for. It
- should be set as a string in the form '| {% trans "Manufacturer" %} | +{{ object.module_type.manufacturer|linkify }} | +
|---|---|
| {% trans "Model" %} | +{{ object.module_type|linkify }} | +
| {{ k }} | +{{ v|placeholder }} | +
| {% trans "Profile" %} | +{{ object.profile|linkify|placeholder }} | +|||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {% trans "Manufacturer" %} | {{ object.manufacturer|linkify }} | @@ -60,6 +64,27 @@ {% plugin_left_page object %}
| {{ k }} | +{{ v|placeholder }} | +
|---|
| {% trans "Name" %} | +{{ object.name }} | +
|---|---|
| {% trans "Description" %} | +{{ object.description|placeholder }} | +
{{ object.schema|json }}
+ | {% trans "Description" %} | {{ object.description|placeholder }} | +||||||
|---|---|---|---|---|---|---|---|
| {% trans "MIME Type" %} | +{{ object.mime_type|placeholder }} | +||||||
| {% trans "File Name" %} | +{{ object.file_name|placeholder }} | +||||||
| {% trans "File Extension" %} | +{{ object.file_extension|placeholder }} | +||||||
| {% trans "Attachment" %} | +{% checkmark object.as_attachment %} | +||||||
| {% trans "Data Source" %} |
@@ -51,7 +67,7 @@
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
-
+ {% trans "Environment Parameters" %}
diff --git a/netbox/templates/extras/exporttemplate.html b/netbox/templates/extras/exporttemplate.html
index 5a19426f2..fd1e56d11 100644
--- a/netbox/templates/extras/exporttemplate.html
+++ b/netbox/templates/extras/exporttemplate.html
@@ -6,8 +6,8 @@
{% block title %}{{ object.name }}{% endblock %}
{% block content %}
-
-
+
+ {% trans "Export Template" %}
{% trans "Assigned Models" %}
-
{% plugin_right_page object %}
@@ -87,6 +90,13 @@
{% trans "Template" %}+{% trans "Environment Parameters" %}
- {% include 'inc/sync_warning.html' %}
-
{{ object.template_code }}
+ {{ object.environment_params }}
+
+
{% plugin_full_width_page object %}
{% trans "Template" %}+
+ {% include 'inc/sync_warning.html' %}
+
+ {{ object.template_code }}
+ |
||||||
| {% trans "Weight" %} | +{{ object.weight }} | +||||||
| {% trans "Tagged Items" %} | diff --git a/netbox/templates/ipam/iprange.html b/netbox/templates/ipam/iprange.html index 19fbd5171..0de00ee45 100644 --- a/netbox/templates/ipam/iprange.html +++ b/netbox/templates/ipam/iprange.html @@ -25,12 +25,19 @@ | {% trans "Size" %} | {{ object.size }} | ||||
| {% trans "Marked Populated" %} | +{% checkmark object.mark_populated %} | +||||||
| {% trans "Marked Utilized" %} | +{% checkmark object.mark_utilized %} | +||||||
| {% trans "Utilization" %} | {% if object.mark_utilized %} {% utilization_graph 100 warning_threshold=0 danger_threshold=0 %} - ({% trans "Marked fully utilized" %}) {% else %} {% utilization_graph object.utilization %} {% endif %} diff --git a/netbox/templates/ipam/vlangroup.html b/netbox/templates/ipam/vlangroup.html index f994852be..abc998de3 100644 --- a/netbox/templates/ipam/vlangroup.html +++ b/netbox/templates/ipam/vlangroup.html @@ -46,6 +46,15 @@ | Utilization | {% utilization_graph object.utilization %} | ||||
| {% trans "Tenant" %} | ++ {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} + | +
| {% trans "Group" %} | -{{ object.group|linkify|placeholder }} | +{% trans "Groups" %} | +
+ {% if object.groups.all|length > 0 %}
+
|
|---|---|---|---|
| {% trans "Name" %} | diff --git a/netbox/templates/tenancy/contactgroup.html b/netbox/templates/tenancy/contactgroup.html index bf6928c15..25b1da440 100644 --- a/netbox/templates/tenancy/contactgroup.html +++ b/netbox/templates/tenancy/contactgroup.html @@ -32,6 +32,7 @@