- {% include 'inc/panels/comments.html' %}
+ {% include 'circuits/inc/circuit_termination.html' with termination=object.termination_a side='A' %}
+ {% include 'circuits/inc/circuit_termination.html' with termination=object.termination_z side='Z' %}
{% include 'inc/panels/contacts.html' %}
{% include 'inc/panels/image_attachments.html' %}
{% plugin_right_page object %}
-
{% plugin_full_width_page object %}
diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html
index c552c2398..18814a428 100644
--- a/netbox/templates/dcim/powerport.html
+++ b/netbox/templates/dcim/powerport.html
@@ -77,10 +77,10 @@
diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html
index dc53746db..f3b02f5a2 100644
--- a/netbox/templates/dcim/rearport.html
+++ b/netbox/templates/dcim/rearport.html
@@ -105,16 +105,16 @@
diff --git a/netbox/tenancy/apps.py b/netbox/tenancy/apps.py
index 53cb9a056..eeb141152 100644
--- a/netbox/tenancy/apps.py
+++ b/netbox/tenancy/apps.py
@@ -3,3 +3,6 @@ from django.apps import AppConfig
class TenancyConfig(AppConfig):
name = 'tenancy'
+
+ def ready(self):
+ from . import search
diff --git a/netbox/tenancy/forms/models.py b/netbox/tenancy/forms/models.py
index eabcb1d0f..80af04928 100644
--- a/netbox/tenancy/forms/models.py
+++ b/netbox/tenancy/forms/models.py
@@ -27,6 +27,12 @@ class TenantGroupForm(NetBoxModelForm):
)
slug = SlugField()
+ fieldsets = (
+ ('Tenant Group', (
+ 'parent', 'name', 'slug', 'description', 'tags',
+ )),
+ )
+
class Meta:
model = TenantGroup
fields = [
@@ -64,6 +70,12 @@ class ContactGroupForm(NetBoxModelForm):
)
slug = SlugField()
+ fieldsets = (
+ ('Contact Group', (
+ 'parent', 'name', 'slug', 'description', 'tags',
+ )),
+ )
+
class Meta:
model = ContactGroup
fields = ('parent', 'name', 'slug', 'description', 'tags')
@@ -72,6 +84,12 @@ class ContactGroupForm(NetBoxModelForm):
class ContactRoleForm(NetBoxModelForm):
slug = SlugField()
+ fieldsets = (
+ ('Contact Role', (
+ 'name', 'slug', 'description', 'tags',
+ )),
+ )
+
class Meta:
model = ContactRole
fields = ('name', 'slug', 'description', 'tags')
diff --git a/netbox/tenancy/search.py b/netbox/tenancy/search.py
new file mode 100644
index 000000000..e52b1859e
--- /dev/null
+++ b/netbox/tenancy/search.py
@@ -0,0 +1,25 @@
+import tenancy.filtersets
+import tenancy.tables
+from netbox.search import SearchIndex, register_search
+from tenancy.models import Contact, ContactAssignment, Tenant
+from utilities.utils import count_related
+
+
+@register_search()
+class TenantIndex(SearchIndex):
+ model = Tenant
+ queryset = Tenant.objects.prefetch_related('group')
+ filterset = tenancy.filtersets.TenantFilterSet
+ table = tenancy.tables.TenantTable
+ url = 'tenancy:tenant_list'
+
+
+@register_search()
+class ContactIndex(SearchIndex):
+ model = Contact
+ queryset = Contact.objects.prefetch_related('group', 'assignments').annotate(
+ assignment_count=count_related(ContactAssignment, 'contact')
+ )
+ filterset = tenancy.filtersets.ContactFilterSet
+ table = tenancy.tables.ContactTable
+ url = 'tenancy:contact_list'
diff --git a/netbox/tenancy/tables/columns.py b/netbox/tenancy/tables/columns.py
index 21622f18b..491d0488f 100644
--- a/netbox/tenancy/tables/columns.py
+++ b/netbox/tenancy/tables/columns.py
@@ -1,6 +1,9 @@
import django_tables2 as tables
+from netbox.tables import columns
+
__all__ = (
+ 'ContactsColumnMixin',
'TenantColumn',
'TenantGroupColumn',
'TenancyColumnsMixin',
@@ -55,3 +58,10 @@ class TenantGroupColumn(tables.TemplateColumn):
class TenancyColumnsMixin(tables.Table):
tenant_group = TenantGroupColumn()
tenant = TenantColumn()
+
+
+class ContactsColumnMixin(tables.Table):
+ contacts = columns.ManyToManyColumn(
+ linkify_item=True,
+ transform=lambda obj: obj.contact.name
+ )
diff --git a/netbox/tenancy/tables/tenants.py b/netbox/tenancy/tables/tenants.py
index f18f1db09..9c404fb4b 100644
--- a/netbox/tenancy/tables/tenants.py
+++ b/netbox/tenancy/tables/tenants.py
@@ -1,7 +1,8 @@
import django_tables2 as tables
+from tenancy.models import *
+from tenancy.tables import ContactsColumnMixin
from netbox.tables import NetBoxTable, columns
-from tenancy.models import *
__all__ = (
'TenantGroupTable',
@@ -30,7 +31,7 @@ class TenantGroupTable(NetBoxTable):
default_columns = ('pk', 'name', 'tenant_count', 'description')
-class TenantTable(NetBoxTable):
+class TenantTable(ContactsColumnMixin, NetBoxTable):
name = tables.Column(
linkify=True
)
@@ -38,9 +39,6 @@ class TenantTable(NetBoxTable):
linkify=True
)
comments = columns.MarkdownColumn()
- contacts = columns.ManyToManyColumn(
- linkify_item=True
- )
tags = columns.TagColumn(
url_name='tenancy:contact_list'
)
diff --git a/netbox/users/utils.py b/netbox/users/utils.py
new file mode 100644
index 000000000..114d8ab6d
--- /dev/null
+++ b/netbox/users/utils.py
@@ -0,0 +1,9 @@
+from social_core.storage import NO_ASCII_REGEX, NO_SPECIAL_REGEX
+
+
+def clean_username(value):
+ """Clean username removing any unsupported character"""
+ value = NO_ASCII_REGEX.sub('', value)
+ value = NO_SPECIAL_REGEX.sub('', value)
+ value = value.replace(':', '')
+ return value
diff --git a/netbox/utilities/templatetags/search.py b/netbox/utilities/templatetags/search.py
index 5726ae5d5..ca8f3ba2a 100644
--- a/netbox/utilities/templatetags/search.py
+++ b/netbox/utilities/templatetags/search.py
@@ -1,16 +1,18 @@
from typing import Dict
-from netbox.forms import SearchForm
+
from django import template
-register = template.Library()
+from netbox.forms import SearchForm
+register = template.Library()
search_form = SearchForm()
@register.inclusion_tag("search/searchbar.html")
def search_options(request) -> Dict:
- """Provide search options to template."""
+
+ # Provide search options to template.
return {
- 'options': search_form.options,
+ 'options': search_form.get_options(),
'request': request,
}
diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py
index 8815ede1f..c0836b71d 100644
--- a/netbox/utilities/testing/api.py
+++ b/netbox/utilities/testing/api.py
@@ -450,6 +450,9 @@ class APIViewTestCases:
if type(field) is GQLDynamic:
# Dynamic fields must specify a subselection
fields_string += f'{field_name} {{ id }}\n'
+ elif inspect.isclass(field.type) and issubclass(field.type, GQLUnion):
+ # Union types dont' have an id or consistent values
+ continue
elif type(field.type) is GQLList and inspect.isclass(field.type.of_type) and issubclass(field.type.of_type, GQLUnion):
# Union types dont' have an id or consistent values
continue
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index bdd6e4880..edad7c1b2 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -140,19 +140,22 @@ class ViewTab:
Args:
label: Human-friendly text
- badge: A static value or callable to display alongside the label (optional). If a callable is used, it must accept a single
- argument representing the object being viewed.
+ badge: A static value or callable to display alongside the label (optional). If a callable is used, it must
+ accept a single argument representing the object being viewed.
permission: The permission required to display the tab (optional).
+ hide_if_empty: If true, the tab will be displayed only if its badge has a meaningful value. (Tabs without a
+ badge are always displayed.)
"""
- def __init__(self, label, badge=None, permission=None):
+ def __init__(self, label, badge=None, permission=None, hide_if_empty=False):
self.label = label
self.badge = badge
self.permission = permission
+ self.hide_if_empty = hide_if_empty
def render(self, instance):
"""Return the attributes needed to render a tab in HTML."""
badge_value = self._get_badge_value(instance)
- if self.badge and not badge_value:
+ if self.badge and self.hide_if_empty and not badge_value:
return None
return {
'label': self.label,
diff --git a/netbox/virtualization/apps.py b/netbox/virtualization/apps.py
index 35d6e8266..1b6b110df 100644
--- a/netbox/virtualization/apps.py
+++ b/netbox/virtualization/apps.py
@@ -3,3 +3,6 @@ from django.apps import AppConfig
class VirtualizationConfig(AppConfig):
name = 'virtualization'
+
+ def ready(self):
+ from . import search
diff --git a/netbox/virtualization/forms/models.py b/netbox/virtualization/forms/models.py
index 268afb9bb..1b5c5adc6 100644
--- a/netbox/virtualization/forms/models.py
+++ b/netbox/virtualization/forms/models.py
@@ -28,6 +28,12 @@ __all__ = (
class ClusterTypeForm(NetBoxModelForm):
slug = SlugField()
+ fieldsets = (
+ ('Cluster Type', (
+ 'name', 'slug', 'description', 'tags',
+ )),
+ )
+
class Meta:
model = ClusterType
fields = (
@@ -38,6 +44,12 @@ class ClusterTypeForm(NetBoxModelForm):
class ClusterGroupForm(NetBoxModelForm):
slug = SlugField()
+ fieldsets = (
+ ('Cluster Group', (
+ 'name', 'slug', 'description', 'tags',
+ )),
+ )
+
class Meta:
model = ClusterGroup
fields = (
diff --git a/netbox/virtualization/search.py b/netbox/virtualization/search.py
new file mode 100644
index 000000000..5b24f7fa0
--- /dev/null
+++ b/netbox/virtualization/search.py
@@ -0,0 +1,33 @@
+import virtualization.filtersets
+import virtualization.tables
+from dcim.models import Device
+from netbox.search import SearchIndex, register_search
+from utilities.utils import count_related
+from virtualization.models import Cluster, VirtualMachine
+
+
+@register_search()
+class ClusterIndex(SearchIndex):
+ model = Cluster
+ queryset = Cluster.objects.prefetch_related('type', 'group').annotate(
+ device_count=count_related(Device, 'cluster'), vm_count=count_related(VirtualMachine, 'cluster')
+ )
+ filterset = virtualization.filtersets.ClusterFilterSet
+ table = virtualization.tables.ClusterTable
+ url = 'virtualization:cluster_list'
+
+
+@register_search()
+class VirtualMachineIndex(SearchIndex):
+ model = VirtualMachine
+ queryset = VirtualMachine.objects.prefetch_related(
+ 'cluster',
+ 'tenant',
+ 'tenant__group',
+ 'platform',
+ 'primary_ip4',
+ 'primary_ip6',
+ )
+ filterset = virtualization.filtersets.VirtualMachineFilterSet
+ table = virtualization.tables.VirtualMachineTable
+ url = 'virtualization:virtualmachine_list'
diff --git a/netbox/virtualization/tables/clusters.py b/netbox/virtualization/tables/clusters.py
index ba0f2d301..fec539b8c 100644
--- a/netbox/virtualization/tables/clusters.py
+++ b/netbox/virtualization/tables/clusters.py
@@ -1,8 +1,8 @@
import django_tables2 as tables
+from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
+from virtualization.models import Cluster, ClusterGroup, ClusterType
from netbox.tables import NetBoxTable, columns
-from tenancy.tables import TenancyColumnsMixin
-from virtualization.models import Cluster, ClusterGroup, ClusterType
__all__ = (
'ClusterTable',
@@ -32,7 +32,7 @@ class ClusterTypeTable(NetBoxTable):
default_columns = ('pk', 'name', 'cluster_count', 'description')
-class ClusterGroupTable(NetBoxTable):
+class ClusterGroupTable(ContactsColumnMixin, NetBoxTable):
name = tables.Column(
linkify=True
)
@@ -41,9 +41,6 @@ class ClusterGroupTable(NetBoxTable):
url_params={'group_id': 'pk'},
verbose_name='Clusters'
)
- contacts = columns.ManyToManyColumn(
- linkify_item=True
- )
tags = columns.TagColumn(
url_name='virtualization:clustergroup_list'
)
@@ -57,7 +54,7 @@ class ClusterGroupTable(NetBoxTable):
default_columns = ('pk', 'name', 'cluster_count', 'description')
-class ClusterTable(TenancyColumnsMixin, NetBoxTable):
+class ClusterTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
name = tables.Column(
linkify=True
)
@@ -81,9 +78,6 @@ class ClusterTable(TenancyColumnsMixin, NetBoxTable):
verbose_name='VMs'
)
comments = columns.MarkdownColumn()
- contacts = columns.ManyToManyColumn(
- linkify_item=True
- )
tags = columns.TagColumn(
url_name='virtualization:cluster_list'
)
diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py
index dfd01696e..29baff4cb 100644
--- a/netbox/virtualization/tables/virtualmachines.py
+++ b/netbox/virtualization/tables/virtualmachines.py
@@ -1,10 +1,10 @@
import django_tables2 as tables
-
from dcim.tables.devices import BaseInterfaceTable
-from netbox.tables import NetBoxTable, columns
-from tenancy.tables import TenancyColumnsMixin
+from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
from virtualization.models import VirtualMachine, VMInterface
+from netbox.tables import NetBoxTable, columns
+
__all__ = (
'VirtualMachineTable',
'VirtualMachineVMInterfaceTable',
@@ -37,7 +37,7 @@ VMINTERFACE_BUTTONS = """
# Virtual machines
#
-class VirtualMachineTable(TenancyColumnsMixin, NetBoxTable):
+class VirtualMachineTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
name = tables.Column(
order_by=('_name',),
linkify=True
@@ -67,9 +67,6 @@ class VirtualMachineTable(TenancyColumnsMixin, NetBoxTable):
order_by=('primary_ip4', 'primary_ip6'),
verbose_name='IP Address'
)
- contacts = columns.ManyToManyColumn(
- linkify_item=True
- )
tags = columns.TagColumn(
url_name='virtualization:virtualmachine_list'
)
diff --git a/netbox/wireless/apps.py b/netbox/wireless/apps.py
index 59e47aba5..51dee4188 100644
--- a/netbox/wireless/apps.py
+++ b/netbox/wireless/apps.py
@@ -5,4 +5,4 @@ class WirelessConfig(AppConfig):
name = 'wireless'
def ready(self):
- import wireless.signals
+ from . import signals, search
diff --git a/netbox/wireless/forms/models.py b/netbox/wireless/forms/models.py
index bcffcf896..386484193 100644
--- a/netbox/wireless/forms/models.py
+++ b/netbox/wireless/forms/models.py
@@ -19,6 +19,12 @@ class WirelessLANGroupForm(NetBoxModelForm):
)
slug = SlugField()
+ fieldsets = (
+ ('Wireless LAN Group', (
+ 'parent', 'name', 'slug', 'description', 'tags',
+ )),
+ )
+
class Meta:
model = WirelessLANGroup
fields = [
diff --git a/netbox/wireless/search.py b/netbox/wireless/search.py
new file mode 100644
index 000000000..89ac23af8
--- /dev/null
+++ b/netbox/wireless/search.py
@@ -0,0 +1,26 @@
+import wireless.filtersets
+import wireless.tables
+from dcim.models import Interface
+from netbox.search import SearchIndex, register_search
+from utilities.utils import count_related
+from wireless.models import WirelessLAN, WirelessLink
+
+
+@register_search()
+class WirelessLANIndex(SearchIndex):
+ model = WirelessLAN
+ queryset = WirelessLAN.objects.prefetch_related('group', 'vlan').annotate(
+ interface_count=count_related(Interface, 'wireless_lans')
+ )
+ filterset = wireless.filtersets.WirelessLANFilterSet
+ table = wireless.tables.WirelessLANTable
+ url = 'wireless:wirelesslan_list'
+
+
+@register_search()
+class WirelessLinkIndex(SearchIndex):
+ model = WirelessLink
+ queryset = WirelessLink.objects.prefetch_related('interface_a__device', 'interface_b__device')
+ filterset = wireless.filtersets.WirelessLinkFilterSet
+ table = wireless.tables.WirelessLinkTable
+ url = 'wireless:wirelesslink_list'
diff --git a/requirements.txt b/requirements.txt
index 5b2a1141f..891a61779 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,10 +27,13 @@ psycopg2-binary==2.9.3
PyYAML==6.0
sentry-sdk==1.9.10
social-auth-app-django==5.0.0
-social-auth-core==4.3.0
+social-auth-core[openidconnect]==4.3.0
svgwrite==1.4.3
tablib==3.2.1
tzdata==2022.4
# Workaround for #7401
jsonschema==3.2.0
+
+# Temporary fix for #10712
+swagger-spec-validator==2.7.6