mirror of
https://github.com/netbox-community/netbox.git
synced 2026-01-23 20:12:42 -06:00
Compare commits
2 Commits
19869-prov
...
21254-attr
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a320df9926 | ||
|
|
3dcca73ecc |
@@ -27,7 +27,6 @@ __all__ = (
|
|||||||
'DeviceTable',
|
'DeviceTable',
|
||||||
'FrontPortTable',
|
'FrontPortTable',
|
||||||
'InterfaceTable',
|
'InterfaceTable',
|
||||||
'InterfaceLAGMemberTable',
|
|
||||||
'InventoryItemRoleTable',
|
'InventoryItemRoleTable',
|
||||||
'InventoryItemTable',
|
'InventoryItemTable',
|
||||||
'MACAddressTable',
|
'MACAddressTable',
|
||||||
@@ -690,33 +689,6 @@ class InterfaceTable(BaseInterfaceTable, ModularDeviceComponentTable, PathEndpoi
|
|||||||
default_columns = ('pk', 'name', 'device', 'label', 'enabled', 'type', 'description')
|
default_columns = ('pk', 'name', 'device', 'label', 'enabled', 'type', 'description')
|
||||||
|
|
||||||
|
|
||||||
class InterfaceLAGMemberTable(PathEndpointTable, NetBoxTable):
|
|
||||||
parent = tables.Column(
|
|
||||||
verbose_name=_('Parent'),
|
|
||||||
accessor=Accessor('device'),
|
|
||||||
linkify=True,
|
|
||||||
)
|
|
||||||
name = tables.Column(
|
|
||||||
verbose_name=_('Name'),
|
|
||||||
linkify=True,
|
|
||||||
order_by=('_name',),
|
|
||||||
)
|
|
||||||
connection = columns.TemplateColumn(
|
|
||||||
accessor='connected_endpoints',
|
|
||||||
template_code=INTERFACE_LAG_MEMBERS_LINKTERMINATION,
|
|
||||||
verbose_name=_('Peer'),
|
|
||||||
orderable=False,
|
|
||||||
)
|
|
||||||
tags = columns.TagColumn(
|
|
||||||
url_name='dcim:interface_list'
|
|
||||||
)
|
|
||||||
|
|
||||||
class Meta(NetBoxTable.Meta):
|
|
||||||
model = models.Interface
|
|
||||||
fields = ('pk', 'parent', 'name', 'type', 'connection')
|
|
||||||
default_columns = ('pk', 'parent', 'name', 'type', 'connection')
|
|
||||||
|
|
||||||
|
|
||||||
class DeviceInterfaceTable(InterfaceTable):
|
class DeviceInterfaceTable(InterfaceTable):
|
||||||
name = tables.TemplateColumn(
|
name = tables.TemplateColumn(
|
||||||
verbose_name=_('Name'),
|
verbose_name=_('Name'),
|
||||||
|
|||||||
@@ -24,24 +24,6 @@ INTERFACE_LINKTERMINATION = """
|
|||||||
{% else %}""" + LINKTERMINATION + """{% endif %}
|
{% else %}""" + LINKTERMINATION + """{% endif %}
|
||||||
"""
|
"""
|
||||||
|
|
||||||
INTERFACE_LAG_MEMBERS_LINKTERMINATION = """
|
|
||||||
{% for termination in value %}
|
|
||||||
{% if termination.parent_object %}
|
|
||||||
<a href="{{ termination.parent_object.get_absolute_url }}">{{ termination.parent_object }}</a>
|
|
||||||
<i class="mdi mdi-chevron-right"></i>
|
|
||||||
{% endif %}
|
|
||||||
<a href="{{ termination.get_absolute_url }}">{{ termination }}</a>
|
|
||||||
{% if termination.lag %}
|
|
||||||
<i class="mdi mdi-chevron-right"></i>
|
|
||||||
<a href="{{ termination.lag.get_absolute_url }}">{{ termination.lag }}</a>
|
|
||||||
<span class="text-muted">(LAG)</span>
|
|
||||||
{% endif %}
|
|
||||||
{% if not forloop.last %}<br />{% endif %}
|
|
||||||
{% empty %}
|
|
||||||
{{ ''|placeholder }}
|
|
||||||
{% endfor %}
|
|
||||||
"""
|
|
||||||
|
|
||||||
CABLE_LENGTH = """
|
CABLE_LENGTH = """
|
||||||
{% load helpers %}
|
{% load helpers %}
|
||||||
{% if record.length %}{{ record.length|floatformat:"-2" }} {{ record.length_unit }}{% endif %}
|
{% if record.length %}{{ record.length|floatformat:"-2" }} {{ record.length_unit }}{% endif %}
|
||||||
|
|||||||
@@ -3135,14 +3135,6 @@ class InterfaceView(generic.ObjectView):
|
|||||||
)
|
)
|
||||||
child_interfaces_table.configure(request)
|
child_interfaces_table.configure(request)
|
||||||
|
|
||||||
# Get LAG interfaces
|
|
||||||
lag_interfaces = Interface.objects.restrict(request.user, 'view').filter(lag=instance)
|
|
||||||
lag_interfaces_table = tables.InterfaceLAGMemberTable(
|
|
||||||
lag_interfaces,
|
|
||||||
orderable=False
|
|
||||||
)
|
|
||||||
lag_interfaces_table.configure(request)
|
|
||||||
|
|
||||||
# Get assigned VLANs and annotate whether each is tagged or untagged
|
# Get assigned VLANs and annotate whether each is tagged or untagged
|
||||||
vlans = []
|
vlans = []
|
||||||
if instance.untagged_vlan is not None:
|
if instance.untagged_vlan is not None:
|
||||||
@@ -3172,7 +3164,6 @@ class InterfaceView(generic.ObjectView):
|
|||||||
'bridge_interfaces': bridge_interfaces,
|
'bridge_interfaces': bridge_interfaces,
|
||||||
'bridge_interfaces_table': bridge_interfaces_table,
|
'bridge_interfaces_table': bridge_interfaces_table,
|
||||||
'child_interfaces_table': child_interfaces_table,
|
'child_interfaces_table': child_interfaces_table,
|
||||||
'lag_interfaces_table': lag_interfaces_table,
|
|
||||||
'vlan_table': vlan_table,
|
'vlan_table': vlan_table,
|
||||||
'vlan_translation_table': vlan_translation_table,
|
'vlan_translation_table': vlan_translation_table,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ def enqueue_event(queue, instance, request, event_type):
|
|||||||
|
|
||||||
|
|
||||||
def process_event_rules(event_rules, object_type, event_type, data, username=None, snapshots=None, request=None):
|
def process_event_rules(event_rules, object_type, event_type, data, username=None, snapshots=None, request=None):
|
||||||
user = User.objects.get(username=username) if username else None
|
user = None # To be resolved from the username if needed
|
||||||
|
|
||||||
for event_rule in event_rules:
|
for event_rule in event_rules:
|
||||||
|
|
||||||
@@ -134,6 +134,10 @@ def process_event_rules(event_rules, object_type, event_type, data, username=Non
|
|||||||
# Resolve the script from action parameters
|
# Resolve the script from action parameters
|
||||||
script = event_rule.action_object.python_class()
|
script = event_rule.action_object.python_class()
|
||||||
|
|
||||||
|
# Retrieve the User if not already resolved
|
||||||
|
if user is None:
|
||||||
|
user = User.objects.get(username=username)
|
||||||
|
|
||||||
# Enqueue a Job to record the script's execution
|
# Enqueue a Job to record the script's execution
|
||||||
from extras.jobs import ScriptJob
|
from extras.jobs import ScriptJob
|
||||||
params = {
|
params = {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import re
|
import re
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
import logging
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
@@ -28,6 +29,8 @@ __all__ = (
|
|||||||
'SearchView',
|
'SearchView',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
logger = logging.getLogger(f'netbox.{__name__}')
|
||||||
|
|
||||||
Link = namedtuple('Link', ('label', 'viewname', 'permission', 'count'))
|
Link = namedtuple('Link', ('label', 'viewname', 'permission', 'count'))
|
||||||
|
|
||||||
|
|
||||||
@@ -50,7 +53,14 @@ class HomeView(ConditionalLoginRequiredMixin, View):
|
|||||||
# Check whether a new release is available. (Only for superusers.)
|
# Check whether a new release is available. (Only for superusers.)
|
||||||
new_release = None
|
new_release = None
|
||||||
if request.user.is_superuser:
|
if request.user.is_superuser:
|
||||||
latest_release = cache.get('latest_release')
|
# cache.get() can raise if the cached value can't be unpickled after dependency upgrades
|
||||||
|
try:
|
||||||
|
latest_release = cache.get('latest_release')
|
||||||
|
except Exception:
|
||||||
|
logger.debug("Failed to read 'latest_release' from cache; deleting key", exc_info=True)
|
||||||
|
cache.delete('latest_release')
|
||||||
|
latest_release = None
|
||||||
|
|
||||||
if latest_release:
|
if latest_release:
|
||||||
release_version, release_url = latest_release
|
release_version, release_url = latest_release
|
||||||
if release_version > version.parse(settings.RELEASE.version):
|
if release_version > version.parse(settings.RELEASE.version):
|
||||||
|
|||||||
@@ -370,6 +370,33 @@
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if object.is_lag %}
|
||||||
|
<div class="card">
|
||||||
|
<h2 class="card-header">{% trans "LAG Members" %}</h2>
|
||||||
|
<table class="table table-hover">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>{% trans "Parent" %}</th>
|
||||||
|
<th>{% trans "Interface" %}</th>
|
||||||
|
<th>{% trans "Type" %}</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for member in object.member_interfaces.all %}
|
||||||
|
<tr>
|
||||||
|
<td>{{ member.device|linkify }}</td>
|
||||||
|
<td>{{ member|linkify }}</td>
|
||||||
|
<td>{{ member.get_type_display }}</td>
|
||||||
|
</tr>
|
||||||
|
{% empty %}
|
||||||
|
<tr>
|
||||||
|
<td colspan="3" class="text-muted">{% trans "No member interfaces" %}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
{% include 'ipam/inc/panels/fhrp_groups.html' %}
|
{% include 'ipam/inc/panels/fhrp_groups.html' %}
|
||||||
{% include 'dcim/inc/panels/inventory_items.html' %}
|
{% include 'dcim/inc/panels/inventory_items.html' %}
|
||||||
{% plugin_right_page object %}
|
{% plugin_right_page object %}
|
||||||
@@ -414,13 +441,6 @@
|
|||||||
{% include 'inc/panel_table.html' with table=vlan_table heading="VLANs" %}
|
{% include 'inc/panel_table.html' with table=vlan_table heading="VLANs" %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% if object.is_lag %}
|
|
||||||
<div class="row mb-3">
|
|
||||||
<div class="col col-md-12">
|
|
||||||
{% include 'inc/panel_table.html' with table=lag_interfaces_table heading="LAG Members" %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% if object.vlan_translation_policy %}
|
{% if object.vlan_translation_policy %}
|
||||||
<div class="row mb-3">
|
<div class="row mb-3">
|
||||||
<div class="col col-md-12">
|
<div class="col col-md-12">
|
||||||
|
|||||||
Reference in New Issue
Block a user