From ac546a97110362367b0b9a78c98aacc3f587f5ea Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 14 Aug 2018 11:47:54 -0400 Subject: [PATCH 001/191] Closes #2000: Remove support for Python 2 --- .travis.yml | 1 - README.md | 2 -- base_requirements.txt | 2 +- docs/additional-features/netbox-shell.md | 2 +- docs/installation/upgrading.md | 7 ------- netbox/extras/reports.py | 23 ++++++----------------- netbox/netbox/settings.py | 15 +++++++-------- netbox/utilities/middleware.py | 6 +----- requirements.txt | 2 +- upgrade.sh | 16 ---------------- 10 files changed, 17 insertions(+), 59 deletions(-) diff --git a/.travis.yml b/.travis.yml index 33abc8425..13c6d406b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ addons: postgresql: "9.4" language: python python: - - "2.7" - "3.5" install: - pip install -r requirements.txt diff --git a/README.md b/README.md index 28673bf36..9955316b9 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,6 @@ or join us in the #netbox Slack channel on [NetworkToCode](https://networktocode ### Build Status -NetBox is built against both Python 2.7 and 3.5. Python 3.5 or higher is strongly recommended. - | | status | |-------------|------------| | **master** | [![Build Status](https://travis-ci.org/digitalocean/netbox.svg?branch=master)](https://travis-ci.org/digitalocean/netbox) | diff --git a/base_requirements.txt b/base_requirements.txt index 6012ffa6c..5f3e0eb80 100644 --- a/base_requirements.txt +++ b/base_requirements.txt @@ -1,5 +1,5 @@ # django-filter-1.1.0 breaks with Django-2.1 -Django>=1.11,<2.1 +Django>=2.0,<2.1 django-cors-headers django-debug-toolbar # django-filter-2.0.0 drops Python 2 support (blocked by #2000) diff --git a/docs/additional-features/netbox-shell.md b/docs/additional-features/netbox-shell.md index 5afd7876d..2ebea5ce5 100644 --- a/docs/additional-features/netbox-shell.md +++ b/docs/additional-features/netbox-shell.md @@ -9,7 +9,7 @@ This will launch a customized version of [the built-in Django shell](https://doc ``` $ ./manage.py nbshell ### NetBox interactive shell (jstretch-laptop) -### Python 2.7.6 | Django 1.11.3 | NetBox 2.1.0-dev +### Python 3.5.2 | Django 2.0.8 | NetBox 2.4.3 ### lsmodels() will show available models. Use help() for more info. ``` diff --git a/docs/installation/upgrading.md b/docs/installation/upgrading.md index bca60ca89..6dc8a3c7a 100644 --- a/docs/installation/upgrading.md +++ b/docs/installation/upgrading.md @@ -64,13 +64,6 @@ Once the new code is in place, run the upgrade script (which may need to be run # ./upgrade.sh ``` -!!! warning - The upgrade script will prefer Python3 and pip3 if both executables are available. To force it to use Python2 and pip, use the `-2` argument as below. Note that Python 2 will no longer be supported in NetBox v2.5. - -```no-highlight -# ./upgrade.sh -2 -``` - This script: * Installs or upgrades any new required Python packages diff --git a/netbox/extras/reports.py b/netbox/extras/reports.py index 52883063c..f6b5d7570 100644 --- a/netbox/extras/reports.py +++ b/netbox/extras/reports.py @@ -4,7 +4,6 @@ from collections import OrderedDict import importlib import inspect import pkgutil -import sys from django.conf import settings from django.utils import timezone @@ -26,22 +25,12 @@ def get_report(module_name, report_name): """ file_path = '{}/{}.py'.format(settings.REPORTS_ROOT, module_name) - # Python 3.5+ - if sys.version_info >= (3, 5): - spec = importlib.util.spec_from_file_location(module_name, file_path) - module = importlib.util.module_from_spec(spec) - try: - spec.loader.exec_module(module) - except FileNotFoundError: - return None - - # Python 2.7 - else: - import imp - try: - module = imp.load_source(module_name, file_path) - except IOError: - return None + spec = importlib.util.spec_from_file_location(module_name, file_path) + module = importlib.util.module_from_spec(spec) + try: + spec.loader.exec_module(module) + except FileNotFoundError: + return None report = getattr(module, report_name, None) if report is None: diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index f6d1b26fd..116192a02 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -7,6 +7,13 @@ import warnings from django.contrib.messages import constants as messages from django.core.exceptions import ImproperlyConfigured +# Check for Python 3.5+ +if sys.version_info < (3, 5): + raise RuntimeError( + "NetBox requires Python 3.5 or higher (current: Python {})".format(sys.version.split()[0]) + ) + +# Check for configuration file try: from netbox import configuration except ImportError: @@ -14,14 +21,6 @@ except ImportError: "Configuration file is not present. Please define netbox/netbox/configuration.py per the documentation." ) -# Raise a deprecation warning for Python 2.x -if sys.version_info[0] < 3: - warnings.warn( - "Support for Python 2 will be removed in NetBox v2.5. Please consider migration to Python 3 at your earliest " - "opportunity. Guidance is available in the documentation at http://netbox.readthedocs.io/.", - DeprecationWarning - ) - VERSION = '2.4.4-dev' BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) diff --git a/netbox/utilities/middleware.py b/netbox/utilities/middleware.py index dafafde24..207968690 100644 --- a/netbox/utilities/middleware.py +++ b/netbox/utilities/middleware.py @@ -72,11 +72,7 @@ class ExceptionHandlingMiddleware(object): custom_template = 'exceptions/programming_error.html' elif isinstance(exception, ImportError): custom_template = 'exceptions/import_error.html' - elif ( - sys.version_info[0] >= 3 and isinstance(exception, PermissionError) - ) or ( - isinstance(exception, OSError) and exception.errno == 13 - ): + elif isinstance(exception, PermissionError): custom_template = 'exceptions/permission_error.html' # Return a custom error message, or fall back to Django's default 500 error handling diff --git a/requirements.txt b/requirements.txt index b3bee6b6d..8fc83c4d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django>=1.11,<2.1 +Django>=2.0,<2.1 django-cors-headers==2.4.0 django-debug-toolbar==1.9.1 django-filter==1.1.0 diff --git a/upgrade.sh b/upgrade.sh index a1930eb3d..3a9f4a864 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -5,24 +5,8 @@ # Once the script completes, remember to restart the WSGI service (e.g. # gunicorn or uWSGI). -# Determine which version of Python/pip to use. Default to v3 (if available) -# but allow the user to force v2. PYTHON="python3" PIP="pip3" -type $PYTHON >/dev/null 2>&1 && type $PIP >/dev/null 2>&1 || PYTHON="python" PIP="pip" -while getopts ":2" opt; do - case $opt in - 2) - PYTHON="python" - PIP="pip" - echo "Forcing Python/pip v2" - ;; - \?) - echo "Invalid option: -$OPTARG" >&2 - exit - ;; - esac -done # Optionally use sudo if not already root, and always prompt for password # before running the command From 980d62d579ecd369911d705f59a39b56689cd962 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 14 Aug 2018 11:58:42 -0400 Subject: [PATCH 002/191] Removed Python 2 string compatibility --- netbox/circuits/api/serializers.py | 2 -- netbox/circuits/api/urls.py | 2 -- netbox/circuits/api/views.py | 2 -- netbox/circuits/apps.py | 2 -- netbox/circuits/constants.py | 2 -- netbox/circuits/filters.py | 2 -- netbox/circuits/forms.py | 2 -- netbox/circuits/migrations/0001_initial.py | 2 -- ...01_initial_squashed_0010_circuit_status.py | 2 -- .../migrations/0002_auto_20160622_1821.py | 2 -- .../0003_provider_32bit_asn_support.py | 2 -- .../migrations/0004_circuit_add_tenant.py | 2 -- .../0005_circuit_add_upstream_speed.py | 2 -- .../circuits/migrations/0006_terminations.py | 2 -- .../0007_circuit_add_description.py | 2 -- ...termination_interface_protect_on_delete.py | 2 -- .../migrations/0009_unicode_literals.py | 2 -- .../migrations/0010_circuit_status.py | 2 -- netbox/circuits/migrations/0011_tags.py | 2 -- .../migrations/0012_change_logging.py | 2 -- netbox/circuits/models.py | 7 ----- netbox/circuits/signals.py | 2 -- netbox/circuits/tables.py | 2 -- netbox/circuits/tests/test_api.py | 2 -- netbox/circuits/urls.py | 2 -- netbox/circuits/views.py | 2 -- netbox/dcim/api/exceptions.py | 2 -- netbox/dcim/api/serializers.py | 2 -- netbox/dcim/api/urls.py | 2 -- netbox/dcim/api/views.py | 2 -- netbox/dcim/apps.py | 2 -- netbox/dcim/constants.py | 2 -- netbox/dcim/fields.py | 2 -- netbox/dcim/filters.py | 2 -- netbox/dcim/formfields.py | 2 -- netbox/dcim/forms.py | 2 -- netbox/dcim/migrations/0001_initial.py | 2 -- .../migrations/0002_auto_20160622_1821.py | 2 -- ...2_1821_squashed_0022_color_names_to_rgb.py | 2 -- .../migrations/0003_auto_20160628_1721.py | 2 -- .../migrations/0004_auto_20160701_2049.py | 2 -- .../migrations/0005_auto_20160706_1722.py | 2 -- .../0006_add_device_primary_ip4_ip6.py | 2 -- .../migrations/0007_device_copy_primary_ip.py | 2 -- .../0008_device_remove_primary_ip.py | 2 -- .../migrations/0009_site_32bit_asn_support.py | 2 -- ...010_devicebay_installed_device_set_null.py | 2 -- .../migrations/0011_devicetype_part_number.py | 2 -- .../0012_site_rack_device_add_tenant.py | 2 -- .../0013_add_interface_form_factors.py | 2 -- .../migrations/0014_rack_add_type_width.py | 2 -- .../0015_rack_add_u_height_validator.py | 2 -- .../0016_module_add_manufacturer.py | 2 -- netbox/dcim/migrations/0017_rack_add_role.py | 2 -- .../migrations/0018_device_add_asset_tag.py | 2 -- .../migrations/0019_new_iface_form_factors.py | 2 -- .../dcim/migrations/0020_rack_desc_units.py | 2 -- .../dcim/migrations/0021_add_ff_flexstack.py | 2 -- .../migrations/0022_color_names_to_rgb.py | 2 -- .../migrations/0023_devicetype_comments.py | 2 -- ...shed_0043_device_component_name_lengths.py | 2 -- .../0024_site_add_contact_fields.py | 2 -- .../0025_devicetype_add_interface_ordering.py | 2 -- .../migrations/0026_add_rack_reservations.py | 2 -- .../dcim/migrations/0027_device_add_site.py | 2 -- .../0028_device_copy_rack_to_site.py | 2 -- .../migrations/0029_allow_rackless_devices.py | 2 -- .../dcim/migrations/0030_interface_add_lag.py | 2 -- netbox/dcim/migrations/0031_regions.py | 2 -- .../0032_device_increase_name_length.py | 2 -- .../0033_rackreservation_rack_editable.py | 2 -- .../0034_rename_module_to_inventoryitem.py | 2 -- .../0035_device_expand_status_choices.py | 2 -- .../migrations/0036_add_ff_juniper_vcp.py | 2 -- .../dcim/migrations/0037_unicode_literals.py | 2 -- .../migrations/0038_wireless_interfaces.py | 2 -- .../0039_interface_add_enabled_mtu.py | 2 -- ...inventoryitem_add_asset_tag_description.py | 2 -- .../migrations/0041_napalm_integration.py | 2 -- .../migrations/0042_interface_ff_10ge_cx4.py | 2 -- .../0043_device_component_name_lengths.py | 2 -- netbox/dcim/migrations/0044_virtualization.py | 2 -- ...n_squashed_0055_virtualchassis_ordering.py | 2 -- .../migrations/0045_devicerole_vm_role.py | 2 -- .../0046_rack_lengthen_facility_id.py | 2 -- .../0047_more_100ge_form_factors.py | 2 -- netbox/dcim/migrations/0048_rack_serial.py | 2 -- .../0049_rackreservation_change_user.py | 2 -- .../migrations/0050_interface_vlan_tagging.py | 2 -- .../migrations/0051_rackreservation_tenant.py | 2 -- .../dcim/migrations/0052_virtual_chassis.py | 2 -- .../migrations/0053_platform_manufacturer.py | 2 -- .../0054_site_status_timezone_description.py | 2 -- .../0055_virtualchassis_ordering.py | 2 -- netbox/dcim/migrations/0057_tags.py | 2 -- .../0058_relax_rack_naming_constraints.py | 2 -- .../0059_site_latitude_longitude.py | 2 -- netbox/dcim/migrations/0060_change_logging.py | 2 -- netbox/dcim/models.py | 28 ------------------- netbox/dcim/querysets.py | 2 -- netbox/dcim/signals.py | 2 -- netbox/dcim/tables.py | 2 -- netbox/dcim/tests/test_api.py | 2 -- netbox/dcim/tests/test_forms.py | 2 -- netbox/dcim/tests/test_models.py | 2 -- netbox/dcim/urls.py | 2 -- netbox/dcim/views.py | 2 -- netbox/extras/admin.py | 2 -- netbox/extras/api/customfields.py | 2 -- netbox/extras/api/serializers.py | 2 -- netbox/extras/api/urls.py | 2 -- netbox/extras/api/views.py | 2 -- netbox/extras/apps.py | 2 -- netbox/extras/constants.py | 2 -- netbox/extras/filters.py | 2 -- netbox/extras/forms.py | 2 -- netbox/extras/management/commands/nbshell.py | 2 -- .../management/commands/run_inventory.py | 2 -- .../extras/management/commands/runreport.py | 2 -- netbox/extras/middleware.py | 2 -- netbox/extras/migrations/0001_initial.py | 2 -- ..._squashed_0010_customfield_filter_logic.py | 2 -- .../extras/migrations/0002_custom_fields.py | 2 -- .../0003_exporttemplate_add_description.py | 2 -- ...4_topologymap_change_comma_to_semicolon.py | 2 -- .../0005_useraction_add_bulk_create.py | 2 -- .../migrations/0006_add_imageattachments.py | 2 -- .../migrations/0007_unicode_literals.py | 2 -- netbox/extras/migrations/0008_reports.py | 1 - .../migrations/0009_topologymap_type.py | 2 -- .../0010_customfield_filter_logic.py | 2 -- netbox/extras/migrations/0012_webhooks.py | 2 -- netbox/extras/migrations/0013_objectchange.py | 2 -- netbox/extras/models.py | 13 --------- netbox/extras/querysets.py | 2 -- netbox/extras/reports.py | 2 -- netbox/extras/rpc.py | 2 -- netbox/extras/tables.py | 2 -- netbox/extras/tests/test_api.py | 2 -- netbox/extras/tests/test_customfields.py | 2 -- netbox/extras/tests/test_tags.py | 2 -- netbox/extras/urls.py | 2 -- netbox/extras/views.py | 2 -- netbox/ipam/api/serializers.py | 2 -- netbox/ipam/api/urls.py | 2 -- netbox/ipam/api/views.py | 2 -- netbox/ipam/apps.py | 2 -- netbox/ipam/constants.py | 2 -- netbox/ipam/fields.py | 2 -- netbox/ipam/filters.py | 2 -- netbox/ipam/formfields.py | 2 -- netbox/ipam/forms.py | 2 -- netbox/ipam/lookups.py | 2 -- netbox/ipam/migrations/0001_initial.py | 2 -- .../migrations/0002_vrf_add_enforce_unique.py | 2 -- ...18_remove_service_uniqueness_constraint.py | 2 -- .../migrations/0003_ipam_add_vlangroups.py | 2 -- .../0004_ipam_vlangroup_uniqueness.py | 2 -- .../migrations/0005_auto_20160725_1842.py | 2 -- .../migrations/0006_vrf_vlan_add_tenant.py | 2 -- .../0007_prefix_ipaddress_add_tenant.py | 2 -- .../migrations/0008_prefix_change_order.py | 2 -- .../migrations/0009_ipaddress_add_status.py | 2 -- .../migrations/0010_ipaddress_help_texts.py | 2 -- .../migrations/0011_rir_add_is_private.py | 2 -- netbox/ipam/migrations/0012_services.py | 2 -- .../migrations/0013_prefix_add_is_pool.py | 2 -- .../0014_ipaddress_status_add_deprecated.py | 2 -- netbox/ipam/migrations/0015_global_vlans.py | 2 -- .../ipam/migrations/0016_unicode_literals.py | 2 -- .../ipam/migrations/0017_ipaddress_roles.py | 2 -- ...18_remove_service_uniqueness_constraint.py | 2 -- netbox/ipam/migrations/0019_virtualization.py | 2 -- ...n_squashed_0020_ipaddress_add_role_carp.py | 2 -- .../0020_ipaddress_add_role_carp.py | 2 -- netbox/ipam/migrations/0021_vrf_ordering.py | 2 -- netbox/ipam/migrations/0022_tags.py | 2 -- netbox/ipam/migrations/0023_change_logging.py | 2 -- netbox/ipam/models.py | 12 -------- netbox/ipam/querysets.py | 2 -- netbox/ipam/tables.py | 2 -- netbox/ipam/tests/test_api.py | 2 -- netbox/ipam/tests/test_models.py | 2 -- netbox/ipam/urls.py | 2 -- netbox/ipam/views.py | 2 -- netbox/netbox/api.py | 2 -- netbox/netbox/forms.py | 2 -- netbox/netbox/urls.py | 2 -- netbox/netbox/views.py | 2 -- netbox/secrets/admin.py | 2 -- netbox/secrets/api/serializers.py | 2 -- netbox/secrets/api/urls.py | 2 -- netbox/secrets/api/views.py | 2 -- netbox/secrets/apps.py | 2 -- netbox/secrets/decorators.py | 2 -- netbox/secrets/exceptions.py | 2 -- netbox/secrets/filters.py | 2 -- netbox/secrets/forms.py | 2 -- netbox/secrets/hashers.py | 2 -- netbox/secrets/migrations/0001_initial.py | 2 -- ..._initial_squashed_0003_unicode_literals.py | 2 -- .../0002_userkey_add_session_key.py | 2 -- .../migrations/0003_unicode_literals.py | 2 -- netbox/secrets/migrations/0004_tags.py | 2 -- .../secrets/migrations/0005_change_logging.py | 2 -- netbox/secrets/models.py | 8 +----- netbox/secrets/querysets.py | 2 -- netbox/secrets/tables.py | 2 -- netbox/secrets/templatetags/secret_helpers.py | 2 -- netbox/secrets/tests/test_api.py | 2 -- netbox/secrets/tests/test_models.py | 2 -- netbox/secrets/urls.py | 2 -- netbox/secrets/views.py | 2 -- netbox/tenancy/api/serializers.py | 2 -- netbox/tenancy/api/urls.py | 2 -- netbox/tenancy/api/views.py | 2 -- netbox/tenancy/apps.py | 2 -- netbox/tenancy/filters.py | 2 -- netbox/tenancy/forms.py | 2 -- netbox/tenancy/migrations/0001_initial.py | 2 -- .../migrations/0002_tenant_group_optional.py | 2 -- ...optional_squashed_0003_unicode_literals.py | 2 -- .../migrations/0003_unicode_literals.py | 2 -- netbox/tenancy/migrations/0004_tags.py | 2 -- .../tenancy/migrations/0005_change_logging.py | 2 -- netbox/tenancy/models.py | 5 ---- netbox/tenancy/tables.py | 2 -- netbox/tenancy/tests/test_api.py | 2 -- netbox/tenancy/urls.py | 2 -- netbox/tenancy/views.py | 2 -- netbox/users/admin.py | 2 -- netbox/users/api/serializers.py | 2 -- netbox/users/forms.py | 2 -- netbox/users/migrations/0001_api_tokens.py | 2 -- ...i_tokens_squashed_0002_unicode_literals.py | 2 -- .../users/migrations/0002_unicode_literals.py | 2 -- netbox/users/models.py | 4 --- netbox/users/urls.py | 2 -- netbox/users/views.py | 2 -- netbox/utilities/api.py | 2 -- netbox/utilities/context_processors.py | 2 -- netbox/utilities/error_handlers.py | 2 -- netbox/utilities/fields.py | 2 -- netbox/utilities/filters.py | 2 -- netbox/utilities/forms.py | 2 -- netbox/utilities/managers.py | 2 -- netbox/utilities/middleware.py | 2 -- netbox/utilities/models.py | 2 -- netbox/utilities/paginator.py | 2 -- netbox/utilities/sql.py | 2 -- netbox/utilities/tables.py | 2 -- netbox/utilities/templatetags/buttons.py | 2 -- netbox/utilities/templatetags/helpers.py | 2 -- netbox/utilities/testing.py | 2 -- netbox/utilities/tests/test_managers.py | 2 -- netbox/utilities/utils.py | 2 -- netbox/utilities/validators.py | 2 -- netbox/utilities/views.py | 2 -- netbox/virtualization/api/serializers.py | 2 -- netbox/virtualization/api/urls.py | 2 -- netbox/virtualization/api/views.py | 2 -- netbox/virtualization/apps.py | 2 -- netbox/virtualization/constants.py | 2 -- netbox/virtualization/filters.py | 2 -- netbox/virtualization/forms.py | 2 -- .../migrations/0001_virtualization.py | 2 -- .../0002_virtualmachine_add_status.py | 2 -- ...s_squashed_0004_virtualmachine_add_role.py | 2 -- .../migrations/0003_cluster_add_site.py | 2 -- .../0004_virtualmachine_add_role.py | 2 -- netbox/virtualization/migrations/0006_tags.py | 2 -- .../migrations/0007_change_logging.py | 2 -- netbox/virtualization/models.py | 7 ----- netbox/virtualization/tables.py | 2 -- netbox/virtualization/tests/test_api.py | 2 -- netbox/virtualization/urls.py | 2 -- netbox/virtualization/views.py | 2 -- 277 files changed, 1 insertion(+), 620 deletions(-) diff --git a/netbox/circuits/api/serializers.py b/netbox/circuits/api/serializers.py index 739fbf8ff..2ec7921fc 100644 --- a/netbox/circuits/api/serializers.py +++ b/netbox/circuits/api/serializers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from rest_framework import serializers from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField diff --git a/netbox/circuits/api/urls.py b/netbox/circuits/api/urls.py index 3fb4eda0a..a5e19907f 100644 --- a/netbox/circuits/api/urls.py +++ b/netbox/circuits/api/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from rest_framework import routers from . import views diff --git a/netbox/circuits/api/views.py b/netbox/circuits/api/views.py index 3b1623da4..7ca0165b0 100644 --- a/netbox/circuits/api/views.py +++ b/netbox/circuits/api/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.shortcuts import get_object_or_404 from rest_framework.decorators import action from rest_framework.response import Response diff --git a/netbox/circuits/apps.py b/netbox/circuits/apps.py index 613c347f2..bc0b7d87d 100644 --- a/netbox/circuits/apps.py +++ b/netbox/circuits/apps.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps import AppConfig diff --git a/netbox/circuits/constants.py b/netbox/circuits/constants.py index c13975b06..03a981ea1 100644 --- a/netbox/circuits/constants.py +++ b/netbox/circuits/constants.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - # Circuit statuses CIRCUIT_STATUS_DEPROVISIONING = 0 diff --git a/netbox/circuits/filters.py b/netbox/circuits/filters.py index 79efdc950..59c510808 100644 --- a/netbox/circuits/filters.py +++ b/netbox/circuits/filters.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import django_filters from django.db.models import Q diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py index aae8bb5f6..b6a8f0efc 100644 --- a/netbox/circuits/forms.py +++ b/netbox/circuits/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.db.models import Count from taggit.forms import TagField diff --git a/netbox/circuits/migrations/0001_initial.py b/netbox/circuits/migrations/0001_initial.py index 470fbee46..dd4dc612b 100644 --- a/netbox/circuits/migrations/0001_initial.py +++ b/netbox/circuits/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-06-22 18:21 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/circuits/migrations/0001_initial_squashed_0010_circuit_status.py b/netbox/circuits/migrations/0001_initial_squashed_0010_circuit_status.py index 1ae1c5d45..3fcec7933 100644 --- a/netbox/circuits/migrations/0001_initial_squashed_0010_circuit_status.py +++ b/netbox/circuits/migrations/0001_initial_squashed_0010_circuit_status.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.14 on 2018-07-31 02:25 -from __future__ import unicode_literals - import dcim.fields from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/circuits/migrations/0002_auto_20160622_1821.py b/netbox/circuits/migrations/0002_auto_20160622_1821.py index 32f31b376..2d350b5f3 100644 --- a/netbox/circuits/migrations/0002_auto_20160622_1821.py +++ b/netbox/circuits/migrations/0002_auto_20160622_1821.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-06-22 18:21 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/circuits/migrations/0003_provider_32bit_asn_support.py b/netbox/circuits/migrations/0003_provider_32bit_asn_support.py index f1010064e..e1e9adab9 100644 --- a/netbox/circuits/migrations/0003_provider_32bit_asn_support.py +++ b/netbox/circuits/migrations/0003_provider_32bit_asn_support.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-07-13 19:24 -from __future__ import unicode_literals - import dcim.fields from django.db import migrations diff --git a/netbox/circuits/migrations/0004_circuit_add_tenant.py b/netbox/circuits/migrations/0004_circuit_add_tenant.py index 641b13afd..de81f21eb 100644 --- a/netbox/circuits/migrations/0004_circuit_add_tenant.py +++ b/netbox/circuits/migrations/0004_circuit_add_tenant.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2016-07-26 21:59 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/circuits/migrations/0005_circuit_add_upstream_speed.py b/netbox/circuits/migrations/0005_circuit_add_upstream_speed.py index f309cb2d8..51b09ad4c 100644 --- a/netbox/circuits/migrations/0005_circuit_add_upstream_speed.py +++ b/netbox/circuits/migrations/0005_circuit_add_upstream_speed.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2016-08-08 20:24 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/circuits/migrations/0006_terminations.py b/netbox/circuits/migrations/0006_terminations.py index e5451498a..1a083c3da 100644 --- a/netbox/circuits/migrations/0006_terminations.py +++ b/netbox/circuits/migrations/0006_terminations.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-12-13 16:30 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/circuits/migrations/0007_circuit_add_description.py b/netbox/circuits/migrations/0007_circuit_add_description.py index 023e5890a..238cb07dd 100644 --- a/netbox/circuits/migrations/0007_circuit_add_description.py +++ b/netbox/circuits/migrations/0007_circuit_add_description.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-01-17 20:08 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/circuits/migrations/0008_circuittermination_interface_protect_on_delete.py b/netbox/circuits/migrations/0008_circuittermination_interface_protect_on_delete.py index 14ee6686d..b7ccafd26 100644 --- a/netbox/circuits/migrations/0008_circuittermination_interface_protect_on_delete.py +++ b/netbox/circuits/migrations/0008_circuittermination_interface_protect_on_delete.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11 on 2017-04-19 17:17 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/circuits/migrations/0009_unicode_literals.py b/netbox/circuits/migrations/0009_unicode_literals.py index 0f22a2268..0cc58fea9 100644 --- a/netbox/circuits/migrations/0009_unicode_literals.py +++ b/netbox/circuits/migrations/0009_unicode_literals.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11 on 2017-05-24 15:34 -from __future__ import unicode_literals - import dcim.fields from django.db import migrations, models diff --git a/netbox/circuits/migrations/0010_circuit_status.py b/netbox/circuits/migrations/0010_circuit_status.py index 3abe5d319..675a0c1fb 100644 --- a/netbox/circuits/migrations/0010_circuit_status.py +++ b/netbox/circuits/migrations/0010_circuit_status.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.9 on 2018-02-06 18:48 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/circuits/migrations/0011_tags.py b/netbox/circuits/migrations/0011_tags.py index b3510f8f4..112436223 100644 --- a/netbox/circuits/migrations/0011_tags.py +++ b/netbox/circuits/migrations/0011_tags.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-05-22 19:04 -from __future__ import unicode_literals - from django.db import migrations import taggit.managers diff --git a/netbox/circuits/migrations/0012_change_logging.py b/netbox/circuits/migrations/0012_change_logging.py index db5057858..c9a3ee41d 100644 --- a/netbox/circuits/migrations/0012_change_logging.py +++ b/netbox/circuits/migrations/0012_change_logging.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-06-13 17:14 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/circuits/models.py b/netbox/circuits/models.py index 6a2e55afc..fea669d72 100644 --- a/netbox/circuits/models.py +++ b/netbox/circuits/models.py @@ -1,9 +1,6 @@ -from __future__ import unicode_literals - from django.contrib.contenttypes.fields import GenericRelation from django.db import models from django.urls import reverse -from django.utils.encoding import python_2_unicode_compatible from taggit.managers import TaggableManager from dcim.constants import STATUS_CLASSES @@ -14,7 +11,6 @@ from utilities.utils import serialize_object from .constants import CIRCUIT_STATUS_ACTIVE, CIRCUIT_STATUS_CHOICES, TERM_SIDE_CHOICES -@python_2_unicode_compatible class Provider(ChangeLoggedModel, CustomFieldModel): """ Each Circuit belongs to a Provider. This is usually a telecommunications company or similar organization. This model @@ -84,7 +80,6 @@ class Provider(ChangeLoggedModel, CustomFieldModel): ) -@python_2_unicode_compatible class CircuitType(ChangeLoggedModel): """ Circuits can be organized by their functional role. For example, a user might wish to define CircuitTypes named @@ -116,7 +111,6 @@ class CircuitType(ChangeLoggedModel): ) -@python_2_unicode_compatible class Circuit(ChangeLoggedModel, CustomFieldModel): """ A communications circuit connects two points. Each Circuit belongs to a Provider; Providers may have multiple @@ -217,7 +211,6 @@ class Circuit(ChangeLoggedModel, CustomFieldModel): return self._get_termination('Z') -@python_2_unicode_compatible class CircuitTermination(models.Model): circuit = models.ForeignKey( to='circuits.Circuit', diff --git a/netbox/circuits/signals.py b/netbox/circuits/signals.py index 40a1e1031..bdfe8c0b6 100644 --- a/netbox/circuits/signals.py +++ b/netbox/circuits/signals.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models.signals import post_delete, post_save from django.dispatch import receiver from django.utils import timezone diff --git a/netbox/circuits/tables.py b/netbox/circuits/tables.py index 6bf3114d9..d70f36bf2 100644 --- a/netbox/circuits/tables.py +++ b/netbox/circuits/tables.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import django_tables2 as tables from django.utils.safestring import mark_safe from django_tables2.utils import Accessor diff --git a/netbox/circuits/tests/test_api.py b/netbox/circuits/tests/test_api.py index a67dbc4ab..d19071b30 100644 --- a/netbox/circuits/tests/test_api.py +++ b/netbox/circuits/tests/test_api.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.urls import reverse from rest_framework import status diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py index 449da3964..e40ff9f94 100644 --- a/netbox/circuits/urls.py +++ b/netbox/circuits/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from extras.views import ObjectChangeLogView diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index e116e4556..a38635f90 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib import messages from django.contrib.auth.decorators import permission_required from django.contrib.auth.mixins import PermissionRequiredMixin diff --git a/netbox/dcim/api/exceptions.py b/netbox/dcim/api/exceptions.py index 8804da436..05ad86b5b 100644 --- a/netbox/dcim/api/exceptions.py +++ b/netbox/dcim/api/exceptions.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from rest_framework.exceptions import APIException diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 0478932f7..26100c3a7 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from rest_framework import serializers from rest_framework.validators import UniqueTogetherValidator from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField diff --git a/netbox/dcim/api/urls.py b/netbox/dcim/api/urls.py index 145cb7f09..6456d53a4 100644 --- a/netbox/dcim/api/urls.py +++ b/netbox/dcim/api/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from rest_framework import routers from . import views diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 901d9d2a5..90db34676 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from collections import OrderedDict from django.conf import settings diff --git a/netbox/dcim/apps.py b/netbox/dcim/apps.py index d61a46d98..78a243f84 100644 --- a/netbox/dcim/apps.py +++ b/netbox/dcim/apps.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps import AppConfig diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index cea56e176..2249f0e0d 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - # Rack types RACK_TYPE_2POST = 100 diff --git a/netbox/dcim/fields.py b/netbox/dcim/fields.py index 22e0be581..6b45f6e65 100644 --- a/netbox/dcim/fields.py +++ b/netbox/dcim/fields.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from netaddr import EUI, mac_unix_expanded from django.core.exceptions import ValidationError diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 18a0039e6..ea8f068fa 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import django_filters from django.contrib.auth.models import User from django.db.models import Q diff --git a/netbox/dcim/formfields.py b/netbox/dcim/formfields.py index 804c2c956..5bc2379e5 100644 --- a/netbox/dcim/formfields.py +++ b/netbox/dcim/formfields.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.core.exceptions import ValidationError from netaddr import EUI, AddrFormatError diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 4e201639c..66ed2447f 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import re from django import forms diff --git a/netbox/dcim/migrations/0001_initial.py b/netbox/dcim/migrations/0001_initial.py index da18bdbfe..db5f3faf2 100644 --- a/netbox/dcim/migrations/0001_initial.py +++ b/netbox/dcim/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-06-22 18:21 -from __future__ import unicode_literals - import django.core.validators from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0002_auto_20160622_1821.py b/netbox/dcim/migrations/0002_auto_20160622_1821.py index e269d43f4..1e3aa4d2a 100644 --- a/netbox/dcim/migrations/0002_auto_20160622_1821.py +++ b/netbox/dcim/migrations/0002_auto_20160622_1821.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-06-22 18:21 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0002_auto_20160622_1821_squashed_0022_color_names_to_rgb.py b/netbox/dcim/migrations/0002_auto_20160622_1821_squashed_0022_color_names_to_rgb.py index a641c3a2f..c3412cf10 100644 --- a/netbox/dcim/migrations/0002_auto_20160622_1821_squashed_0022_color_names_to_rgb.py +++ b/netbox/dcim/migrations/0002_auto_20160622_1821_squashed_0022_color_names_to_rgb.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.14 on 2018-07-31 02:06 -from __future__ import unicode_literals - import dcim.fields import django.core.validators from django.db import migrations, models diff --git a/netbox/dcim/migrations/0003_auto_20160628_1721.py b/netbox/dcim/migrations/0003_auto_20160628_1721.py index deebc8518..312d0456c 100644 --- a/netbox/dcim/migrations/0003_auto_20160628_1721.py +++ b/netbox/dcim/migrations/0003_auto_20160628_1721.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-06-28 17:21 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0004_auto_20160701_2049.py b/netbox/dcim/migrations/0004_auto_20160701_2049.py index e051daded..0806acb82 100644 --- a/netbox/dcim/migrations/0004_auto_20160701_2049.py +++ b/netbox/dcim/migrations/0004_auto_20160701_2049.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-07-01 20:49 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0005_auto_20160706_1722.py b/netbox/dcim/migrations/0005_auto_20160706_1722.py index 83a5cf7cb..a286d6ff3 100644 --- a/netbox/dcim/migrations/0005_auto_20160706_1722.py +++ b/netbox/dcim/migrations/0005_auto_20160706_1722.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-07-06 17:22 -from __future__ import unicode_literals - import dcim.fields from django.db import migrations, models diff --git a/netbox/dcim/migrations/0006_add_device_primary_ip4_ip6.py b/netbox/dcim/migrations/0006_add_device_primary_ip4_ip6.py index 670a174f9..6038cc027 100644 --- a/netbox/dcim/migrations/0006_add_device_primary_ip4_ip6.py +++ b/netbox/dcim/migrations/0006_add_device_primary_ip4_ip6.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-07-11 18:40 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0007_device_copy_primary_ip.py b/netbox/dcim/migrations/0007_device_copy_primary_ip.py index 055eac7d0..0d53337f7 100644 --- a/netbox/dcim/migrations/0007_device_copy_primary_ip.py +++ b/netbox/dcim/migrations/0007_device_copy_primary_ip.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-07-11 18:40 -from __future__ import unicode_literals - from django.db import migrations diff --git a/netbox/dcim/migrations/0008_device_remove_primary_ip.py b/netbox/dcim/migrations/0008_device_remove_primary_ip.py index 91465e878..f43452de2 100644 --- a/netbox/dcim/migrations/0008_device_remove_primary_ip.py +++ b/netbox/dcim/migrations/0008_device_remove_primary_ip.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-07-11 19:01 -from __future__ import unicode_literals - from django.db import migrations diff --git a/netbox/dcim/migrations/0009_site_32bit_asn_support.py b/netbox/dcim/migrations/0009_site_32bit_asn_support.py index c93340cea..0a72a6cf4 100644 --- a/netbox/dcim/migrations/0009_site_32bit_asn_support.py +++ b/netbox/dcim/migrations/0009_site_32bit_asn_support.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-07-13 19:24 -from __future__ import unicode_literals - import dcim.fields from django.db import migrations diff --git a/netbox/dcim/migrations/0010_devicebay_installed_device_set_null.py b/netbox/dcim/migrations/0010_devicebay_installed_device_set_null.py index bf2f31c57..769a6f678 100644 --- a/netbox/dcim/migrations/0010_devicebay_installed_device_set_null.py +++ b/netbox/dcim/migrations/0010_devicebay_installed_device_set_null.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-07-14 21:38 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0011_devicetype_part_number.py b/netbox/dcim/migrations/0011_devicetype_part_number.py index 62c97abc6..eb77ea500 100644 --- a/netbox/dcim/migrations/0011_devicetype_part_number.py +++ b/netbox/dcim/migrations/0011_devicetype_part_number.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2016-07-26 15:05 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0012_site_rack_device_add_tenant.py b/netbox/dcim/migrations/0012_site_rack_device_add_tenant.py index 8dcf8f81a..b01f507c3 100644 --- a/netbox/dcim/migrations/0012_site_rack_device_add_tenant.py +++ b/netbox/dcim/migrations/0012_site_rack_device_add_tenant.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2016-07-26 21:59 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0013_add_interface_form_factors.py b/netbox/dcim/migrations/0013_add_interface_form_factors.py index 310eb1eb6..478cb59ff 100644 --- a/netbox/dcim/migrations/0013_add_interface_form_factors.py +++ b/netbox/dcim/migrations/0013_add_interface_form_factors.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2016-08-06 20:24 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0014_rack_add_type_width.py b/netbox/dcim/migrations/0014_rack_add_type_width.py index c14768c0f..a3922c8cd 100644 --- a/netbox/dcim/migrations/0014_rack_add_type_width.py +++ b/netbox/dcim/migrations/0014_rack_add_type_width.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2016-08-08 21:11 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0015_rack_add_u_height_validator.py b/netbox/dcim/migrations/0015_rack_add_u_height_validator.py index 8e555204b..167dd8f54 100644 --- a/netbox/dcim/migrations/0015_rack_add_u_height_validator.py +++ b/netbox/dcim/migrations/0015_rack_add_u_height_validator.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2016-08-09 21:18 -from __future__ import unicode_literals - import django.core.validators from django.db import migrations, models diff --git a/netbox/dcim/migrations/0016_module_add_manufacturer.py b/netbox/dcim/migrations/0016_module_add_manufacturer.py index 6a2264a83..7204e6626 100644 --- a/netbox/dcim/migrations/0016_module_add_manufacturer.py +++ b/netbox/dcim/migrations/0016_module_add_manufacturer.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2016-08-10 13:45 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0017_rack_add_role.py b/netbox/dcim/migrations/0017_rack_add_role.py index eb3560b37..48500f4b4 100644 --- a/netbox/dcim/migrations/0017_rack_add_role.py +++ b/netbox/dcim/migrations/0017_rack_add_role.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2016-08-10 14:58 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0018_device_add_asset_tag.py b/netbox/dcim/migrations/0018_device_add_asset_tag.py index 706b42ac4..84d1cef35 100644 --- a/netbox/dcim/migrations/0018_device_add_asset_tag.py +++ b/netbox/dcim/migrations/0018_device_add_asset_tag.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-08-11 15:42 -from __future__ import unicode_literals - from django.db import migrations import utilities.fields diff --git a/netbox/dcim/migrations/0019_new_iface_form_factors.py b/netbox/dcim/migrations/0019_new_iface_form_factors.py index b2358ba5e..b2d8be533 100644 --- a/netbox/dcim/migrations/0019_new_iface_form_factors.py +++ b/netbox/dcim/migrations/0019_new_iface_form_factors.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-09-13 15:20 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0020_rack_desc_units.py b/netbox/dcim/migrations/0020_rack_desc_units.py index d5a74706d..7408c82ef 100644 --- a/netbox/dcim/migrations/0020_rack_desc_units.py +++ b/netbox/dcim/migrations/0020_rack_desc_units.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-10-28 15:01 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0021_add_ff_flexstack.py b/netbox/dcim/migrations/0021_add_ff_flexstack.py index 9e85ac909..bb4c4f4be 100644 --- a/netbox/dcim/migrations/0021_add_ff_flexstack.py +++ b/netbox/dcim/migrations/0021_add_ff_flexstack.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-10-31 18:47 -from __future__ import unicode_literals - import django.core.validators from django.db import migrations, models diff --git a/netbox/dcim/migrations/0022_color_names_to_rgb.py b/netbox/dcim/migrations/0022_color_names_to_rgb.py index 97e5de9ca..87fba4787 100644 --- a/netbox/dcim/migrations/0022_color_names_to_rgb.py +++ b/netbox/dcim/migrations/0022_color_names_to_rgb.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-12-06 16:35 -from __future__ import unicode_literals - from django.db import migrations import utilities.fields diff --git a/netbox/dcim/migrations/0023_devicetype_comments.py b/netbox/dcim/migrations/0023_devicetype_comments.py index 677a8af9d..5f70e8076 100644 --- a/netbox/dcim/migrations/0023_devicetype_comments.py +++ b/netbox/dcim/migrations/0023_devicetype_comments.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-12-16 16:08 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0023_devicetype_comments_squashed_0043_device_component_name_lengths.py b/netbox/dcim/migrations/0023_devicetype_comments_squashed_0043_device_component_name_lengths.py index a613552ad..4d4cfb603 100644 --- a/netbox/dcim/migrations/0023_devicetype_comments_squashed_0043_device_component_name_lengths.py +++ b/netbox/dcim/migrations/0023_devicetype_comments_squashed_0043_device_component_name_lengths.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.14 on 2018-07-31 02:13 -from __future__ import unicode_literals - import dcim.fields from django.conf import settings import django.contrib.postgres.fields diff --git a/netbox/dcim/migrations/0024_site_add_contact_fields.py b/netbox/dcim/migrations/0024_site_add_contact_fields.py index 34e17561f..218107ba2 100644 --- a/netbox/dcim/migrations/0024_site_add_contact_fields.py +++ b/netbox/dcim/migrations/0024_site_add_contact_fields.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-29 16:23 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0025_devicetype_add_interface_ordering.py b/netbox/dcim/migrations/0025_devicetype_add_interface_ordering.py index d1263cb89..56db88f1c 100644 --- a/netbox/dcim/migrations/0025_devicetype_add_interface_ordering.py +++ b/netbox/dcim/migrations/0025_devicetype_add_interface_ordering.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-01-06 16:56 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0026_add_rack_reservations.py b/netbox/dcim/migrations/0026_add_rack_reservations.py index b9d4f8214..ba66feea5 100644 --- a/netbox/dcim/migrations/0026_add_rack_reservations.py +++ b/netbox/dcim/migrations/0026_add_rack_reservations.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-02-16 18:43 -from __future__ import unicode_literals - from django.conf import settings import django.contrib.postgres.fields from django.db import migrations, models diff --git a/netbox/dcim/migrations/0027_device_add_site.py b/netbox/dcim/migrations/0027_device_add_site.py index 12d85f53e..bef85a822 100644 --- a/netbox/dcim/migrations/0027_device_add_site.py +++ b/netbox/dcim/migrations/0027_device_add_site.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-02-16 21:21 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0028_device_copy_rack_to_site.py b/netbox/dcim/migrations/0028_device_copy_rack_to_site.py index 6e7c52114..a67f34b38 100644 --- a/netbox/dcim/migrations/0028_device_copy_rack_to_site.py +++ b/netbox/dcim/migrations/0028_device_copy_rack_to_site.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-02-16 21:23 -from __future__ import unicode_literals - from django.db import migrations diff --git a/netbox/dcim/migrations/0029_allow_rackless_devices.py b/netbox/dcim/migrations/0029_allow_rackless_devices.py index 83906fc76..dd9f30bf2 100644 --- a/netbox/dcim/migrations/0029_allow_rackless_devices.py +++ b/netbox/dcim/migrations/0029_allow_rackless_devices.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-02-16 21:25 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0030_interface_add_lag.py b/netbox/dcim/migrations/0030_interface_add_lag.py index 6f5be67a4..1ffd74f04 100644 --- a/netbox/dcim/migrations/0030_interface_add_lag.py +++ b/netbox/dcim/migrations/0030_interface_add_lag.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-02-27 19:55 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0031_regions.py b/netbox/dcim/migrations/0031_regions.py index d4fd4db5e..73bb77b3f 100644 --- a/netbox/dcim/migrations/0031_regions.py +++ b/netbox/dcim/migrations/0031_regions.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-02-28 17:14 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion import mptt.fields diff --git a/netbox/dcim/migrations/0032_device_increase_name_length.py b/netbox/dcim/migrations/0032_device_increase_name_length.py index e11e75bab..ff0cd137f 100644 --- a/netbox/dcim/migrations/0032_device_increase_name_length.py +++ b/netbox/dcim/migrations/0032_device_increase_name_length.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-03-02 15:09 -from __future__ import unicode_literals - from django.db import migrations import utilities.fields diff --git a/netbox/dcim/migrations/0033_rackreservation_rack_editable.py b/netbox/dcim/migrations/0033_rackreservation_rack_editable.py index b327bad12..567de4345 100644 --- a/netbox/dcim/migrations/0033_rackreservation_rack_editable.py +++ b/netbox/dcim/migrations/0033_rackreservation_rack_editable.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.6 on 2017-03-17 18:39 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0034_rename_module_to_inventoryitem.py b/netbox/dcim/migrations/0034_rename_module_to_inventoryitem.py index ff430c067..db2f0577a 100644 --- a/netbox/dcim/migrations/0034_rename_module_to_inventoryitem.py +++ b/netbox/dcim/migrations/0034_rename_module_to_inventoryitem.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.6 on 2017-03-21 14:55 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0035_device_expand_status_choices.py b/netbox/dcim/migrations/0035_device_expand_status_choices.py index 16ea807c9..a6f7aa563 100644 --- a/netbox/dcim/migrations/0035_device_expand_status_choices.py +++ b/netbox/dcim/migrations/0035_device_expand_status_choices.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.7 on 2017-05-08 15:57 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0036_add_ff_juniper_vcp.py b/netbox/dcim/migrations/0036_add_ff_juniper_vcp.py index ac0f89f41..ceed22638 100644 --- a/netbox/dcim/migrations/0036_add_ff_juniper_vcp.py +++ b/netbox/dcim/migrations/0036_add_ff_juniper_vcp.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.1 on 2017-05-09 16:00 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0037_unicode_literals.py b/netbox/dcim/migrations/0037_unicode_literals.py index cba05becc..57ad7a744 100644 --- a/netbox/dcim/migrations/0037_unicode_literals.py +++ b/netbox/dcim/migrations/0037_unicode_literals.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11 on 2017-05-24 15:34 -from __future__ import unicode_literals - import dcim.fields import django.core.validators from django.db import migrations, models diff --git a/netbox/dcim/migrations/0038_wireless_interfaces.py b/netbox/dcim/migrations/0038_wireless_interfaces.py index 61cdb3996..78ea103e5 100644 --- a/netbox/dcim/migrations/0038_wireless_interfaces.py +++ b/netbox/dcim/migrations/0038_wireless_interfaces.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.1 on 2017-06-16 21:38 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0039_interface_add_enabled_mtu.py b/netbox/dcim/migrations/0039_interface_add_enabled_mtu.py index 4cc7e9616..c5f8dc83d 100644 --- a/netbox/dcim/migrations/0039_interface_add_enabled_mtu.py +++ b/netbox/dcim/migrations/0039_interface_add_enabled_mtu.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.1 on 2017-06-23 17:05 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0040_inventoryitem_add_asset_tag_description.py b/netbox/dcim/migrations/0040_inventoryitem_add_asset_tag_description.py index c7d49fe2c..aaca23ea8 100644 --- a/netbox/dcim/migrations/0040_inventoryitem_add_asset_tag_description.py +++ b/netbox/dcim/migrations/0040_inventoryitem_add_asset_tag_description.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11 on 2017-06-23 20:44 -from __future__ import unicode_literals - from django.db import migrations, models import utilities.fields diff --git a/netbox/dcim/migrations/0041_napalm_integration.py b/netbox/dcim/migrations/0041_napalm_integration.py index 73ca8f3ee..50c2fbd99 100644 --- a/netbox/dcim/migrations/0041_napalm_integration.py +++ b/netbox/dcim/migrations/0041_napalm_integration.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.3 on 2017-07-14 17:26 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0042_interface_ff_10ge_cx4.py b/netbox/dcim/migrations/0042_interface_ff_10ge_cx4.py index 77bea6bc6..e667d9451 100644 --- a/netbox/dcim/migrations/0042_interface_ff_10ge_cx4.py +++ b/netbox/dcim/migrations/0042_interface_ff_10ge_cx4.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.4 on 2017-08-29 21:00 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0043_device_component_name_lengths.py b/netbox/dcim/migrations/0043_device_component_name_lengths.py index a52f50859..9f0ba2243 100644 --- a/netbox/dcim/migrations/0043_device_component_name_lengths.py +++ b/netbox/dcim/migrations/0043_device_component_name_lengths.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.4 on 2017-08-29 21:26 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0044_virtualization.py b/netbox/dcim/migrations/0044_virtualization.py index b1e250bc2..362979aef 100644 --- a/netbox/dcim/migrations/0044_virtualization.py +++ b/netbox/dcim/migrations/0044_virtualization.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.4 on 2017-08-31 14:15 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0044_virtualization_squashed_0055_virtualchassis_ordering.py b/netbox/dcim/migrations/0044_virtualization_squashed_0055_virtualchassis_ordering.py index 42fc5f317..78b4e3a41 100644 --- a/netbox/dcim/migrations/0044_virtualization_squashed_0055_virtualchassis_ordering.py +++ b/netbox/dcim/migrations/0044_virtualization_squashed_0055_virtualchassis_ordering.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.14 on 2018-07-31 02:17 -from __future__ import unicode_literals - from django.conf import settings import django.core.validators from django.db import migrations, models diff --git a/netbox/dcim/migrations/0045_devicerole_vm_role.py b/netbox/dcim/migrations/0045_devicerole_vm_role.py index 775effaf2..306a5a806 100644 --- a/netbox/dcim/migrations/0045_devicerole_vm_role.py +++ b/netbox/dcim/migrations/0045_devicerole_vm_role.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.4 on 2017-09-29 16:09 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0046_rack_lengthen_facility_id.py b/netbox/dcim/migrations/0046_rack_lengthen_facility_id.py index d04006524..f6e93a43d 100644 --- a/netbox/dcim/migrations/0046_rack_lengthen_facility_id.py +++ b/netbox/dcim/migrations/0046_rack_lengthen_facility_id.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.4 on 2017-10-09 17:43 -from __future__ import unicode_literals - from django.db import migrations import utilities.fields diff --git a/netbox/dcim/migrations/0047_more_100ge_form_factors.py b/netbox/dcim/migrations/0047_more_100ge_form_factors.py index dafa81a54..a76ef6c8d 100644 --- a/netbox/dcim/migrations/0047_more_100ge_form_factors.py +++ b/netbox/dcim/migrations/0047_more_100ge_form_factors.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.4 on 2017-10-09 18:43 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0048_rack_serial.py b/netbox/dcim/migrations/0048_rack_serial.py index 8e060c865..3fb7c0d2e 100644 --- a/netbox/dcim/migrations/0048_rack_serial.py +++ b/netbox/dcim/migrations/0048_rack_serial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.4 on 2017-10-09 18:50 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0049_rackreservation_change_user.py b/netbox/dcim/migrations/0049_rackreservation_change_user.py index ae9f95246..2d03db587 100644 --- a/netbox/dcim/migrations/0049_rackreservation_change_user.py +++ b/netbox/dcim/migrations/0049_rackreservation_change_user.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.6 on 2017-10-31 17:32 -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0050_interface_vlan_tagging.py b/netbox/dcim/migrations/0050_interface_vlan_tagging.py index 1906b9179..8acaf4eec 100644 --- a/netbox/dcim/migrations/0050_interface_vlan_tagging.py +++ b/netbox/dcim/migrations/0050_interface_vlan_tagging.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.6 on 2017-11-10 20:10 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0051_rackreservation_tenant.py b/netbox/dcim/migrations/0051_rackreservation_tenant.py index 90a551eb8..ca0513ab0 100644 --- a/netbox/dcim/migrations/0051_rackreservation_tenant.py +++ b/netbox/dcim/migrations/0051_rackreservation_tenant.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.6 on 2017-11-15 18:56 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0052_virtual_chassis.py b/netbox/dcim/migrations/0052_virtual_chassis.py index 334f60ca7..56777744c 100644 --- a/netbox/dcim/migrations/0052_virtual_chassis.py +++ b/netbox/dcim/migrations/0052_virtual_chassis.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.6 on 2017-11-27 17:27 -from __future__ import unicode_literals - import django.core.validators from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0053_platform_manufacturer.py b/netbox/dcim/migrations/0053_platform_manufacturer.py index 62797716e..bb5f24c91 100644 --- a/netbox/dcim/migrations/0053_platform_manufacturer.py +++ b/netbox/dcim/migrations/0053_platform_manufacturer.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.6 on 2017-12-19 20:56 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0054_site_status_timezone_description.py b/netbox/dcim/migrations/0054_site_status_timezone_description.py index 723f61fc8..554bf554c 100644 --- a/netbox/dcim/migrations/0054_site_status_timezone_description.py +++ b/netbox/dcim/migrations/0054_site_status_timezone_description.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.6 on 2018-01-25 18:21 -from __future__ import unicode_literals - from django.db import migrations, models import timezone_field.fields diff --git a/netbox/dcim/migrations/0055_virtualchassis_ordering.py b/netbox/dcim/migrations/0055_virtualchassis_ordering.py index 51cda0ff6..ab23f403f 100644 --- a/netbox/dcim/migrations/0055_virtualchassis_ordering.py +++ b/netbox/dcim/migrations/0055_virtualchassis_ordering.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.9 on 2018-02-21 14:41 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/dcim/migrations/0057_tags.py b/netbox/dcim/migrations/0057_tags.py index b0cccfdf3..44ed09497 100644 --- a/netbox/dcim/migrations/0057_tags.py +++ b/netbox/dcim/migrations/0057_tags.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-05-22 19:04 -from __future__ import unicode_literals - from django.db import migrations import taggit.managers diff --git a/netbox/dcim/migrations/0058_relax_rack_naming_constraints.py b/netbox/dcim/migrations/0058_relax_rack_naming_constraints.py index e4974be2f..9676e973d 100644 --- a/netbox/dcim/migrations/0058_relax_rack_naming_constraints.py +++ b/netbox/dcim/migrations/0058_relax_rack_naming_constraints.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-05-22 19:27 -from __future__ import unicode_literals - from django.db import migrations diff --git a/netbox/dcim/migrations/0059_site_latitude_longitude.py b/netbox/dcim/migrations/0059_site_latitude_longitude.py index 15e666f35..7c019ed5d 100644 --- a/netbox/dcim/migrations/0059_site_latitude_longitude.py +++ b/netbox/dcim/migrations/0059_site_latitude_longitude.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-06-21 18:45 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/migrations/0060_change_logging.py b/netbox/dcim/migrations/0060_change_logging.py index 8a40f4e4e..12a9f95ad 100644 --- a/netbox/dcim/migrations/0060_change_logging.py +++ b/netbox/dcim/migrations/0060_change_logging.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-06-13 17:14 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 564e6fa74..0c74600bb 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from collections import OrderedDict from itertools import count, groupby @@ -12,7 +10,6 @@ from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models from django.db.models import Count, Q, ObjectDoesNotExist from django.urls import reverse -from django.utils.encoding import python_2_unicode_compatible from mptt.models import MPTTModel, TreeForeignKey from taggit.managers import TaggableManager from timezone_field import TimeZoneField @@ -58,7 +55,6 @@ class ComponentModel(models.Model): # Regions # -@python_2_unicode_compatible class Region(MPTTModel, ChangeLoggedModel): """ Sites can be grouped within geographic Regions. @@ -106,7 +102,6 @@ class SiteManager(NaturalOrderByManager): natural_order_field = 'name' -@python_2_unicode_compatible class Site(ChangeLoggedModel, CustomFieldModel): """ A Site represents a geographic location within a network; typically a building or campus. The optional facility @@ -268,7 +263,6 @@ class Site(ChangeLoggedModel, CustomFieldModel): # Racks # -@python_2_unicode_compatible class RackGroup(ChangeLoggedModel): """ Racks can be grouped as subsets within a Site. The scope of a group will depend on how Sites are defined. For @@ -308,7 +302,6 @@ class RackGroup(ChangeLoggedModel): ) -@python_2_unicode_compatible class RackRole(ChangeLoggedModel): """ Racks can be organized by functional role, similar to Devices. @@ -345,7 +338,6 @@ class RackManager(NaturalOrderByManager): natural_order_field = 'name' -@python_2_unicode_compatible class Rack(ChangeLoggedModel, CustomFieldModel): """ Devices are housed within Racks. Each rack has a defined height measured in rack units, and a front and rear face. @@ -603,7 +595,6 @@ class Rack(ChangeLoggedModel, CustomFieldModel): return int(float(self.u_height - u_available) / self.u_height * 100) -@python_2_unicode_compatible class RackReservation(ChangeLoggedModel): """ One or more reserved units within a Rack. @@ -677,7 +668,6 @@ class RackReservation(ChangeLoggedModel): # Device Types # -@python_2_unicode_compatible class Manufacturer(ChangeLoggedModel): """ A Manufacturer represents a company which produces hardware devices; for example, Juniper or Dell. @@ -708,7 +698,6 @@ class Manufacturer(ChangeLoggedModel): ) -@python_2_unicode_compatible class DeviceType(ChangeLoggedModel, CustomFieldModel): """ A DeviceType represents a particular make (Manufacturer) and model of device. It specifies rack height and depth, as @@ -882,7 +871,6 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): return bool(self.subdevice_role is False) -@python_2_unicode_compatible class ConsolePortTemplate(ComponentModel): """ A template for a ConsolePort to be created for a new Device. @@ -907,7 +895,6 @@ class ConsolePortTemplate(ComponentModel): return self.device_type -@python_2_unicode_compatible class ConsoleServerPortTemplate(ComponentModel): """ A template for a ConsoleServerPort to be created for a new Device. @@ -932,7 +919,6 @@ class ConsoleServerPortTemplate(ComponentModel): return self.device_type -@python_2_unicode_compatible class PowerPortTemplate(ComponentModel): """ A template for a PowerPort to be created for a new Device. @@ -957,7 +943,6 @@ class PowerPortTemplate(ComponentModel): return self.device_type -@python_2_unicode_compatible class PowerOutletTemplate(ComponentModel): """ A template for a PowerOutlet to be created for a new Device. @@ -982,7 +967,6 @@ class PowerOutletTemplate(ComponentModel): return self.device_type -@python_2_unicode_compatible class InterfaceTemplate(ComponentModel): """ A template for a physical data interface on a new Device. @@ -1017,7 +1001,6 @@ class InterfaceTemplate(ComponentModel): return self.device_type -@python_2_unicode_compatible class DeviceBayTemplate(ComponentModel): """ A template for a DeviceBay to be created for a new parent Device. @@ -1046,7 +1029,6 @@ class DeviceBayTemplate(ComponentModel): # Devices # -@python_2_unicode_compatible class DeviceRole(ChangeLoggedModel): """ Devices are organized by functional role; for example, "Core Switch" or "File Server". Each DeviceRole is assigned a @@ -1084,7 +1066,6 @@ class DeviceRole(ChangeLoggedModel): ) -@python_2_unicode_compatible class Platform(ChangeLoggedModel): """ Platform refers to the software or firmware running on a Device. For example, "Cisco IOS-XR" or "Juniper Junos". @@ -1150,7 +1131,6 @@ class DeviceManager(NaturalOrderByManager): natural_order_field = 'name' -@python_2_unicode_compatible class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): """ A Device represents a piece of physical hardware mounted within a Rack. Each Device is assigned a DeviceType, @@ -1543,7 +1523,6 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): # Console ports # -@python_2_unicode_compatible class ConsolePort(ComponentModel): """ A physical console port within a Device. ConsolePorts connect to ConsoleServerPorts. @@ -1610,7 +1589,6 @@ class ConsoleServerPortManager(models.Manager): }).order_by('device', 'name_padded') -@python_2_unicode_compatible class ConsoleServerPort(ComponentModel): """ A physical port within a Device (typically a designated console server) which provides access to ConsolePorts. @@ -1655,7 +1633,6 @@ class ConsoleServerPort(ComponentModel): # Power ports # -@python_2_unicode_compatible class PowerPort(ComponentModel): """ A physical power supply (intake) port within a Device. PowerPorts connect to PowerOutlets. @@ -1721,7 +1698,6 @@ class PowerOutletManager(models.Manager): }).order_by('device', 'name_padded') -@python_2_unicode_compatible class PowerOutlet(ComponentModel): """ A physical power outlet (output) within a Device which provides power to a PowerPort. @@ -1766,7 +1742,6 @@ class PowerOutlet(ComponentModel): # Interfaces # -@python_2_unicode_compatible class Interface(ComponentModel): """ A network interface within a Device or VirtualMachine. A physical Interface can connect to exactly one other @@ -2095,7 +2070,6 @@ class InterfaceConnection(models.Model): # Device bays # -@python_2_unicode_compatible class DeviceBay(ComponentModel): """ An empty space within a Device which can house a child device @@ -2149,7 +2123,6 @@ class DeviceBay(ComponentModel): # Inventory items # -@python_2_unicode_compatible class InventoryItem(ComponentModel): """ An InventoryItem represents a serialized piece of hardware within a Device, such as a line card or power supply. @@ -2241,7 +2214,6 @@ class InventoryItem(ComponentModel): # Virtual chassis # -@python_2_unicode_compatible class VirtualChassis(ChangeLoggedModel): """ A collection of Devices which operate with a shared control plane (e.g. a switch stack). diff --git a/netbox/dcim/querysets.py b/netbox/dcim/querysets.py index 32275ce01..9b735dfa6 100644 --- a/netbox/dcim/querysets.py +++ b/netbox/dcim/querysets.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models import QuerySet from django.db.models.expressions import RawSQL diff --git a/netbox/dcim/signals.py b/netbox/dcim/signals.py index 80e47391a..2aefdc229 100644 --- a/netbox/dcim/signals.py +++ b/netbox/dcim/signals.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models.signals import post_save, pre_delete from django.dispatch import receiver diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index fc9105774..c51154d21 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import django_tables2 as tables from django_tables2.utils import Accessor diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index d4a42c196..00034c37d 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.urls import reverse from netaddr import IPNetwork from rest_framework import status diff --git a/netbox/dcim/tests/test_forms.py b/netbox/dcim/tests/test_forms.py index c8d438728..2f333ea69 100644 --- a/netbox/dcim/tests/test_forms.py +++ b/netbox/dcim/tests/test_forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import TestCase from dcim.forms import * diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py index 5b2cdbd51..ec59b59b0 100644 --- a/netbox/dcim/tests/test_models.py +++ b/netbox/dcim/tests/test_models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import TestCase from dcim.models import * diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 7345cdacd..4ba91f215 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from extras.views import ObjectChangeLogView, ImageAttachmentEditView diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index eb7f71a25..62f610ce5 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from operator import attrgetter from django.contrib import messages diff --git a/netbox/extras/admin.py b/netbox/extras/admin.py index 2b140b444..9320e7081 100644 --- a/netbox/extras/admin.py +++ b/netbox/extras/admin.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.contrib import admin from django.utils.safestring import mark_safe diff --git a/netbox/extras/api/customfields.py b/netbox/extras/api/customfields.py index 0497138c4..c45f3029d 100644 --- a/netbox/extras/api/customfields.py +++ b/netbox/extras/api/customfields.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import datetime from django.contrib.contenttypes.models import ContentType diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py index d0d2c67b0..0c5e79d80 100644 --- a/netbox/extras/api/serializers.py +++ b/netbox/extras/api/serializers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import ObjectDoesNotExist from rest_framework import serializers from taggit.models import Tag diff --git a/netbox/extras/api/urls.py b/netbox/extras/api/urls.py index cf61841dd..c18ccf657 100644 --- a/netbox/extras/api/urls.py +++ b/netbox/extras/api/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from rest_framework import routers from . import views diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py index 0fefa7ae6..32ac0baec 100644 --- a/netbox/extras/api/views.py +++ b/netbox/extras/api/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.contenttypes.models import ContentType from django.db.models import Count from django.http import Http404, HttpResponse diff --git a/netbox/extras/apps.py b/netbox/extras/apps.py index 4520b1923..6ada525a2 100644 --- a/netbox/extras/apps.py +++ b/netbox/extras/apps.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps import AppConfig from django.core.exceptions import ImproperlyConfigured from django.conf import settings diff --git a/netbox/extras/constants.py b/netbox/extras/constants.py index 9707d9121..2397ece7b 100644 --- a/netbox/extras/constants.py +++ b/netbox/extras/constants.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - # Models which support custom fields CUSTOMFIELD_MODELS = ( diff --git a/netbox/extras/filters.py b/netbox/extras/filters.py index 3abd5b4cf..4239d1639 100644 --- a/netbox/extras/filters.py +++ b/netbox/extras/filters.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import django_filters from django.contrib.auth.models import User from django.contrib.contenttypes.models import ContentType diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py index 7dfceb390..3b900e8f5 100644 --- a/netbox/extras/forms.py +++ b/netbox/extras/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from collections import OrderedDict from django import forms diff --git a/netbox/extras/management/commands/nbshell.py b/netbox/extras/management/commands/nbshell.py index 15b8acac5..c5a2fa1ec 100644 --- a/netbox/extras/management/commands/nbshell.py +++ b/netbox/extras/management/commands/nbshell.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import code import platform import sys diff --git a/netbox/extras/management/commands/run_inventory.py b/netbox/extras/management/commands/run_inventory.py index c42bdf50a..e5ce1bbca 100644 --- a/netbox/extras/management/commands/run_inventory.py +++ b/netbox/extras/management/commands/run_inventory.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from getpass import getpass from django.conf import settings diff --git a/netbox/extras/management/commands/runreport.py b/netbox/extras/management/commands/runreport.py index 96efc43a0..efc789021 100644 --- a/netbox/extras/management/commands/runreport.py +++ b/netbox/extras/management/commands/runreport.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.management.base import BaseCommand from django.utils import timezone diff --git a/netbox/extras/middleware.py b/netbox/extras/middleware.py index 7dfddbad6..5cbe392d4 100644 --- a/netbox/extras/middleware.py +++ b/netbox/extras/middleware.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import timedelta import random import threading diff --git a/netbox/extras/migrations/0001_initial.py b/netbox/extras/migrations/0001_initial.py index 949b3a2d8..be9b95264 100644 --- a/netbox/extras/migrations/0001_initial.py +++ b/netbox/extras/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-06-22 18:21 -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/extras/migrations/0001_initial_squashed_0010_customfield_filter_logic.py b/netbox/extras/migrations/0001_initial_squashed_0010_customfield_filter_logic.py index 0ac826ba4..dd2b3df27 100644 --- a/netbox/extras/migrations/0001_initial_squashed_0010_customfield_filter_logic.py +++ b/netbox/extras/migrations/0001_initial_squashed_0010_customfield_filter_logic.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.14 on 2018-07-31 02:19 -from __future__ import unicode_literals - import re from distutils.version import StrictVersion diff --git a/netbox/extras/migrations/0002_custom_fields.py b/netbox/extras/migrations/0002_custom_fields.py index 1d33ca281..300ae758a 100644 --- a/netbox/extras/migrations/0002_custom_fields.py +++ b/netbox/extras/migrations/0002_custom_fields.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-08-23 20:33 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/extras/migrations/0003_exporttemplate_add_description.py b/netbox/extras/migrations/0003_exporttemplate_add_description.py index 6355955b5..fc45f5255 100644 --- a/netbox/extras/migrations/0003_exporttemplate_add_description.py +++ b/netbox/extras/migrations/0003_exporttemplate_add_description.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-09-27 20:20 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/extras/migrations/0004_topologymap_change_comma_to_semicolon.py b/netbox/extras/migrations/0004_topologymap_change_comma_to_semicolon.py index ee838046d..b35c641da 100644 --- a/netbox/extras/migrations/0004_topologymap_change_comma_to_semicolon.py +++ b/netbox/extras/migrations/0004_topologymap_change_comma_to_semicolon.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-11-03 18:33 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/extras/migrations/0005_useraction_add_bulk_create.py b/netbox/extras/migrations/0005_useraction_add_bulk_create.py index 0f20e5214..58b66fe1a 100644 --- a/netbox/extras/migrations/0005_useraction_add_bulk_create.py +++ b/netbox/extras/migrations/0005_useraction_add_bulk_create.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11 on 2017-04-04 19:45 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/extras/migrations/0006_add_imageattachments.py b/netbox/extras/migrations/0006_add_imageattachments.py index c4c589a9e..6842cced0 100644 --- a/netbox/extras/migrations/0006_add_imageattachments.py +++ b/netbox/extras/migrations/0006_add_imageattachments.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11 on 2017-04-04 19:58 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion import extras.models diff --git a/netbox/extras/migrations/0007_unicode_literals.py b/netbox/extras/migrations/0007_unicode_literals.py index cda07583f..fecb33b7b 100644 --- a/netbox/extras/migrations/0007_unicode_literals.py +++ b/netbox/extras/migrations/0007_unicode_literals.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11 on 2017-05-24 15:34 -from __future__ import unicode_literals - from django.db import migrations, models import extras.models diff --git a/netbox/extras/migrations/0008_reports.py b/netbox/extras/migrations/0008_reports.py index fbfde2cba..5cf84bbb1 100644 --- a/netbox/extras/migrations/0008_reports.py +++ b/netbox/extras/migrations/0008_reports.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.4 on 2017-09-26 21:25 -from __future__ import unicode_literals from distutils.version import StrictVersion import re diff --git a/netbox/extras/migrations/0009_topologymap_type.py b/netbox/extras/migrations/0009_topologymap_type.py index b062c58af..bc9ec07d5 100644 --- a/netbox/extras/migrations/0009_topologymap_type.py +++ b/netbox/extras/migrations/0009_topologymap_type.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.9 on 2018-02-15 16:28 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/extras/migrations/0010_customfield_filter_logic.py b/netbox/extras/migrations/0010_customfield_filter_logic.py index e35a2f835..dbff03e2d 100644 --- a/netbox/extras/migrations/0010_customfield_filter_logic.py +++ b/netbox/extras/migrations/0010_customfield_filter_logic.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.9 on 2018-02-21 19:48 -from __future__ import unicode_literals - from django.db import migrations, models from extras.constants import CF_FILTER_DISABLED, CF_FILTER_EXACT, CF_FILTER_LOOSE, CF_TYPE_SELECT diff --git a/netbox/extras/migrations/0012_webhooks.py b/netbox/extras/migrations/0012_webhooks.py index 70c8e9c14..8f7fcf36f 100644 --- a/netbox/extras/migrations/0012_webhooks.py +++ b/netbox/extras/migrations/0012_webhooks.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-05-30 17:55 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/extras/migrations/0013_objectchange.py b/netbox/extras/migrations/0013_objectchange.py index de4762a46..01d73a841 100644 --- a/netbox/extras/migrations/0013_objectchange.py +++ b/netbox/extras/migrations/0013_objectchange.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-06-22 18:13 -from __future__ import unicode_literals - from django.conf import settings import django.contrib.postgres.fields.jsonb from django.db import migrations, models diff --git a/netbox/extras/models.py b/netbox/extras/models.py index ad4fcdb18..f2000cdd2 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from collections import OrderedDict from datetime import date @@ -14,7 +12,6 @@ from django.db.models import Q from django.http import HttpResponse from django.template import Template, Context from django.urls import reverse -from django.utils.encoding import python_2_unicode_compatible from django.utils.safestring import mark_safe from dcim.constants import CONNECTION_STATUS_CONNECTED @@ -27,7 +24,6 @@ from .querysets import ConfigContextQuerySet # Webhooks # -@python_2_unicode_compatible class Webhook(models.Model): """ A Webhook defines a request that will be sent to a remote application when an object is created, updated, and/or @@ -136,7 +132,6 @@ class CustomFieldModel(models.Model): return OrderedDict([(field, None) for field in fields]) -@python_2_unicode_compatible class CustomField(models.Model): obj_type = models.ManyToManyField( to=ContentType, @@ -227,7 +222,6 @@ class CustomField(models.Model): return serialized_value -@python_2_unicode_compatible class CustomFieldValue(models.Model): field = models.ForeignKey( to='extras.CustomField', @@ -271,7 +265,6 @@ class CustomFieldValue(models.Model): super(CustomFieldValue, self).save(*args, **kwargs) -@python_2_unicode_compatible class CustomFieldChoice(models.Model): field = models.ForeignKey( to='extras.CustomField', @@ -309,7 +302,6 @@ class CustomFieldChoice(models.Model): # Graphs # -@python_2_unicode_compatible class Graph(models.Model): type = models.PositiveSmallIntegerField( choices=GRAPH_TYPE_CHOICES @@ -351,7 +343,6 @@ class Graph(models.Model): # Export templates # -@python_2_unicode_compatible class ExportTemplate(models.Model): content_type = models.ForeignKey( to=ContentType, @@ -410,7 +401,6 @@ class ExportTemplate(models.Model): # Topology maps # -@python_2_unicode_compatible class TopologyMap(models.Model): name = models.CharField( max_length=50, @@ -571,7 +561,6 @@ def image_upload(instance, filename): return '{}{}_{}_{}'.format(path, instance.content_type.name, instance.object_id, filename) -@python_2_unicode_compatible class ImageAttachment(models.Model): """ An uploaded image which is associated with an object. @@ -752,7 +741,6 @@ class ReportResult(models.Model): # Change logging # -@python_2_unicode_compatible class ObjectChange(models.Model): """ Record a change to an object and the user account associated with that change. A change record may optionally @@ -904,7 +892,6 @@ class UserActionManager(models.Manager): # TODO: Remove UserAction, which has been replaced by ObjectChange. -@python_2_unicode_compatible class UserAction(models.Model): """ DEPRECATED: A record of an action (add, edit, or delete) performed on an object by a User. diff --git a/netbox/extras/querysets.py b/netbox/extras/querysets.py index bcc6f1e54..439323c94 100644 --- a/netbox/extras/querysets.py +++ b/netbox/extras/querysets.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models import Q, QuerySet diff --git a/netbox/extras/reports.py b/netbox/extras/reports.py index f6b5d7570..b1e051301 100644 --- a/netbox/extras/reports.py +++ b/netbox/extras/reports.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from collections import OrderedDict import importlib import inspect diff --git a/netbox/extras/rpc.py b/netbox/extras/rpc.py index 552f592c7..60fc9208f 100644 --- a/netbox/extras/rpc.py +++ b/netbox/extras/rpc.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import re import time diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py index 22bf26cce..688f159db 100644 --- a/netbox/extras/tables.py +++ b/netbox/extras/tables.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import django_tables2 as tables from taggit.models import Tag diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py index 3d0e5d1f7..40258b100 100644 --- a/netbox/extras/tests/test_api.py +++ b/netbox/extras/tests/test_api.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.contenttypes.models import ContentType from django.urls import reverse from rest_framework import status diff --git a/netbox/extras/tests/test_customfields.py b/netbox/extras/tests/test_customfields.py index 97eb69cd9..8959528d3 100644 --- a/netbox/extras/tests/test_customfields.py +++ b/netbox/extras/tests/test_customfields.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import date from django.contrib.contenttypes.models import ContentType diff --git a/netbox/extras/tests/test_tags.py b/netbox/extras/tests/test_tags.py index d4c0a79c6..02ea3adef 100644 --- a/netbox/extras/tests/test_tags.py +++ b/netbox/extras/tests/test_tags.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.urls import reverse from rest_framework import status diff --git a/netbox/extras/urls.py b/netbox/extras/urls.py index e56652280..2a8e09090 100644 --- a/netbox/extras/urls.py +++ b/netbox/extras/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from extras import views diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 90d0d698d..a7800f2e2 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import template from django.contrib import messages from django.contrib.auth.mixins import PermissionRequiredMixin diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py index 4ba62e8da..0581d1e6d 100644 --- a/netbox/ipam/api/serializers.py +++ b/netbox/ipam/api/serializers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from collections import OrderedDict from rest_framework import serializers diff --git a/netbox/ipam/api/urls.py b/netbox/ipam/api/urls.py index ca046cd93..c1ea1e200 100644 --- a/netbox/ipam/api/urls.py +++ b/netbox/ipam/api/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from rest_framework import routers from . import views diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py index e32688343..e7a249e07 100644 --- a/netbox/ipam/api/views.py +++ b/netbox/ipam/api/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf import settings from django.shortcuts import get_object_or_404 from rest_framework import status diff --git a/netbox/ipam/apps.py b/netbox/ipam/apps.py index c944d1b2c..fd4af74b0 100644 --- a/netbox/ipam/apps.py +++ b/netbox/ipam/apps.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps import AppConfig diff --git a/netbox/ipam/constants.py b/netbox/ipam/constants.py index e2b98a1ef..4ee51a3a2 100644 --- a/netbox/ipam/constants.py +++ b/netbox/ipam/constants.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - # IP address families AF_CHOICES = ( diff --git a/netbox/ipam/fields.py b/netbox/ipam/fields.py index 8c7dbb690..6db3a00f2 100644 --- a/netbox/ipam/fields.py +++ b/netbox/ipam/fields.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import ValidationError from django.db import models from netaddr import AddrFormatError, IPNetwork diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py index 0a8606e52..5351d0861 100644 --- a/netbox/ipam/filters.py +++ b/netbox/ipam/filters.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import django_filters from django.core.exceptions import ValidationError from django.db.models import Q diff --git a/netbox/ipam/formfields.py b/netbox/ipam/formfields.py index c67c13414..2909a54b1 100644 --- a/netbox/ipam/formfields.py +++ b/netbox/ipam/formfields.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.core.exceptions import ValidationError from netaddr import IPNetwork, AddrFormatError diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index 8209b2ffa..bad2d8a1c 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.core.exceptions import MultipleObjectsReturned from django.core.validators import MaxValueValidator, MinValueValidator diff --git a/netbox/ipam/lookups.py b/netbox/ipam/lookups.py index 9aca3c03b..e1de38a51 100644 --- a/netbox/ipam/lookups.py +++ b/netbox/ipam/lookups.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models import Lookup, Transform, IntegerField from django.db.models import lookups diff --git a/netbox/ipam/migrations/0001_initial.py b/netbox/ipam/migrations/0001_initial.py index f98d04952..567f991ec 100644 --- a/netbox/ipam/migrations/0001_initial.py +++ b/netbox/ipam/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-06-22 18:21 -from __future__ import unicode_literals - import django.core.validators from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/ipam/migrations/0002_vrf_add_enforce_unique.py b/netbox/ipam/migrations/0002_vrf_add_enforce_unique.py index 373e93d80..993020a12 100644 --- a/netbox/ipam/migrations/0002_vrf_add_enforce_unique.py +++ b/netbox/ipam/migrations/0002_vrf_add_enforce_unique.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-07-14 19:34 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/ipam/migrations/0002_vrf_add_enforce_unique_squashed_0018_remove_service_uniqueness_constraint.py b/netbox/ipam/migrations/0002_vrf_add_enforce_unique_squashed_0018_remove_service_uniqueness_constraint.py index c4271ea51..61d38a69b 100644 --- a/netbox/ipam/migrations/0002_vrf_add_enforce_unique_squashed_0018_remove_service_uniqueness_constraint.py +++ b/netbox/ipam/migrations/0002_vrf_add_enforce_unique_squashed_0018_remove_service_uniqueness_constraint.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.14 on 2018-07-31 02:12 -from __future__ import unicode_literals - import django.core.validators from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/ipam/migrations/0003_ipam_add_vlangroups.py b/netbox/ipam/migrations/0003_ipam_add_vlangroups.py index 2e7157fe1..c9092f0f2 100644 --- a/netbox/ipam/migrations/0003_ipam_add_vlangroups.py +++ b/netbox/ipam/migrations/0003_ipam_add_vlangroups.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-07-15 16:22 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/ipam/migrations/0004_ipam_vlangroup_uniqueness.py b/netbox/ipam/migrations/0004_ipam_vlangroup_uniqueness.py index fef5ec0b3..d8f628c57 100644 --- a/netbox/ipam/migrations/0004_ipam_vlangroup_uniqueness.py +++ b/netbox/ipam/migrations/0004_ipam_vlangroup_uniqueness.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-07-15 17:14 -from __future__ import unicode_literals - from django.db import migrations diff --git a/netbox/ipam/migrations/0005_auto_20160725_1842.py b/netbox/ipam/migrations/0005_auto_20160725_1842.py index 17eee6e8c..726b89259 100644 --- a/netbox/ipam/migrations/0005_auto_20160725_1842.py +++ b/netbox/ipam/migrations/0005_auto_20160725_1842.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2016-07-25 18:42 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/ipam/migrations/0006_vrf_vlan_add_tenant.py b/netbox/ipam/migrations/0006_vrf_vlan_add_tenant.py index 8d519261d..9352e4872 100644 --- a/netbox/ipam/migrations/0006_vrf_vlan_add_tenant.py +++ b/netbox/ipam/migrations/0006_vrf_vlan_add_tenant.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2016-07-27 14:39 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/ipam/migrations/0007_prefix_ipaddress_add_tenant.py b/netbox/ipam/migrations/0007_prefix_ipaddress_add_tenant.py index eab3b9a47..dfe8fbb52 100644 --- a/netbox/ipam/migrations/0007_prefix_ipaddress_add_tenant.py +++ b/netbox/ipam/migrations/0007_prefix_ipaddress_add_tenant.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2016-07-28 15:32 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/ipam/migrations/0008_prefix_change_order.py b/netbox/ipam/migrations/0008_prefix_change_order.py index 3ad3eb9e3..ea219da19 100644 --- a/netbox/ipam/migrations/0008_prefix_change_order.py +++ b/netbox/ipam/migrations/0008_prefix_change_order.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-09-15 16:08 -from __future__ import unicode_literals - from django.db import migrations diff --git a/netbox/ipam/migrations/0009_ipaddress_add_status.py b/netbox/ipam/migrations/0009_ipaddress_add_status.py index ad876c3b6..b28590730 100644 --- a/netbox/ipam/migrations/0009_ipaddress_add_status.py +++ b/netbox/ipam/migrations/0009_ipaddress_add_status.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-10-21 15:44 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/ipam/migrations/0010_ipaddress_help_texts.py b/netbox/ipam/migrations/0010_ipaddress_help_texts.py index a1e05171d..2a7e06335 100644 --- a/netbox/ipam/migrations/0010_ipaddress_help_texts.py +++ b/netbox/ipam/migrations/0010_ipaddress_help_texts.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-11-01 17:46 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion import ipam.fields diff --git a/netbox/ipam/migrations/0011_rir_add_is_private.py b/netbox/ipam/migrations/0011_rir_add_is_private.py index ad7732653..d8b81d484 100644 --- a/netbox/ipam/migrations/0011_rir_add_is_private.py +++ b/netbox/ipam/migrations/0011_rir_add_is_private.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-12-06 18:27 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/ipam/migrations/0012_services.py b/netbox/ipam/migrations/0012_services.py index bb6274408..12b2cf673 100644 --- a/netbox/ipam/migrations/0012_services.py +++ b/netbox/ipam/migrations/0012_services.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-12-15 20:22 -from __future__ import unicode_literals - import django.core.validators from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/ipam/migrations/0013_prefix_add_is_pool.py b/netbox/ipam/migrations/0013_prefix_add_is_pool.py index fd1493610..194bcb651 100644 --- a/netbox/ipam/migrations/0013_prefix_add_is_pool.py +++ b/netbox/ipam/migrations/0013_prefix_add_is_pool.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-27 19:34 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion import ipam.fields diff --git a/netbox/ipam/migrations/0014_ipaddress_status_add_deprecated.py b/netbox/ipam/migrations/0014_ipaddress_status_add_deprecated.py index adc8e606c..3f5f48437 100644 --- a/netbox/ipam/migrations/0014_ipaddress_status_add_deprecated.py +++ b/netbox/ipam/migrations/0014_ipaddress_status_add_deprecated.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-01-23 19:10 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/ipam/migrations/0015_global_vlans.py b/netbox/ipam/migrations/0015_global_vlans.py index 18d82cbaf..5471e33e2 100644 --- a/netbox/ipam/migrations/0015_global_vlans.py +++ b/netbox/ipam/migrations/0015_global_vlans.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-02-21 18:45 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/ipam/migrations/0016_unicode_literals.py b/netbox/ipam/migrations/0016_unicode_literals.py index bb29542ad..6807bc555 100644 --- a/netbox/ipam/migrations/0016_unicode_literals.py +++ b/netbox/ipam/migrations/0016_unicode_literals.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11 on 2017-05-24 15:34 -from __future__ import unicode_literals - import django.core.validators from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/ipam/migrations/0017_ipaddress_roles.py b/netbox/ipam/migrations/0017_ipaddress_roles.py index d91c3daa9..11bf37294 100644 --- a/netbox/ipam/migrations/0017_ipaddress_roles.py +++ b/netbox/ipam/migrations/0017_ipaddress_roles.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.1 on 2017-06-16 19:37 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/ipam/migrations/0018_remove_service_uniqueness_constraint.py b/netbox/ipam/migrations/0018_remove_service_uniqueness_constraint.py index 77e083ef3..3d3184354 100644 --- a/netbox/ipam/migrations/0018_remove_service_uniqueness_constraint.py +++ b/netbox/ipam/migrations/0018_remove_service_uniqueness_constraint.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.3 on 2017-08-03 19:37 -from __future__ import unicode_literals - from django.db import migrations diff --git a/netbox/ipam/migrations/0019_virtualization.py b/netbox/ipam/migrations/0019_virtualization.py index 955ff8b4a..f8ffbca11 100644 --- a/netbox/ipam/migrations/0019_virtualization.py +++ b/netbox/ipam/migrations/0019_virtualization.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.4 on 2017-08-31 15:44 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/ipam/migrations/0019_virtualization_squashed_0020_ipaddress_add_role_carp.py b/netbox/ipam/migrations/0019_virtualization_squashed_0020_ipaddress_add_role_carp.py index c8292bbc0..e271685a0 100644 --- a/netbox/ipam/migrations/0019_virtualization_squashed_0020_ipaddress_add_role_carp.py +++ b/netbox/ipam/migrations/0019_virtualization_squashed_0020_ipaddress_add_role_carp.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.14 on 2018-07-31 02:14 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/ipam/migrations/0020_ipaddress_add_role_carp.py b/netbox/ipam/migrations/0020_ipaddress_add_role_carp.py index 9d16be049..e15c12a32 100644 --- a/netbox/ipam/migrations/0020_ipaddress_add_role_carp.py +++ b/netbox/ipam/migrations/0020_ipaddress_add_role_carp.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.4 on 2017-10-09 20:02 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/ipam/migrations/0021_vrf_ordering.py b/netbox/ipam/migrations/0021_vrf_ordering.py index 878c02d8c..7f74115b6 100644 --- a/netbox/ipam/migrations/0021_vrf_ordering.py +++ b/netbox/ipam/migrations/0021_vrf_ordering.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.9 on 2018-02-07 18:37 -from __future__ import unicode_literals - from django.db import migrations diff --git a/netbox/ipam/migrations/0022_tags.py b/netbox/ipam/migrations/0022_tags.py index 14a508317..642bccc05 100644 --- a/netbox/ipam/migrations/0022_tags.py +++ b/netbox/ipam/migrations/0022_tags.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-05-22 19:04 -from __future__ import unicode_literals - from django.db import migrations import taggit.managers diff --git a/netbox/ipam/migrations/0023_change_logging.py b/netbox/ipam/migrations/0023_change_logging.py index d548fdf15..afb732d64 100644 --- a/netbox/ipam/migrations/0023_change_logging.py +++ b/netbox/ipam/migrations/0023_change_logging.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-06-13 17:14 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 1b109f939..4ecda9ccb 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import netaddr from django.conf import settings from django.contrib.contenttypes.fields import GenericRelation @@ -9,7 +7,6 @@ from django.db import models from django.db.models import Q from django.db.models.expressions import RawSQL from django.urls import reverse -from django.utils.encoding import python_2_unicode_compatible from taggit.managers import TaggableManager from dcim.models import Interface @@ -20,7 +17,6 @@ from .fields import IPNetworkField, IPAddressField from .querysets import PrefixQuerySet -@python_2_unicode_compatible class VRF(ChangeLoggedModel, CustomFieldModel): """ A virtual routing and forwarding (VRF) table represents a discrete layer three forwarding domain (e.g. a routing @@ -88,7 +84,6 @@ class VRF(ChangeLoggedModel, CustomFieldModel): return None -@python_2_unicode_compatible class RIR(ChangeLoggedModel): """ A Regional Internet Registry (RIR) is responsible for the allocation of a large portion of the global IP address @@ -128,7 +123,6 @@ class RIR(ChangeLoggedModel): ) -@python_2_unicode_compatible class Aggregate(ChangeLoggedModel, CustomFieldModel): """ An aggregate exists at the root level of the IP address space hierarchy in NetBox. Aggregates are used to organize @@ -223,7 +217,6 @@ class Aggregate(ChangeLoggedModel, CustomFieldModel): return int(float(child_prefixes.size) / self.prefix.size * 100) -@python_2_unicode_compatible class Role(ChangeLoggedModel): """ A Role represents the functional role of a Prefix or VLAN; for example, "Customer," "Infrastructure," or @@ -256,7 +249,6 @@ class Role(ChangeLoggedModel): ) -@python_2_unicode_compatible class Prefix(ChangeLoggedModel, CustomFieldModel): """ A Prefix represents an IPv4 or IPv6 network, including mask length. Prefixes can optionally be assigned to Sites and @@ -496,7 +488,6 @@ class IPAddressManager(models.Manager): return qs.annotate(host=RawSQL('INET(HOST(ipam_ipaddress.address))', [])).order_by('family', 'host') -@python_2_unicode_compatible class IPAddress(ChangeLoggedModel, CustomFieldModel): """ An IPAddress represents an individual IPv4 or IPv6 address and its mask. The mask length should match what is @@ -654,7 +645,6 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel): return ROLE_CHOICE_CLASSES[self.role] -@python_2_unicode_compatible class VLANGroup(ChangeLoggedModel): """ A VLAN group is an arbitrary collection of VLANs within which VLAN IDs and names must be unique. @@ -706,7 +696,6 @@ class VLANGroup(ChangeLoggedModel): return None -@python_2_unicode_compatible class VLAN(ChangeLoggedModel, CustomFieldModel): """ A VLAN is a distinct layer two forwarding domain identified by a 12-bit integer (1-4094). Each VLAN must be assigned @@ -822,7 +811,6 @@ class VLAN(ChangeLoggedModel, CustomFieldModel): ) -@python_2_unicode_compatible class Service(ChangeLoggedModel, CustomFieldModel): """ A Service represents a layer-four service (e.g. HTTP or SSH) running on a Device or VirtualMachine. A Service may diff --git a/netbox/ipam/querysets.py b/netbox/ipam/querysets.py index f606ab1b4..bfb2525f2 100644 --- a/netbox/ipam/querysets.py +++ b/netbox/ipam/querysets.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from utilities.sql import NullsFirstQuerySet diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index 261c047df..73450d1a1 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import django_tables2 as tables from django_tables2.utils import Accessor diff --git a/netbox/ipam/tests/test_api.py b/netbox/ipam/tests/test_api.py index 0ff87d5cf..4ba2b8c00 100644 --- a/netbox/ipam/tests/test_api.py +++ b/netbox/ipam/tests/test_api.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.urls import reverse from netaddr import IPNetwork from rest_framework import status diff --git a/netbox/ipam/tests/test_models.py b/netbox/ipam/tests/test_models.py index 790b665cd..e24fdc349 100644 --- a/netbox/ipam/tests/test_models.py +++ b/netbox/ipam/tests/test_models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import netaddr from django.core.exceptions import ValidationError from django.test import TestCase, override_settings diff --git a/netbox/ipam/urls.py b/netbox/ipam/urls.py index 700d78ae4..238ab7fb5 100644 --- a/netbox/ipam/urls.py +++ b/netbox/ipam/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from extras.views import ObjectChangeLogView diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 91c741789..caa618998 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import netaddr from django.conf import settings from django.contrib.auth.mixins import PermissionRequiredMixin diff --git a/netbox/netbox/api.py b/netbox/netbox/api.py index 28a0d7685..682726ef1 100644 --- a/netbox/netbox/api.py +++ b/netbox/netbox/api.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from rest_framework import authentication, exceptions from rest_framework.pagination import LimitOffsetPagination from rest_framework.permissions import DjangoModelPermissions, SAFE_METHODS diff --git a/netbox/netbox/forms.py b/netbox/netbox/forms.py index 5611f49f9..b87e6ddd5 100644 --- a/netbox/netbox/forms.py +++ b/netbox/netbox/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from utilities.forms import BootstrapMixin diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py index d23e2d64e..e05a192fb 100644 --- a/netbox/netbox/urls.py +++ b/netbox/netbox/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf import settings from django.conf.urls import include, url from django.contrib import admin diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index 1e3433016..f6e59221c 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from collections import OrderedDict from django.db.models import Count diff --git a/netbox/secrets/admin.py b/netbox/secrets/admin.py index ac7a91fd6..9add5892c 100644 --- a/netbox/secrets/admin.py +++ b/netbox/secrets/admin.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib import admin, messages from django.shortcuts import redirect, render diff --git a/netbox/secrets/api/serializers.py b/netbox/secrets/api/serializers.py index ee7217b63..fc1a60b03 100644 --- a/netbox/secrets/api/serializers.py +++ b/netbox/secrets/api/serializers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from rest_framework import serializers from rest_framework.validators import UniqueTogetherValidator from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField diff --git a/netbox/secrets/api/urls.py b/netbox/secrets/api/urls.py index 2a24c445a..cc4afd496 100644 --- a/netbox/secrets/api/urls.py +++ b/netbox/secrets/api/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from rest_framework import routers from . import views diff --git a/netbox/secrets/api/views.py b/netbox/secrets/api/views.py index 9bc52f9f0..6d8a7f7e3 100644 --- a/netbox/secrets/api/views.py +++ b/netbox/secrets/api/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import base64 from Crypto.PublicKey import RSA diff --git a/netbox/secrets/apps.py b/netbox/secrets/apps.py index bc3714966..eec54bd7f 100644 --- a/netbox/secrets/apps.py +++ b/netbox/secrets/apps.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps import AppConfig diff --git a/netbox/secrets/decorators.py b/netbox/secrets/decorators.py index 0b9ebc16e..e2f44ac90 100644 --- a/netbox/secrets/decorators.py +++ b/netbox/secrets/decorators.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib import messages from django.shortcuts import redirect diff --git a/netbox/secrets/exceptions.py b/netbox/secrets/exceptions.py index f014d8a14..11433d41e 100644 --- a/netbox/secrets/exceptions.py +++ b/netbox/secrets/exceptions.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - class InvalidKey(Exception): """ diff --git a/netbox/secrets/filters.py b/netbox/secrets/filters.py index f43a82b22..1a0a28f06 100644 --- a/netbox/secrets/filters.py +++ b/netbox/secrets/filters.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import django_filters from django.db.models import Q diff --git a/netbox/secrets/forms.py b/netbox/secrets/forms.py index 59e637a18..7f8844835 100644 --- a/netbox/secrets/forms.py +++ b/netbox/secrets/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from Crypto.Cipher import PKCS1_OAEP from Crypto.PublicKey import RSA from django import forms diff --git a/netbox/secrets/hashers.py b/netbox/secrets/hashers.py index 49da1605d..fc5066fc6 100644 --- a/netbox/secrets/hashers.py +++ b/netbox/secrets/hashers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.auth.hashers import PBKDF2PasswordHasher diff --git a/netbox/secrets/migrations/0001_initial.py b/netbox/secrets/migrations/0001_initial.py index 8dc0d54c6..1281a266a 100644 --- a/netbox/secrets/migrations/0001_initial.py +++ b/netbox/secrets/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-06-22 18:21 -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/secrets/migrations/0001_initial_squashed_0003_unicode_literals.py b/netbox/secrets/migrations/0001_initial_squashed_0003_unicode_literals.py index fb7d37431..04db89e7c 100644 --- a/netbox/secrets/migrations/0001_initial_squashed_0003_unicode_literals.py +++ b/netbox/secrets/migrations/0001_initial_squashed_0003_unicode_literals.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.14 on 2018-08-01 17:45 -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/secrets/migrations/0002_userkey_add_session_key.py b/netbox/secrets/migrations/0002_userkey_add_session_key.py index 4cd885cfb..03abfb70e 100644 --- a/netbox/secrets/migrations/0002_userkey_add_session_key.py +++ b/netbox/secrets/migrations/0002_userkey_add_session_key.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11 on 2017-04-27 15:26 -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/secrets/migrations/0003_unicode_literals.py b/netbox/secrets/migrations/0003_unicode_literals.py index b8b7956d8..48be221c5 100644 --- a/netbox/secrets/migrations/0003_unicode_literals.py +++ b/netbox/secrets/migrations/0003_unicode_literals.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11 on 2017-05-24 15:34 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/secrets/migrations/0004_tags.py b/netbox/secrets/migrations/0004_tags.py index ac952dc92..bdba79804 100644 --- a/netbox/secrets/migrations/0004_tags.py +++ b/netbox/secrets/migrations/0004_tags.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-05-22 19:04 -from __future__ import unicode_literals - from django.db import migrations import taggit.managers diff --git a/netbox/secrets/migrations/0005_change_logging.py b/netbox/secrets/migrations/0005_change_logging.py index 947087934..d920e6fb2 100644 --- a/netbox/secrets/migrations/0005_change_logging.py +++ b/netbox/secrets/migrations/0005_change_logging.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-06-13 17:29 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/secrets/models.py b/netbox/secrets/models.py index 8bbf3d14d..dcdfcac73 100644 --- a/netbox/secrets/models.py +++ b/netbox/secrets/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os from Crypto.Cipher import AES, PKCS1_OAEP @@ -12,7 +10,7 @@ from django.contrib.contenttypes.fields import GenericRelation from django.core.exceptions import ValidationError from django.db import models from django.urls import reverse -from django.utils.encoding import force_bytes, python_2_unicode_compatible +from django.utils.encoding import force_bytes from taggit.managers import TaggableManager from extras.models import CustomFieldModel @@ -49,7 +47,6 @@ def decrypt_master_key(master_key_cipher, private_key): return cipher.decrypt(master_key_cipher) -@python_2_unicode_compatible class UserKey(models.Model): """ A UserKey stores a user's personal RSA (public) encryption key, which is used to generate their unique encrypted @@ -187,7 +184,6 @@ class UserKey(models.Model): self.save() -@python_2_unicode_compatible class SessionKey(models.Model): """ A SessionKey stores a User's temporary key to be used for the encryption and decryption of secrets. @@ -258,7 +254,6 @@ class SessionKey(models.Model): return session_key -@python_2_unicode_compatible class SecretRole(ChangeLoggedModel): """ A SecretRole represents an arbitrary functional classification of Secrets. For example, a user might define roles @@ -311,7 +306,6 @@ class SecretRole(ChangeLoggedModel): return user in self.users.all() or user.groups.filter(pk__in=self.groups.all()).exists() -@python_2_unicode_compatible class Secret(ChangeLoggedModel, CustomFieldModel): """ A Secret stores an AES256-encrypted copy of sensitive data, such as passwords or secret keys. An irreversible diff --git a/netbox/secrets/querysets.py b/netbox/secrets/querysets.py index c5595e1d3..c9732c5fe 100644 --- a/netbox/secrets/querysets.py +++ b/netbox/secrets/querysets.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models import QuerySet diff --git a/netbox/secrets/tables.py b/netbox/secrets/tables.py index 4cfb1a6ea..39d260a6d 100644 --- a/netbox/secrets/tables.py +++ b/netbox/secrets/tables.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import django_tables2 as tables from utilities.tables import BaseTable, ToggleColumn diff --git a/netbox/secrets/templatetags/secret_helpers.py b/netbox/secrets/templatetags/secret_helpers.py index 0e1ff554c..142c0d2cb 100644 --- a/netbox/secrets/templatetags/secret_helpers.py +++ b/netbox/secrets/templatetags/secret_helpers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import template diff --git a/netbox/secrets/tests/test_api.py b/netbox/secrets/tests/test_api.py index 985e0ea7f..fa8c241e7 100644 --- a/netbox/secrets/tests/test_api.py +++ b/netbox/secrets/tests/test_api.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import base64 from django.urls import reverse diff --git a/netbox/secrets/tests/test_models.py b/netbox/secrets/tests/test_models.py index 887c048bf..0e5ad55ca 100644 --- a/netbox/secrets/tests/test_models.py +++ b/netbox/secrets/tests/test_models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from Crypto.PublicKey import RSA from django.conf import settings from django.contrib.auth.models import User diff --git a/netbox/secrets/urls.py b/netbox/secrets/urls.py index 952725b54..e1ce2b8f2 100644 --- a/netbox/secrets/urls.py +++ b/netbox/secrets/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from extras.views import ObjectChangeLogView diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py index d15c9cbc2..428c3a905 100644 --- a/netbox/secrets/views.py +++ b/netbox/secrets/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import base64 from django.contrib import messages diff --git a/netbox/tenancy/api/serializers.py b/netbox/tenancy/api/serializers.py index 592e35a6e..08492c55d 100644 --- a/netbox/tenancy/api/serializers.py +++ b/netbox/tenancy/api/serializers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from rest_framework import serializers from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField diff --git a/netbox/tenancy/api/urls.py b/netbox/tenancy/api/urls.py index a36a1ec3d..a501b4302 100644 --- a/netbox/tenancy/api/urls.py +++ b/netbox/tenancy/api/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from rest_framework import routers from . import views diff --git a/netbox/tenancy/api/views.py b/netbox/tenancy/api/views.py index 1ebd95500..febf86a52 100644 --- a/netbox/tenancy/api/views.py +++ b/netbox/tenancy/api/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from extras.api.views import CustomFieldModelViewSet from tenancy import filters from tenancy.models import Tenant, TenantGroup diff --git a/netbox/tenancy/apps.py b/netbox/tenancy/apps.py index df2cd2fbb..53cb9a056 100644 --- a/netbox/tenancy/apps.py +++ b/netbox/tenancy/apps.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps import AppConfig diff --git a/netbox/tenancy/filters.py b/netbox/tenancy/filters.py index 7eccff5d3..4b92cd6f5 100644 --- a/netbox/tenancy/filters.py +++ b/netbox/tenancy/filters.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import django_filters from django.db.models import Q diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py index b90934923..1cc13483f 100644 --- a/netbox/tenancy/forms.py +++ b/netbox/tenancy/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.db.models import Count from taggit.forms import TagField diff --git a/netbox/tenancy/migrations/0001_initial.py b/netbox/tenancy/migrations/0001_initial.py index ed2f800ef..fcad19413 100644 --- a/netbox/tenancy/migrations/0001_initial.py +++ b/netbox/tenancy/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2016-07-26 21:58 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/tenancy/migrations/0002_tenant_group_optional.py b/netbox/tenancy/migrations/0002_tenant_group_optional.py index 95b1138ac..3d91b76ec 100644 --- a/netbox/tenancy/migrations/0002_tenant_group_optional.py +++ b/netbox/tenancy/migrations/0002_tenant_group_optional.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2016-08-02 19:54 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/tenancy/migrations/0002_tenant_group_optional_squashed_0003_unicode_literals.py b/netbox/tenancy/migrations/0002_tenant_group_optional_squashed_0003_unicode_literals.py index d4258f4dc..77dc55975 100644 --- a/netbox/tenancy/migrations/0002_tenant_group_optional_squashed_0003_unicode_literals.py +++ b/netbox/tenancy/migrations/0002_tenant_group_optional_squashed_0003_unicode_literals.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.14 on 2018-07-31 02:12 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/tenancy/migrations/0003_unicode_literals.py b/netbox/tenancy/migrations/0003_unicode_literals.py index ed547c510..24cc7f969 100644 --- a/netbox/tenancy/migrations/0003_unicode_literals.py +++ b/netbox/tenancy/migrations/0003_unicode_literals.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11 on 2017-05-24 15:34 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/tenancy/migrations/0004_tags.py b/netbox/tenancy/migrations/0004_tags.py index 5cb9398b5..dbea49cd0 100644 --- a/netbox/tenancy/migrations/0004_tags.py +++ b/netbox/tenancy/migrations/0004_tags.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-05-22 19:04 -from __future__ import unicode_literals - from django.db import migrations import taggit.managers diff --git a/netbox/tenancy/migrations/0005_change_logging.py b/netbox/tenancy/migrations/0005_change_logging.py index 7712e9d02..eb0979366 100644 --- a/netbox/tenancy/migrations/0005_change_logging.py +++ b/netbox/tenancy/migrations/0005_change_logging.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-06-13 17:14 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/tenancy/models.py b/netbox/tenancy/models.py index 5a22143d3..045679b90 100644 --- a/netbox/tenancy/models.py +++ b/netbox/tenancy/models.py @@ -1,16 +1,12 @@ -from __future__ import unicode_literals - from django.contrib.contenttypes.fields import GenericRelation from django.db import models from django.urls import reverse -from django.utils.encoding import python_2_unicode_compatible from taggit.managers import TaggableManager from extras.models import CustomFieldModel from utilities.models import ChangeLoggedModel -@python_2_unicode_compatible class TenantGroup(ChangeLoggedModel): """ An arbitrary collection of Tenants. @@ -41,7 +37,6 @@ class TenantGroup(ChangeLoggedModel): ) -@python_2_unicode_compatible class Tenant(ChangeLoggedModel, CustomFieldModel): """ A Tenant represents an organization served by the NetBox owner. This is typically a customer or an internal diff --git a/netbox/tenancy/tables.py b/netbox/tenancy/tables.py index 2e763591a..91122df7a 100644 --- a/netbox/tenancy/tables.py +++ b/netbox/tenancy/tables.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import django_tables2 as tables from utilities.tables import BaseTable, ToggleColumn diff --git a/netbox/tenancy/tests/test_api.py b/netbox/tenancy/tests/test_api.py index 95e1a6de3..b44b153ee 100644 --- a/netbox/tenancy/tests/test_api.py +++ b/netbox/tenancy/tests/test_api.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.urls import reverse from rest_framework import status diff --git a/netbox/tenancy/urls.py b/netbox/tenancy/urls.py index 2da03b7f5..19522e6c7 100644 --- a/netbox/tenancy/urls.py +++ b/netbox/tenancy/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from extras.views import ObjectChangeLogView diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py index fdb453665..ed17695b2 100644 --- a/netbox/tenancy/views.py +++ b/netbox/tenancy/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.auth.mixins import PermissionRequiredMixin from django.db.models import Count, Q from django.shortcuts import get_object_or_404, render diff --git a/netbox/users/admin.py b/netbox/users/admin.py index ccf640edd..adfa151d5 100644 --- a/netbox/users/admin.py +++ b/netbox/users/admin.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.contrib import admin diff --git a/netbox/users/api/serializers.py b/netbox/users/api/serializers.py index 861bdade9..d97ba7ed1 100644 --- a/netbox/users/api/serializers.py +++ b/netbox/users/api/serializers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.auth.models import User from utilities.api import WritableNestedSerializer diff --git a/netbox/users/forms.py b/netbox/users/forms.py index d25e128e6..e4b39fa92 100644 --- a/netbox/users/forms.py +++ b/netbox/users/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.contrib.auth.forms import AuthenticationForm, PasswordChangeForm as DjangoPasswordChangeForm diff --git a/netbox/users/migrations/0001_api_tokens.py b/netbox/users/migrations/0001_api_tokens.py index d766b2ef0..3e2ea274e 100644 --- a/netbox/users/migrations/0001_api_tokens.py +++ b/netbox/users/migrations/0001_api_tokens.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.6 on 2017-03-08 15:32 -from __future__ import unicode_literals - from django.conf import settings import django.core.validators from django.db import migrations, models diff --git a/netbox/users/migrations/0001_api_tokens_squashed_0002_unicode_literals.py b/netbox/users/migrations/0001_api_tokens_squashed_0002_unicode_literals.py index 54a6078a0..1c82a092d 100644 --- a/netbox/users/migrations/0001_api_tokens_squashed_0002_unicode_literals.py +++ b/netbox/users/migrations/0001_api_tokens_squashed_0002_unicode_literals.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.14 on 2018-08-01 17:43 -from __future__ import unicode_literals - from django.conf import settings import django.core.validators from django.db import migrations, models diff --git a/netbox/users/migrations/0002_unicode_literals.py b/netbox/users/migrations/0002_unicode_literals.py index 8a7f96bbd..d0cf75fd8 100644 --- a/netbox/users/migrations/0002_unicode_literals.py +++ b/netbox/users/migrations/0002_unicode_literals.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11 on 2017-05-24 15:34 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/users/models.py b/netbox/users/models.py index b3698d925..dc16e12a2 100644 --- a/netbox/users/models.py +++ b/netbox/users/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import binascii import os @@ -7,10 +5,8 @@ from django.contrib.auth.models import User from django.core.validators import MinLengthValidator from django.db import models from django.utils import timezone -from django.utils.encoding import python_2_unicode_compatible -@python_2_unicode_compatible class Token(models.Model): """ An API token used for user authentication. This extends the stock model to allow each user to have multiple tokens. diff --git a/netbox/users/urls.py b/netbox/users/urls.py index aad89e104..d288866ec 100644 --- a/netbox/users/urls.py +++ b/netbox/users/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from . import views diff --git a/netbox/users/views.py b/netbox/users/views.py index c87fa5c7a..de78ad1fd 100644 --- a/netbox/users/views.py +++ b/netbox/users/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib import messages from django.contrib.auth import login as auth_login, logout as auth_logout, update_session_auth_hash from django.contrib.auth.decorators import login_required diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py index f7d4293a7..7854bd8ae 100644 --- a/netbox/utilities/api.py +++ b/netbox/utilities/api.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from collections import OrderedDict import pytz diff --git a/netbox/utilities/context_processors.py b/netbox/utilities/context_processors.py index dab35e982..06c5c8784 100644 --- a/netbox/utilities/context_processors.py +++ b/netbox/utilities/context_processors.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf import settings as django_settings diff --git a/netbox/utilities/error_handlers.py b/netbox/utilities/error_handlers.py index 3b7eb7a5b..da8510950 100644 --- a/netbox/utilities/error_handlers.py +++ b/netbox/utilities/error_handlers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib import messages from django.utils.html import escape from django.utils.safestring import mark_safe diff --git a/netbox/utilities/fields.py b/netbox/utilities/fields.py index 34f59fe16..dfbe00ef3 100644 --- a/netbox/utilities/fields.py +++ b/netbox/utilities/fields.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.validators import RegexValidator from django.db import models diff --git a/netbox/utilities/filters.py b/netbox/utilities/filters.py index 90cdcd9fc..1fb048db4 100644 --- a/netbox/utilities/filters.py +++ b/netbox/utilities/filters.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import itertools import django_filters diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index 1e6e3c0c4..09b313ab6 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import csv from io import StringIO import re diff --git a/netbox/utilities/managers.py b/netbox/utilities/managers.py index b112f4fae..da4117594 100644 --- a/netbox/utilities/managers.py +++ b/netbox/utilities/managers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models import Manager diff --git a/netbox/utilities/middleware.py b/netbox/utilities/middleware.py index 207968690..f2d17ee3e 100644 --- a/netbox/utilities/middleware.py +++ b/netbox/utilities/middleware.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import sys from django.conf import settings diff --git a/netbox/utilities/models.py b/netbox/utilities/models.py index 4b04c03e1..3008fc39a 100644 --- a/netbox/utilities/models.py +++ b/netbox/utilities/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from extras.models import ObjectChange diff --git a/netbox/utilities/paginator.py b/netbox/utilities/paginator.py index 9ebbbab57..ae915f773 100644 --- a/netbox/utilities/paginator.py +++ b/netbox/utilities/paginator.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf import settings from django.core.paginator import Paginator, Page diff --git a/netbox/utilities/sql.py b/netbox/utilities/sql.py index ac2c70624..617586ab8 100644 --- a/netbox/utilities/sql.py +++ b/netbox/utilities/sql.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import connections, models from django.db.models.sql.compiler import SQLCompiler diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py index e531b5e32..cc67bbeb4 100644 --- a/netbox/utilities/tables.py +++ b/netbox/utilities/tables.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import django_tables2 as tables from django.utils.safestring import mark_safe diff --git a/netbox/utilities/templatetags/buttons.py b/netbox/utilities/templatetags/buttons.py index 3090f4538..b9a8bf6ec 100644 --- a/netbox/utilities/templatetags/buttons.py +++ b/netbox/utilities/templatetags/buttons.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import template from extras.models import ExportTemplate diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py index 39959a668..555cbe03f 100644 --- a/netbox/utilities/templatetags/helpers.py +++ b/netbox/utilities/templatetags/helpers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import json diff --git a/netbox/utilities/testing.py b/netbox/utilities/testing.py index dcc564dfa..86fa8c836 100644 --- a/netbox/utilities/testing.py +++ b/netbox/utilities/testing.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.auth.models import User from rest_framework.test import APITestCase as _APITestCase diff --git a/netbox/utilities/tests/test_managers.py b/netbox/utilities/tests/test_managers.py index 0bafaefde..7ff23b69d 100644 --- a/netbox/utilities/tests/test_managers.py +++ b/netbox/utilities/tests/test_managers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import TestCase from dcim.models import Site diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py index 14c29d211..be756275e 100644 --- a/netbox/utilities/utils.py +++ b/netbox/utilities/utils.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import json import six diff --git a/netbox/utilities/validators.py b/netbox/utilities/validators.py index 102e368a5..cfa733208 100644 --- a/netbox/utilities/validators.py +++ b/netbox/utilities/validators.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import re from django.core.validators import _lazy_re_compile, URLValidator diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index e11d681ef..10e54717c 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from collections import OrderedDict from copy import deepcopy import sys diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py index f4e0d5e5c..4114c7260 100644 --- a/netbox/virtualization/api/serializers.py +++ b/netbox/virtualization/api/serializers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from rest_framework import serializers from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField diff --git a/netbox/virtualization/api/urls.py b/netbox/virtualization/api/urls.py index 45db6aa6a..335ac7d0e 100644 --- a/netbox/virtualization/api/urls.py +++ b/netbox/virtualization/api/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from rest_framework import routers from . import views diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py index 01b8792c8..a4d10d7e3 100644 --- a/netbox/virtualization/api/views.py +++ b/netbox/virtualization/api/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dcim.models import Interface from extras.api.views import CustomFieldModelViewSet from utilities.api import FieldChoicesViewSet, ModelViewSet diff --git a/netbox/virtualization/apps.py b/netbox/virtualization/apps.py index 768508cfb..35d6e8266 100644 --- a/netbox/virtualization/apps.py +++ b/netbox/virtualization/apps.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps import AppConfig diff --git a/netbox/virtualization/constants.py b/netbox/virtualization/constants.py index 307921e0e..37e9efea2 100644 --- a/netbox/virtualization/constants.py +++ b/netbox/virtualization/constants.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dcim.constants import DEVICE_STATUS_ACTIVE, DEVICE_STATUS_OFFLINE, DEVICE_STATUS_STAGED # VirtualMachine statuses (replicated from Device statuses) diff --git a/netbox/virtualization/filters.py b/netbox/virtualization/filters.py index 6af4e4a22..268094be7 100644 --- a/netbox/virtualization/filters.py +++ b/netbox/virtualization/filters.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import django_filters from django.db.models import Q from netaddr import EUI diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py index 10833234b..6e87be547 100644 --- a/netbox/virtualization/forms.py +++ b/netbox/virtualization/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.core.exceptions import ValidationError from django.db.models import Count diff --git a/netbox/virtualization/migrations/0001_virtualization.py b/netbox/virtualization/migrations/0001_virtualization.py index a5c7535cf..f34bee36c 100644 --- a/netbox/virtualization/migrations/0001_virtualization.py +++ b/netbox/virtualization/migrations/0001_virtualization.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.4 on 2017-08-31 14:15 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/virtualization/migrations/0002_virtualmachine_add_status.py b/netbox/virtualization/migrations/0002_virtualmachine_add_status.py index 5b03b6e33..f9f5c72bd 100644 --- a/netbox/virtualization/migrations/0002_virtualmachine_add_status.py +++ b/netbox/virtualization/migrations/0002_virtualmachine_add_status.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.4 on 2017-09-14 17:49 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/virtualization/migrations/0002_virtualmachine_add_status_squashed_0004_virtualmachine_add_role.py b/netbox/virtualization/migrations/0002_virtualmachine_add_status_squashed_0004_virtualmachine_add_role.py index 295ec7d17..6ee06f912 100644 --- a/netbox/virtualization/migrations/0002_virtualmachine_add_status_squashed_0004_virtualmachine_add_role.py +++ b/netbox/virtualization/migrations/0002_virtualmachine_add_status_squashed_0004_virtualmachine_add_role.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.14 on 2018-07-31 02:23 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/virtualization/migrations/0003_cluster_add_site.py b/netbox/virtualization/migrations/0003_cluster_add_site.py index 5ac3c578b..bdcce88bc 100644 --- a/netbox/virtualization/migrations/0003_cluster_add_site.py +++ b/netbox/virtualization/migrations/0003_cluster_add_site.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.4 on 2017-09-22 16:30 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/virtualization/migrations/0004_virtualmachine_add_role.py b/netbox/virtualization/migrations/0004_virtualmachine_add_role.py index 10dec60fa..db416fc5d 100644 --- a/netbox/virtualization/migrations/0004_virtualmachine_add_role.py +++ b/netbox/virtualization/migrations/0004_virtualmachine_add_role.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.4 on 2017-09-29 14:32 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/netbox/virtualization/migrations/0006_tags.py b/netbox/virtualization/migrations/0006_tags.py index eed800852..5152086de 100644 --- a/netbox/virtualization/migrations/0006_tags.py +++ b/netbox/virtualization/migrations/0006_tags.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-05-22 19:04 -from __future__ import unicode_literals - from django.db import migrations import taggit.managers diff --git a/netbox/virtualization/migrations/0007_change_logging.py b/netbox/virtualization/migrations/0007_change_logging.py index 954f9f2a9..4c2d342e5 100644 --- a/netbox/virtualization/migrations/0007_change_logging.py +++ b/netbox/virtualization/migrations/0007_change_logging.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-06-13 17:14 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py index 119c9ee4f..ff9f39ee9 100644 --- a/netbox/virtualization/models.py +++ b/netbox/virtualization/models.py @@ -1,11 +1,8 @@ -from __future__ import unicode_literals - from django.conf import settings from django.contrib.contenttypes.fields import GenericRelation from django.core.exceptions import ValidationError from django.db import models from django.urls import reverse -from django.utils.encoding import python_2_unicode_compatible from taggit.managers import TaggableManager from dcim.models import Device @@ -18,7 +15,6 @@ from .constants import DEVICE_STATUS_ACTIVE, VM_STATUS_CHOICES, VM_STATUS_CLASSE # Cluster types # -@python_2_unicode_compatible class ClusterType(ChangeLoggedModel): """ A type of Cluster. @@ -53,7 +49,6 @@ class ClusterType(ChangeLoggedModel): # Cluster groups # -@python_2_unicode_compatible class ClusterGroup(ChangeLoggedModel): """ An organizational group of Clusters. @@ -88,7 +83,6 @@ class ClusterGroup(ChangeLoggedModel): # Clusters # -@python_2_unicode_compatible class Cluster(ChangeLoggedModel, CustomFieldModel): """ A cluster of VirtualMachines. Each Cluster may optionally be associated with one or more Devices. @@ -164,7 +158,6 @@ class Cluster(ChangeLoggedModel, CustomFieldModel): # Virtual machines # -@python_2_unicode_compatible class VirtualMachine(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): """ A virtual machine which runs inside a Cluster. diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py index 84579af49..b825ba59f 100644 --- a/netbox/virtualization/tables.py +++ b/netbox/virtualization/tables.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import django_tables2 as tables from django_tables2.utils import Accessor diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py index c3eebf5ed..19845e508 100644 --- a/netbox/virtualization/tests/test_api.py +++ b/netbox/virtualization/tests/test_api.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.urls import reverse from netaddr import IPNetwork from rest_framework import status diff --git a/netbox/virtualization/urls.py b/netbox/virtualization/urls.py index b03b3bc0a..5fc5997a8 100644 --- a/netbox/virtualization/urls.py +++ b/netbox/virtualization/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from extras.views import ObjectChangeLogView diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 4ddacce40..7ded5e4a3 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib import messages from django.contrib.auth.mixins import PermissionRequiredMixin from django.db.models import Count From 5f66710fcda919ae232e39da5a6ca21d62283f83 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 14 Aug 2018 12:13:43 -0400 Subject: [PATCH 003/191] Closes #2292: Remove the deprecated UserAction model --- netbox/extras/admin.py | 20 +--- netbox/extras/api/serializers.py | 15 +-- netbox/extras/api/urls.py | 3 - netbox/extras/api/views.py | 14 --- netbox/extras/filters.py | 15 +-- .../migrations/0015_remove_useraction.py | 24 +++++ netbox/extras/models.py | 98 ------------------- netbox/templates/users/_user.html | 3 - netbox/templates/users/recent_activity.html | 22 ----- netbox/users/urls.py | 1 - netbox/users/views.py | 12 --- 11 files changed, 27 insertions(+), 200 deletions(-) create mode 100644 netbox/extras/migrations/0015_remove_useraction.py delete mode 100644 netbox/templates/users/recent_activity.html diff --git a/netbox/extras/admin.py b/netbox/extras/admin.py index 9320e7081..9f3678ab0 100644 --- a/netbox/extras/admin.py +++ b/netbox/extras/admin.py @@ -1,13 +1,8 @@ from django import forms from django.contrib import admin -from django.utils.safestring import mark_safe from utilities.forms import LaxURLField -from .constants import OBJECTCHANGE_ACTION_CREATE, OBJECTCHANGE_ACTION_DELETE, OBJECTCHANGE_ACTION_UPDATE -from .models import ( - ConfigContext, CustomField, CustomFieldChoice, Graph, ExportTemplate, ObjectChange, TopologyMap, UserAction, - Webhook, -) +from .models import CustomField, CustomFieldChoice, Graph, ExportTemplate, TopologyMap, Webhook def order_content_types(field): @@ -123,16 +118,3 @@ class TopologyMapAdmin(admin.ModelAdmin): prepopulated_fields = { 'slug': ['name'], } - - -# -# User actions -# - -@admin.register(UserAction) -class UserActionAdmin(admin.ModelAdmin): - actions = None - list_display = ['user', 'action', 'content_type', 'object_id', '_message'] - - def _message(self, obj): - return mark_safe(obj.message) diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py index 0c5e79d80..ba438fd15 100644 --- a/netbox/extras/api/serializers.py +++ b/netbox/extras/api/serializers.py @@ -8,7 +8,7 @@ from dcim.api.serializers import ( ) from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site from extras.models import ( - ConfigContext, ExportTemplate, Graph, ImageAttachment, ObjectChange, ReportResult, TopologyMap, UserAction, + ConfigContext, ExportTemplate, Graph, ImageAttachment, ObjectChange, ReportResult, TopologyMap, ) from extras.constants import * from tenancy.api.serializers import NestedTenantSerializer, NestedTenantGroupSerializer @@ -238,16 +238,3 @@ class ObjectChangeSerializer(serializers.ModelSerializer): context = {'request': self.context['request']} data = serializer(obj.changed_object, context=context).data return data - - -# -# User actions -# - -class UserActionSerializer(serializers.ModelSerializer): - user = NestedUserSerializer() - action = ChoiceField(choices=ACTION_CHOICES) - - class Meta: - model = UserAction - fields = ['id', 'time', 'user', 'action', 'message'] diff --git a/netbox/extras/api/urls.py b/netbox/extras/api/urls.py index c18ccf657..7a82cd359 100644 --- a/netbox/extras/api/urls.py +++ b/netbox/extras/api/urls.py @@ -41,8 +41,5 @@ router.register(r'reports', views.ReportViewSet, base_name='report') # Change logging router.register(r'object-changes', views.ObjectChangeViewSet) -# Recent activity -router.register(r'recent-activity', views.RecentActivityViewSet) - app_name = 'extras-api' urlpatterns = router.urls diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py index 32ac0baec..1a91d069b 100644 --- a/netbox/extras/api/views.py +++ b/netbox/extras/api/views.py @@ -11,7 +11,6 @@ from taggit.models import Tag from extras import filters from extras.models import ( ConfigContext, CustomField, ExportTemplate, Graph, ImageAttachment, ObjectChange, ReportResult, TopologyMap, - UserAction, ) from extras.reports import get_report, get_reports from utilities.api import FieldChoicesViewSet, IsAuthenticatedOrLoginNotRequired, ModelViewSet @@ -230,16 +229,3 @@ class ObjectChangeViewSet(ReadOnlyModelViewSet): queryset = ObjectChange.objects.select_related('user') serializer_class = serializers.ObjectChangeSerializer filter_class = filters.ObjectChangeFilter - - -# -# User activity -# - -class RecentActivityViewSet(ReadOnlyModelViewSet): - """ - DEPRECATED: List all UserActions to provide a log of recent activity. - """ - queryset = UserAction.objects.all() - serializer_class = serializers.UserActionSerializer - filter_class = filters.UserActionFilter diff --git a/netbox/extras/filters.py b/netbox/extras/filters.py index 4239d1639..b73eb8981 100644 --- a/netbox/extras/filters.py +++ b/netbox/extras/filters.py @@ -1,5 +1,4 @@ import django_filters -from django.contrib.auth.models import User from django.contrib.contenttypes.models import ContentType from django.db.models import Q from taggit.models import Tag @@ -7,7 +6,7 @@ from taggit.models import Tag from dcim.models import DeviceRole, Platform, Region, Site from tenancy.models import Tenant, TenantGroup from .constants import CF_FILTER_DISABLED, CF_FILTER_EXACT, CF_TYPE_BOOLEAN, CF_TYPE_SELECT -from .models import ConfigContext, CustomField, Graph, ExportTemplate, ObjectChange, TopologyMap, UserAction +from .models import ConfigContext, CustomField, Graph, ExportTemplate, ObjectChange, TopologyMap class CustomFieldFilter(django_filters.Filter): @@ -227,15 +226,3 @@ class ObjectChangeFilter(django_filters.FilterSet): Q(user_name__icontains=value) | Q(object_repr__icontains=value) ) - - -class UserActionFilter(django_filters.FilterSet): - username = django_filters.ModelMultipleChoiceFilter( - name='user__username', - queryset=User.objects.all(), - to_field_name='username', - ) - - class Meta: - model = UserAction - fields = ['user'] diff --git a/netbox/extras/migrations/0015_remove_useraction.py b/netbox/extras/migrations/0015_remove_useraction.py new file mode 100644 index 000000000..eb750bc36 --- /dev/null +++ b/netbox/extras/migrations/0015_remove_useraction.py @@ -0,0 +1,24 @@ +# Generated by Django 2.0.8 on 2018-08-14 16:10 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0014_configcontexts'), + ] + + operations = [ + migrations.RemoveField( + model_name='useraction', + name='content_type', + ), + migrations.RemoveField( + model_name='useraction', + name='user', + ), + migrations.DeleteModel( + name='UserAction', + ), + ] diff --git a/netbox/extras/models.py b/netbox/extras/models.py index f2000cdd2..fbe39a99e 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -12,7 +12,6 @@ from django.db.models import Q from django.http import HttpResponse from django.template import Template, Context from django.urls import reverse -from django.utils.safestring import mark_safe from dcim.constants import CONNECTION_STATUS_CONNECTED from utilities.utils import foreground_color @@ -842,100 +841,3 @@ class ObjectChange(models.Model): self.object_repr, self.object_data, ) - - -# -# User actions -# - -class UserActionManager(models.Manager): - - # Actions affecting a single object - def log_action(self, user, obj, action, message): - self.model.objects.create( - content_type=ContentType.objects.get_for_model(obj), - object_id=obj.pk, - user=user, - action=action, - message=message, - ) - - def log_create(self, user, obj, message=''): - self.log_action(user, obj, ACTION_CREATE, message) - - def log_edit(self, user, obj, message=''): - self.log_action(user, obj, ACTION_EDIT, message) - - def log_delete(self, user, obj, message=''): - self.log_action(user, obj, ACTION_DELETE, message) - - # Actions affecting multiple objects - def log_bulk_action(self, user, content_type, action, message): - self.model.objects.create( - content_type=content_type, - user=user, - action=action, - message=message, - ) - - def log_import(self, user, content_type, message=''): - self.log_bulk_action(user, content_type, ACTION_IMPORT, message) - - def log_bulk_create(self, user, content_type, message=''): - self.log_bulk_action(user, content_type, ACTION_BULK_CREATE, message) - - def log_bulk_edit(self, user, content_type, message=''): - self.log_bulk_action(user, content_type, ACTION_BULK_EDIT, message) - - def log_bulk_delete(self, user, content_type, message=''): - self.log_bulk_action(user, content_type, ACTION_BULK_DELETE, message) - - -# TODO: Remove UserAction, which has been replaced by ObjectChange. -class UserAction(models.Model): - """ - DEPRECATED: A record of an action (add, edit, or delete) performed on an object by a User. - """ - time = models.DateTimeField( - auto_now_add=True, - editable=False - ) - user = models.ForeignKey( - to=User, - on_delete=models.CASCADE, - related_name='actions' - ) - content_type = models.ForeignKey( - to=ContentType, - on_delete=models.CASCADE - ) - object_id = models.PositiveIntegerField( - blank=True, - null=True - ) - action = models.PositiveSmallIntegerField( - choices=ACTION_CHOICES - ) - message = models.TextField( - blank=True - ) - - objects = UserActionManager() - - class Meta: - ordering = ['-time'] - - def __str__(self): - if self.message: - return '{} {}'.format(self.user, self.message) - return '{} {} {}'.format(self.user, self.get_action_display(), self.content_type) - - def icon(self): - if self.action in [ACTION_CREATE, ACTION_BULK_CREATE, ACTION_IMPORT]: - return mark_safe('') - elif self.action in [ACTION_EDIT, ACTION_BULK_EDIT]: - return mark_safe('') - elif self.action in [ACTION_DELETE, ACTION_BULK_DELETE]: - return mark_safe('') - else: - return '' diff --git a/netbox/templates/users/_user.html b/netbox/templates/users/_user.html index 1a4b5c6c5..9f71b9633 100644 --- a/netbox/templates/users/_user.html +++ b/netbox/templates/users/_user.html @@ -21,9 +21,6 @@ User Key - - Recent Activity -
diff --git a/netbox/templates/users/recent_activity.html b/netbox/templates/users/recent_activity.html deleted file mode 100644 index 92933d78b..000000000 --- a/netbox/templates/users/recent_activity.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends 'users/_user.html' %} - -{% block title %}Recent Activity{% endblock %} - -{% block usercontent %} - - - - - - - - - {% for action in recent_activity %} - - - - - {% endfor %} - -
TimeAction
{{ action.time|date:'SHORT_DATETIME_FORMAT' }}{{ action.icon }} {{ action.message|safe }}
-{% endblock %} diff --git a/netbox/users/urls.py b/netbox/users/urls.py index d288866ec..a45f859e7 100644 --- a/netbox/users/urls.py +++ b/netbox/users/urls.py @@ -14,6 +14,5 @@ urlpatterns = [ url(r'^user-key/$', views.UserKeyView.as_view(), name='userkey'), url(r'^user-key/edit/$', views.UserKeyEditView.as_view(), name='userkey_edit'), url(r'^session-key/delete/$', views.SessionKeyDeleteView.as_view(), name='sessionkey_delete'), - url(r'^recent-activity/$', views.RecentActivityView.as_view(), name='recent_activity'), ] diff --git a/netbox/users/views.py b/netbox/users/views.py index de78ad1fd..45a162d7b 100644 --- a/netbox/users/views.py +++ b/netbox/users/views.py @@ -196,18 +196,6 @@ class SessionKeyDeleteView(LoginRequiredMixin, View): }) -@method_decorator(login_required, name='dispatch') -class RecentActivityView(View): - template_name = 'users/recent_activity.html' - - def get(self, request): - - return render(request, self.template_name, { - 'recent_activity': request.user.actions.all()[:50], - 'active_tab': 'recent_activity', - }) - - # # API tokens # From 6dd62dc891bf8173b8a8aba598410436db6f2685 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 14 Aug 2018 14:06:16 -0400 Subject: [PATCH 004/191] Refactored log_change() methods for device components --- netbox/dcim/models.py | 85 +++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 55 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 0c74600bb..8fdc5e998 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -27,25 +27,40 @@ from .fields import ASNField, MACAddressField from .querysets import InterfaceQuerySet -class ComponentModel(models.Model): +class ComponentTemplateModel(models.Model): class Meta: abstract = True - def get_component_parent(self): - raise NotImplementedError( - "ComponentModel must implement get_component_parent()" - ) - def log_change(self, user, request_id, action): """ - Log an ObjectChange including the parent Device/VM. + Log an ObjectChange including the parent DeviceType. """ ObjectChange( user=user, request_id=request_id, changed_object=self, - related_object=self.get_component_parent(), + related_object=self.device_type, + action=action, + object_data=serialize_object(self) + ).save() + + +class ComponentModel(models.Model): + + class Meta: + abstract = True + + def log_change(self, user, request_id, action): + """ + Log an ObjectChange including the parent Device/VM. + """ + parent = self.device if self.device is not None else getattr(self, 'virtual_machine', None) + ObjectChange( + user=user, + request_id=request_id, + changed_object=self, + related_object=parent, action=action, object_data=serialize_object(self) ).save() @@ -871,7 +886,7 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): return bool(self.subdevice_role is False) -class ConsolePortTemplate(ComponentModel): +class ConsolePortTemplate(ComponentTemplateModel): """ A template for a ConsolePort to be created for a new Device. """ @@ -891,11 +906,8 @@ class ConsolePortTemplate(ComponentModel): def __str__(self): return self.name - def get_component_parent(self): - return self.device_type - -class ConsoleServerPortTemplate(ComponentModel): +class ConsoleServerPortTemplate(ComponentTemplateModel): """ A template for a ConsoleServerPort to be created for a new Device. """ @@ -915,11 +927,8 @@ class ConsoleServerPortTemplate(ComponentModel): def __str__(self): return self.name - def get_component_parent(self): - return self.device_type - -class PowerPortTemplate(ComponentModel): +class PowerPortTemplate(ComponentTemplateModel): """ A template for a PowerPort to be created for a new Device. """ @@ -939,11 +948,8 @@ class PowerPortTemplate(ComponentModel): def __str__(self): return self.name - def get_component_parent(self): - return self.device_type - -class PowerOutletTemplate(ComponentModel): +class PowerOutletTemplate(ComponentTemplateModel): """ A template for a PowerOutlet to be created for a new Device. """ @@ -963,11 +969,8 @@ class PowerOutletTemplate(ComponentModel): def __str__(self): return self.name - def get_component_parent(self): - return self.device_type - -class InterfaceTemplate(ComponentModel): +class InterfaceTemplate(ComponentTemplateModel): """ A template for a physical data interface on a new Device. """ @@ -997,11 +1000,8 @@ class InterfaceTemplate(ComponentModel): def __str__(self): return self.name - def get_component_parent(self): - return self.device_type - -class DeviceBayTemplate(ComponentModel): +class DeviceBayTemplate(ComponentTemplateModel): """ A template for a DeviceBay to be created for a new parent Device. """ @@ -1021,9 +1021,6 @@ class DeviceBayTemplate(ComponentModel): def __str__(self): return self.name - def get_component_parent(self): - return self.device_type - # # Devices @@ -1562,9 +1559,6 @@ class ConsolePort(ComponentModel): def get_absolute_url(self): return self.device.get_absolute_url() - def get_component_parent(self): - return self.device - def to_csv(self): return ( self.cs_port.device.identifier if self.cs_port else None, @@ -1614,9 +1608,6 @@ class ConsoleServerPort(ComponentModel): def get_absolute_url(self): return self.device.get_absolute_url() - def get_component_parent(self): - return self.device - def clean(self): # Check that the parent device's DeviceType is a console server @@ -1671,9 +1662,6 @@ class PowerPort(ComponentModel): def get_absolute_url(self): return self.device.get_absolute_url() - def get_component_parent(self): - return self.device - def to_csv(self): return ( self.power_outlet.device.identifier if self.power_outlet else None, @@ -1723,9 +1711,6 @@ class PowerOutlet(ComponentModel): def get_absolute_url(self): return self.device.get_absolute_url() - def get_component_parent(self): - return self.device - def clean(self): # Check that the parent device's DeviceType is a PDU @@ -1831,9 +1816,6 @@ class Interface(ComponentModel): def get_absolute_url(self): return reverse('dcim:interface', kwargs={'pk': self.pk}) - def get_component_parent(self): - return self.device or self.virtual_machine - def clean(self): # Check that the parent device's DeviceType is a network device @@ -1913,7 +1895,7 @@ class Interface(ComponentModel): # the component parent will raise DoesNotExist. For more discussion, see # https://github.com/digitalocean/netbox/issues/2323 try: - parent_obj = self.get_component_parent() + parent_obj = self.device or self.virtual_machine except ObjectDoesNotExist: parent_obj = None @@ -1929,7 +1911,6 @@ class Interface(ComponentModel): }) ).save() - # TODO: Replace `parent` with get_component_parent() (from ComponentModel) @property def parent(self): return self.device or self.virtual_machine @@ -2103,9 +2084,6 @@ class DeviceBay(ComponentModel): def get_absolute_url(self): return self.device.get_absolute_url() - def get_component_parent(self): - return self.device - def clean(self): # Validate that the parent Device can have DeviceBays @@ -2194,9 +2172,6 @@ class InventoryItem(ComponentModel): def get_absolute_url(self): return self.device.get_absolute_url() - def get_component_parent(self): - return self.device - def to_csv(self): return ( self.device.name or '{' + self.device.pk + '}', From 7ec415584575acb5968c1e3e038c67bbc8eec029 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 15 Aug 2018 14:18:52 -0400 Subject: [PATCH 005/191] Closes #2359: Implement custom makemigrations command to ignore extraneous field attributes --- netbox/utilities/management/__init__.py | 0 .../utilities/management/commands/__init__.py | 0 .../management/commands/makemigrations.py | 32 +++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 netbox/utilities/management/__init__.py create mode 100644 netbox/utilities/management/commands/__init__.py create mode 100644 netbox/utilities/management/commands/makemigrations.py diff --git a/netbox/utilities/management/__init__.py b/netbox/utilities/management/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/netbox/utilities/management/commands/__init__.py b/netbox/utilities/management/commands/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/netbox/utilities/management/commands/makemigrations.py b/netbox/utilities/management/commands/makemigrations.py new file mode 100644 index 000000000..7ebf19748 --- /dev/null +++ b/netbox/utilities/management/commands/makemigrations.py @@ -0,0 +1,32 @@ +from django.core.management.commands.makemigrations import Command +from django.db import models + + +EXEMPT_ATTRS = [ + 'choices', + 'help_text', + 'verbose_name', +] + +_deconstruct = models.Field.deconstruct + + +def custom_deconstruct(field): + """ + Imitate the behavior of the stock deconstruct() method, but ignore the field attributes listed above. + """ + name, path, args, kwargs = _deconstruct(field) + + # Remove any ignored attributes + for attr in EXEMPT_ATTRS: + kwargs.pop(attr, None) + + # A hack to accommodate TimeZoneField, which employs a custom deconstructor to check whether the default choices + # have changed + if hasattr(field, 'CHOICES'): + kwargs['choices'] = field.CHOICES + + return name, path, args, kwargs + + +models.Field.deconstruct = custom_deconstruct From 7145f86a6ed298e59f9bc2236db2737e9d1a2042 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 15 Aug 2018 15:02:58 -0400 Subject: [PATCH 006/191] #2359: Extended exempt attributes to 'migrate' command --- .../utilities/management/commands/__init__.py | 28 +++++++++++++++++ .../management/commands/makemigrations.py | 30 ++----------------- .../utilities/management/commands/migrate.py | 6 ++++ 3 files changed, 36 insertions(+), 28 deletions(-) create mode 100644 netbox/utilities/management/commands/migrate.py diff --git a/netbox/utilities/management/commands/__init__.py b/netbox/utilities/management/commands/__init__.py index e69de29bb..697a3ed9a 100644 --- a/netbox/utilities/management/commands/__init__.py +++ b/netbox/utilities/management/commands/__init__.py @@ -0,0 +1,28 @@ +from django.db import models + + +EXEMPT_ATTRS = [ + 'choices', + 'help_text', + 'verbose_name', +] + +_deconstruct = models.Field.deconstruct + + +def custom_deconstruct(field): + """ + Imitate the behavior of the stock deconstruct() method, but ignore the field attributes listed above. + """ + name, path, args, kwargs = _deconstruct(field) + + # Remove any ignored attributes + for attr in EXEMPT_ATTRS: + kwargs.pop(attr, None) + + # A hack to accommodate TimeZoneField, which employs a custom deconstructor to check whether the default choices + # have changed + if hasattr(field, 'CHOICES'): + kwargs['choices'] = field.CHOICES + + return name, path, args, kwargs diff --git a/netbox/utilities/management/commands/makemigrations.py b/netbox/utilities/management/commands/makemigrations.py index 7ebf19748..f906feb5a 100644 --- a/netbox/utilities/management/commands/makemigrations.py +++ b/netbox/utilities/management/commands/makemigrations.py @@ -1,32 +1,6 @@ +# noinspection PyUnresolvedReferences from django.core.management.commands.makemigrations import Command from django.db import models - - -EXEMPT_ATTRS = [ - 'choices', - 'help_text', - 'verbose_name', -] - -_deconstruct = models.Field.deconstruct - - -def custom_deconstruct(field): - """ - Imitate the behavior of the stock deconstruct() method, but ignore the field attributes listed above. - """ - name, path, args, kwargs = _deconstruct(field) - - # Remove any ignored attributes - for attr in EXEMPT_ATTRS: - kwargs.pop(attr, None) - - # A hack to accommodate TimeZoneField, which employs a custom deconstructor to check whether the default choices - # have changed - if hasattr(field, 'CHOICES'): - kwargs['choices'] = field.CHOICES - - return name, path, args, kwargs - +from . import custom_deconstruct models.Field.deconstruct = custom_deconstruct diff --git a/netbox/utilities/management/commands/migrate.py b/netbox/utilities/management/commands/migrate.py new file mode 100644 index 000000000..9c2a04284 --- /dev/null +++ b/netbox/utilities/management/commands/migrate.py @@ -0,0 +1,6 @@ +# noinspection PyUnresolvedReferences +from django.core.management.commands.migrate import Command +from django.db import models +from . import custom_deconstruct + +models.Field.deconstruct = custom_deconstruct From c4be440cd1b6bf7829fa68981507070e482e50de Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 16 Aug 2018 12:21:24 -0400 Subject: [PATCH 007/191] Closes #2367: Remove deprecated RPCClient functionality --- netbox/dcim/api/serializers.py | 2 +- netbox/dcim/constants.py | 10 - netbox/dcim/fixtures/dcim.json | 6 +- netbox/dcim/fixtures/initial_data.json | 18 +- netbox/dcim/forms.py | 2 +- .../0062_remove_platform_rpc_client.py | 17 ++ netbox/dcim/models.py | 15 -- .../management/commands/run_inventory.py | 125 ---------- netbox/extras/rpc.py | 235 ------------------ 9 files changed, 27 insertions(+), 403 deletions(-) create mode 100644 netbox/dcim/migrations/0062_remove_platform_rpc_client.py delete mode 100644 netbox/extras/management/commands/run_inventory.py delete mode 100644 netbox/extras/rpc.py diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 26100c3a7..c357891b6 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -344,7 +344,7 @@ class PlatformSerializer(ValidatedModelSerializer): class Meta: model = Platform - fields = ['id', 'name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_args', 'rpc_client'] + fields = ['id', 'name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_args'] class NestedPlatformSerializer(WritableNestedSerializer): diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index 2249f0e0d..0bec76bf3 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -243,13 +243,3 @@ CONNECTION_STATUS_CHOICES = [ [CONNECTION_STATUS_PLANNED, 'Planned'], [CONNECTION_STATUS_CONNECTED, 'Connected'], ] - -# Platform -> RPC client mappings -RPC_CLIENT_JUNIPER_JUNOS = 'juniper-junos' -RPC_CLIENT_CISCO_IOS = 'cisco-ios' -RPC_CLIENT_OPENGEAR = 'opengear' -RPC_CLIENT_CHOICES = [ - [RPC_CLIENT_JUNIPER_JUNOS, 'Juniper Junos (NETCONF)'], - [RPC_CLIENT_CISCO_IOS, 'Cisco IOS (SSH)'], - [RPC_CLIENT_OPENGEAR, 'Opengear (SSH)'], -] diff --git a/netbox/dcim/fixtures/dcim.json b/netbox/dcim/fixtures/dcim.json index 761f1ba69..709995f95 100644 --- a/netbox/dcim/fixtures/dcim.json +++ b/netbox/dcim/fixtures/dcim.json @@ -1903,8 +1903,7 @@ "pk": 1, "fields": { "name": "Juniper Junos", - "slug": "juniper-junos", - "rpc_client": "juniper-junos" + "slug": "juniper-junos" } }, { @@ -1912,8 +1911,7 @@ "pk": 2, "fields": { "name": "Opengear", - "slug": "opengear", - "rpc_client": "opengear" + "slug": "opengear" } }, { diff --git a/netbox/dcim/fixtures/initial_data.json b/netbox/dcim/fixtures/initial_data.json index e765de227..83f79e3a3 100644 --- a/netbox/dcim/fixtures/initial_data.json +++ b/netbox/dcim/fixtures/initial_data.json @@ -149,8 +149,7 @@ "pk": 1, "fields": { "name": "Cisco IOS", - "slug": "cisco-ios", - "rpc_client": "cisco-ios" + "slug": "cisco-ios" } }, { @@ -158,8 +157,7 @@ "pk": 2, "fields": { "name": "Cisco NX-OS", - "slug": "cisco-nx-os", - "rpc_client": "" + "slug": "cisco-nx-os" } }, { @@ -167,8 +165,7 @@ "pk": 3, "fields": { "name": "Juniper Junos", - "slug": "juniper-junos", - "rpc_client": "juniper-junos" + "slug": "juniper-junos" } }, { @@ -176,8 +173,7 @@ "pk": 4, "fields": { "name": "Arista EOS", - "slug": "arista-eos", - "rpc_client": "" + "slug": "arista-eos" } }, { @@ -185,8 +181,7 @@ "pk": 5, "fields": { "name": "Linux", - "slug": "linux", - "rpc_client": "" + "slug": "linux" } }, { @@ -194,8 +189,7 @@ "pk": 6, "fields": { "name": "Opengear", - "slug": "opengear", - "rpc_client": "opengear" + "slug": "opengear" } } ] diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 66ed2447f..30c798e9e 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -744,7 +744,7 @@ class PlatformForm(BootstrapMixin, forms.ModelForm): class Meta: model = Platform - fields = ['name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_args', 'rpc_client'] + fields = ['name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_args'] widgets = { 'napalm_args': SmallTextarea(), } diff --git a/netbox/dcim/migrations/0062_remove_platform_rpc_client.py b/netbox/dcim/migrations/0062_remove_platform_rpc_client.py new file mode 100644 index 000000000..22a4900d1 --- /dev/null +++ b/netbox/dcim/migrations/0062_remove_platform_rpc_client.py @@ -0,0 +1,17 @@ +# Generated by Django 2.0.8 on 2018-08-16 16:17 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0061_platform_napalm_args'), + ] + + operations = [ + migrations.RemoveField( + model_name='platform', + name='rpc_client', + ), + ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 8fdc5e998..432d78977 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -17,7 +17,6 @@ from timezone_field import TimeZoneField from circuits.models import Circuit from extras.constants import OBJECTCHANGE_ACTION_DELETE, OBJECTCHANGE_ACTION_UPDATE from extras.models import ConfigContextModel, CustomFieldModel, ObjectChange -from extras.rpc import RPC_CLIENTS from utilities.fields import ColorField, NullableCharField from utilities.managers import NaturalOrderByManager from utilities.models import ChangeLoggedModel @@ -1096,12 +1095,6 @@ class Platform(ChangeLoggedModel): verbose_name='NAPALM arguments', help_text='Additional arguments to pass when initiating the NAPALM driver (JSON format)' ) - rpc_client = models.CharField( - max_length=30, - choices=RPC_CLIENT_CHOICES, - blank=True, - verbose_name='Legacy RPC client' - ) csv_headers = ['name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_args'] @@ -1507,14 +1500,6 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): def get_status_class(self): return STATUS_CLASSES[self.status] - def get_rpc_client(self): - """ - Return the appropriate RPC (e.g. NETCONF, ssh, etc.) client for this device's platform, if one is defined. - """ - if not self.platform: - return None - return RPC_CLIENTS.get(self.platform.rpc_client) - # # Console ports diff --git a/netbox/extras/management/commands/run_inventory.py b/netbox/extras/management/commands/run_inventory.py deleted file mode 100644 index e5ce1bbca..000000000 --- a/netbox/extras/management/commands/run_inventory.py +++ /dev/null @@ -1,125 +0,0 @@ -from getpass import getpass - -from django.conf import settings -from django.core.management.base import BaseCommand, CommandError -from django.db import transaction -from ncclient.transport.errors import AuthenticationError -from paramiko import AuthenticationException - -from dcim.models import DEVICE_STATUS_ACTIVE, Device, InventoryItem, Site - - -class Command(BaseCommand): - help = "Update inventory information for specified devices" - username = settings.NAPALM_USERNAME - password = settings.NAPALM_PASSWORD - - def add_arguments(self, parser): - parser.add_argument('-u', '--username', dest='username', help="Specify the username to use") - parser.add_argument('-p', '--password', action='store_true', default=False, help="Prompt for password to use") - parser.add_argument('-s', '--site', dest='site', action='append', - help="Filter devices by site (include argument once per site)") - parser.add_argument('-n', '--name', dest='name', help="Filter devices by name (regular expression)") - parser.add_argument('--full', action='store_true', default=False, help="For inventory update for all devices") - parser.add_argument('--fake', action='store_true', default=False, help="Do not actually update database") - - def handle(self, *args, **options): - - def create_inventory_items(inventory_items, parent=None): - for item in inventory_items: - i = InventoryItem(device=device, parent=parent, name=item['name'], part_id=item['part_id'], - serial=item['serial'], discovered=True) - i.save() - create_inventory_items(item.get('items', []), parent=i) - - # Credentials - if options['username']: - self.username = options['username'] - if options['password']: - self.password = getpass("Password: ") - - # Attempt to inventory only active devices - device_list = Device.objects.filter(status=DEVICE_STATUS_ACTIVE) - - # --site: Include only devices belonging to specified site(s) - if options['site']: - sites = Site.objects.filter(slug__in=options['site']) - if sites: - site_names = [s.name for s in sites] - self.stdout.write("Running inventory for these sites: {}".format(', '.join(site_names))) - else: - raise CommandError("One or more sites specified but none found.") - device_list = device_list.filter(site__in=sites) - - # --name: Filter devices by name matching a regex - if options['name']: - device_list = device_list.filter(name__iregex=options['name']) - - # --full: Gather inventory data for *all* devices - if options['full']: - self.stdout.write("WARNING: Running inventory for all devices! Prior data will be overwritten. (--full)") - - # --fake: Gathering data but not updating the database - if options['fake']: - self.stdout.write("WARNING: Inventory data will not be saved! (--fake)") - - device_count = device_list.count() - self.stdout.write("** Found {} devices...".format(device_count)) - - for i, device in enumerate(device_list, start=1): - - self.stdout.write("[{}/{}] {}: ".format(i, device_count, device.name), ending='') - - # Skip inactive devices - if not device.status: - self.stdout.write("Skipped (not active)") - continue - - # Skip devices without primary_ip set - if not device.primary_ip: - self.stdout.write("Skipped (no primary IP set)") - continue - - # Skip devices which have already been inventoried if not doing a full update - if device.serial and not options['full']: - self.stdout.write("Skipped (Serial: {})".format(device.serial)) - continue - - RPC = device.get_rpc_client() - if not RPC: - self.stdout.write("Skipped (no RPC client available for platform {})".format(device.platform)) - continue - - # Connect to device and retrieve inventory info - try: - with RPC(device, self.username, self.password) as rpc_client: - inventory = rpc_client.get_inventory() - except KeyboardInterrupt: - raise - except (AuthenticationError, AuthenticationException): - self.stdout.write("Authentication error!") - continue - except Exception as e: - self.stdout.write("Error: {}".format(e)) - continue - - if options['verbosity'] > 1: - self.stdout.write("") - self.stdout.write("\tSerial: {}".format(inventory['chassis']['serial'])) - self.stdout.write("\tDescription: {}".format(inventory['chassis']['description'])) - for item in inventory['items']: - self.stdout.write("\tItem: {} / {} ({})".format(item['name'], item['part_id'], - item['serial'])) - else: - self.stdout.write("{} ({})".format(inventory['chassis']['description'], inventory['chassis']['serial'])) - - if not options['fake']: - with transaction.atomic(): - # Update device serial - if device.serial != inventory['chassis']['serial']: - device.serial = inventory['chassis']['serial'] - device.save() - InventoryItem.objects.filter(device=device, discovered=True).delete() - create_inventory_items(inventory.get('items', [])) - - self.stdout.write("Finished!") diff --git a/netbox/extras/rpc.py b/netbox/extras/rpc.py deleted file mode 100644 index 60fc9208f..000000000 --- a/netbox/extras/rpc.py +++ /dev/null @@ -1,235 +0,0 @@ -import re -import time - -import paramiko -import xmltodict -from ncclient import manager - -CONNECT_TIMEOUT = 5 # seconds - - -class RPCClient(object): - - def __init__(self, device, username='', password=''): - self.username = username - self.password = password - try: - self.host = str(device.primary_ip.address.ip) - except AttributeError: - raise Exception("Specified device ({}) does not have a primary IP defined.".format(device)) - - def get_inventory(self): - """ - Returns a dictionary representing the device chassis and installed inventory items. - - { - 'chassis': { - 'serial': , - 'description': , - } - 'items': [ - { - 'name': , - 'part_id': , - 'serial': , - }, - ... - ] - } - """ - raise NotImplementedError("Feature not implemented for this platform.") - - -class SSHClient(RPCClient): - def __enter__(self): - - self.ssh = paramiko.SSHClient() - self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) - try: - self.ssh.connect( - self.host, - username=self.username, - password=self.password, - timeout=CONNECT_TIMEOUT, - allow_agent=False, - look_for_keys=False, - ) - except paramiko.AuthenticationException: - # Try default credentials if the configured creds don't work - try: - default_creds = self.default_credentials - if default_creds.get('username') and default_creds.get('password'): - self.ssh.connect( - self.host, - username=default_creds['username'], - password=default_creds['password'], - timeout=CONNECT_TIMEOUT, - allow_agent=False, - look_for_keys=False, - ) - else: - raise ValueError('default_credentials are incomplete.') - except AttributeError: - raise paramiko.AuthenticationException - - self.session = self.ssh.invoke_shell() - self.session.recv(1000) - return self - - def __exit__(self, exc_type, exc_val, exc_tb): - self.ssh.close() - - def _send(self, cmd, pause=1): - self.session.send('{}\n'.format(cmd)) - data = '' - time.sleep(pause) - while self.session.recv_ready(): - data += self.session.recv(4096).decode() - if not data: - break - return data - - -class JunosNC(RPCClient): - """ - NETCONF client for Juniper Junos devices - """ - - def __enter__(self): - - # Initiate a connection to the device - self.manager = manager.connect(host=self.host, username=self.username, password=self.password, - hostkey_verify=False, timeout=CONNECT_TIMEOUT) - - return self - - def __exit__(self, exc_type, exc_val, exc_tb): - - # Close the connection to the device - self.manager.close_session() - - def get_inventory(self): - - def glean_items(node, depth=0): - items = [] - items_list = node.get('chassis{}-module'.format('-sub' * depth), []) - # Junos like to return single children directly instead of as a single-item list - if hasattr(items_list, 'items'): - items_list = [items_list] - for item in items_list: - m = { - 'name': item['name'], - 'part_id': item.get('model-number') or item.get('part-number', ''), - 'serial': item.get('serial-number', ''), - } - child_items = glean_items(item, depth + 1) - if child_items: - m['items'] = child_items - items.append(m) - return items - - rpc_reply = self.manager.dispatch('get-chassis-inventory') - inventory_raw = xmltodict.parse(rpc_reply.xml)['rpc-reply']['chassis-inventory']['chassis'] - - result = dict() - - # Gather chassis data - result['chassis'] = { - 'serial': inventory_raw['serial-number'], - 'description': inventory_raw['description'], - } - - # Gather inventory items - result['items'] = glean_items(inventory_raw) - - return result - - -class IOSSSH(SSHClient): - """ - SSH client for Cisco IOS devices - """ - - def get_inventory(self): - def version(): - - def parse(cmd_out, rex): - for i in cmd_out: - match = re.search(rex, i) - if match: - return match.groups()[0] - - sh_ver = self._send('show version').split('\r\n') - return { - 'serial': parse(sh_ver, r'Processor board ID ([^\s]+)'), - 'description': parse(sh_ver, r'cisco ([^\s]+)') - } - - def items(chassis_serial=None): - cmd = self._send('show inventory').split('\r\n\r\n') - for i in cmd: - i_fmt = i.replace('\r\n', ' ') - try: - m_name = re.search(r'NAME: "([^"]+)"', i_fmt).group(1) - m_pid = re.search(r'PID: ([^\s]+)', i_fmt).group(1) - m_serial = re.search(r'SN: ([^\s]+)', i_fmt).group(1) - # Omit built-in items and those with no PID - if m_serial != chassis_serial and m_pid.lower() != 'unspecified': - yield { - 'name': m_name, - 'part_id': m_pid, - 'serial': m_serial, - } - except AttributeError: - continue - - self._send('term length 0') - sh_version = version() - - return { - 'chassis': sh_version, - 'items': list(items(chassis_serial=sh_version.get('serial'))) - } - - -class OpengearSSH(SSHClient): - """ - SSH client for Opengear devices - """ - default_credentials = { - 'username': 'root', - 'password': 'default', - } - - def get_inventory(self): - - try: - stdin, stdout, stderr = self.ssh.exec_command("showserial") - serial = stdout.readlines()[0].strip() - except Exception: - raise RuntimeError("Failed to glean chassis serial from device.") - # Older models don't provide serial info - if serial == "No serial number information available": - serial = '' - - try: - stdin, stdout, stderr = self.ssh.exec_command("config -g config.system.model") - description = stdout.readlines()[0].split(' ', 1)[1].strip() - except Exception: - raise RuntimeError("Failed to glean chassis description from device.") - - return { - 'chassis': { - 'serial': serial, - 'description': description, - }, - 'items': [], - } - - -# For mapping platform -> NC client -RPC_CLIENTS = { - 'juniper-junos': JunosNC, - 'cisco-ios': IOSSSH, - 'opengear': OpengearSSH, -} From 19b737a534e38a2c1344dc5be0f0c1d56f384ba1 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 16 Aug 2018 16:33:13 -0400 Subject: [PATCH 008/191] Added v2.5 notes (so far) to changelog --- CHANGELOG.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f164f4c1..f1bc7f499 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,24 @@ +v2.5.0 (FUTURE) + +--- + +## Notes + +* As promised, Python 2 support has been completed removed. Python 3.5 or higher is now required to run NetBox. +* The UserAction model, which was deprecated by the new change logging feature in NetBox v2.4, has been removed. If you need to archive user activity, do so prior to upgrading to NetBox v2.5, as the database migration will remove all data associated with this model. + +## Enhancements + +* [#2000](https://github.com/digitalocean/netbox/issues/2000) - Dropped support for Python 2 +* [#2292](https://github.com/digitalocean/netbox/issues/2292) - Removed the deprecated UserAction model +* [#2367](https://github.com/digitalocean/netbox/issues/2367) - Removed deprecated RPCClient functionality + +## API Changes + +* The `rpc_client` field has been removed from dcim.Platform (see #2367) + +--- + v2.4.4 (FUTURE) ## Enhancements From 3eddeeadc56a24e4b7574ea918159c0660943e05 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 3 Oct 2018 14:04:16 -0400 Subject: [PATCH 009/191] Initial work on #20 - patch panels --- netbox/dcim/api/serializers.py | 104 +++++++- netbox/dcim/api/urls.py | 4 + netbox/dcim/api/views.py | 31 ++- netbox/dcim/constants.py | 30 +++ netbox/dcim/filters.py | 35 ++- netbox/dcim/forms.py | 231 +++++++++++++++++- .../dcim/migrations/0065_patch_panel_ports.py | 114 +++++++++ netbox/dcim/models.py | 201 ++++++++++++++- netbox/dcim/tables.py | 44 +++- netbox/dcim/urls.py | 24 ++ netbox/dcim/views.py | 137 ++++++++++- netbox/templates/dcim/device.html | 105 ++++++++ netbox/templates/dcim/devicetype.html | 19 ++ netbox/templates/dcim/devicetype_edit.html | 1 + netbox/templates/dcim/inc/frontpanelport.html | 25 ++ netbox/templates/dcim/inc/rearpanelport.html | 24 ++ netbox/utilities/forms.py | 3 + netbox/utilities/views.py | 3 +- 18 files changed, 1101 insertions(+), 34 deletions(-) create mode 100644 netbox/dcim/migrations/0065_patch_panel_ports.py create mode 100644 netbox/templates/dcim/inc/frontpanelport.html create mode 100644 netbox/templates/dcim/inc/rearpanelport.html diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 696464662..ed9ee29ea 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -3,15 +3,13 @@ from rest_framework.validators import UniqueTogetherValidator from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField from circuits.models import Circuit, CircuitTermination -from dcim.constants import ( - CONNECTION_STATUS_CHOICES, DEVICE_STATUS_CHOICES, IFACE_FF_CHOICES, IFACE_MODE_CHOICES, IFACE_ORDERING_CHOICES, - RACK_FACE_CHOICES, RACK_TYPE_CHOICES, RACK_WIDTH_CHOICES, SITE_STATUS_CHOICES, SUBDEVICE_ROLE_CHOICES, -) +from dcim.constants import * from dcim.models import ( ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceType, DeviceRole, Interface, InterfaceConnection, InterfaceTemplate, Manufacturer, - InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, - RackReservation, RackRole, Region, Site, VirtualChassis, + DeviceBayTemplate, DeviceType, DeviceRole, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceConnection, + InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, + VirtualChassis, ) from extras.api.customfields import CustomFieldModelSerializer from ipam.models import IPAddress, VLAN @@ -229,8 +227,8 @@ class DeviceTypeSerializer(TaggitSerializer, CustomFieldModelSerializer): model = DeviceType fields = [ 'id', 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'interface_ordering', - 'is_console_server', 'is_pdu', 'is_network_device', 'subdevice_role', 'comments', 'tags', 'custom_fields', - 'created', 'last_updated', 'instance_count', + 'is_console_server', 'is_pdu', 'is_network_device', 'is_patch_panel', 'subdevice_role', 'comments', 'tags', + 'custom_fields', 'created', 'last_updated', 'instance_count', ] @@ -304,6 +302,49 @@ class InterfaceTemplateSerializer(ValidatedModelSerializer): fields = ['id', 'device_type', 'name', 'form_factor', 'mgmt_only'] +# +# Rear panel port templates +# + +class RearPanelPortTemplateSerializer(ValidatedModelSerializer): + device_type = NestedDeviceTypeSerializer() + type = ChoiceField(choices=PANELPORT_TYPE_CHOICES) + + class Meta: + model = RearPanelPortTemplate + fields = ['id', 'device_type', 'name', 'type', 'positions'] + + +class NestedRearPanelPortTemplateSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearpanelporttemplate-detail') + + class Meta: + model = RearPanelPortTemplate + fields = ['id', 'url', 'name'] + + +# +# Front panel port templates +# + +class FrontPanelPortTemplateSerializer(ValidatedModelSerializer): + device_type = NestedDeviceTypeSerializer() + type = ChoiceField(choices=PANELPORT_TYPE_CHOICES) + rear_port = NestedRearPanelPortTemplateSerializer() + + class Meta: + model = FrontPanelPortTemplate + fields = ['id', 'device_type', 'name', 'type', 'rear_port', 'rear_port_position'] + + +class NestedFrontPanelPortTemplateSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontpanelporttemplate-detail') + + class Meta: + model = FrontPanelPortTemplate + fields = ['id', 'url', 'name'] + + # # Device bay templates # @@ -634,6 +675,51 @@ class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer): return None +# +# Rear panel ports +# + +class RearPanelPortSerializer(ValidatedModelSerializer): + device = NestedDeviceSerializer() + type = ChoiceField(choices=PANELPORT_TYPE_CHOICES) + tags = TagListSerializerField(required=False) + + class Meta: + model = RearPanelPort + fields = ['id', 'device', 'name', 'type', 'positions', 'tags'] + + +class NestedRearPanelPortSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearpanelport-detail') + + class Meta: + model = RearPanelPort + fields = ['id', 'url', 'name'] + + +# +# Front panel ports +# + +class FrontPanelPortSerializer(ValidatedModelSerializer): + device = NestedDeviceSerializer() + type = ChoiceField(choices=PANELPORT_TYPE_CHOICES) + rear_port = NestedRearPanelPortSerializer() + tags = TagListSerializerField(required=False) + + class Meta: + model = FrontPanelPort + fields = ['id', 'device', 'name', 'type', 'rear_port', 'rear_port_position', 'tags'] + + +class NestedFrontPanelPortSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontpanelport-detail') + + class Meta: + model = FrontPanelPort + fields = ['id', 'url', 'name'] + + # # Device bays # diff --git a/netbox/dcim/api/urls.py b/netbox/dcim/api/urls.py index 6456d53a4..0e6a5d344 100644 --- a/netbox/dcim/api/urls.py +++ b/netbox/dcim/api/urls.py @@ -37,6 +37,8 @@ router.register(r'console-server-port-templates', views.ConsoleServerPortTemplat router.register(r'power-port-templates', views.PowerPortTemplateViewSet) router.register(r'power-outlet-templates', views.PowerOutletTemplateViewSet) router.register(r'interface-templates', views.InterfaceTemplateViewSet) +router.register(r'front-panel-port-templates', views.FrontPanelPortTemplateViewSet) +router.register(r'rear-panel-port-templates', views.RearPanelPortTemplateViewSet) router.register(r'device-bay-templates', views.DeviceBayTemplateViewSet) # Devices @@ -50,6 +52,8 @@ router.register(r'console-server-ports', views.ConsoleServerPortViewSet) router.register(r'power-ports', views.PowerPortViewSet) router.register(r'power-outlets', views.PowerOutletViewSet) router.register(r'interfaces', views.InterfaceViewSet) +router.register(r'front-panel-ports', views.FrontPanelPortViewSet) +router.register(r'rear-panel-ports', views.RearPanelPortViewSet) router.register(r'device-bays', views.DeviceBayViewSet) router.register(r'inventory-items', views.InventoryItemViewSet) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 4fb9c3f20..a9f4c6f9f 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -14,9 +14,10 @@ from rest_framework.viewsets import GenericViewSet, ViewSet from dcim import filters from dcim.models import ( ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, Interface, InterfaceConnection, InterfaceTemplate, Manufacturer, - InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, - RackReservation, RackRole, Region, Site, VirtualChassis, + DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceConnection, + InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, + VirtualChassis, ) from extras.api.serializers import RenderedGraphSerializer from extras.api.views import CustomFieldModelViewSet @@ -191,6 +192,18 @@ class InterfaceTemplateViewSet(ModelViewSet): filter_class = filters.InterfaceTemplateFilter +class FrontPanelPortTemplateViewSet(ModelViewSet): + queryset = FrontPanelPortTemplate.objects.select_related('device_type__manufacturer') + serializer_class = serializers.FrontPanelPortTemplateSerializer + filter_class = filters.FrontPanelPortTemplateFilter + + +class RearPanelPortTemplateViewSet(ModelViewSet): + queryset = RearPanelPortTemplate.objects.select_related('device_type__manufacturer') + serializer_class = serializers.RearPanelPortTemplateSerializer + filter_class = filters.RearPanelPortTemplateFilter + + class DeviceBayTemplateViewSet(ModelViewSet): queryset = DeviceBayTemplate.objects.select_related('device_type__manufacturer') serializer_class = serializers.DeviceBayTemplateSerializer @@ -352,6 +365,18 @@ class InterfaceViewSet(ModelViewSet): return Response(serializer.data) +class FrontPanelPortViewSet(ModelViewSet): + queryset = FrontPanelPort.objects.select_related('device__device_type__manufacturer', 'rear_port') + serializer_class = serializers.FrontPanelPortSerializer + filter_class = filters.FrontPanelPortFilter + + +class RearPanelPortViewSet(ModelViewSet): + queryset = RearPanelPort.objects.select_related('device__device_type__manufacturer') + serializer_class = serializers.RearPanelPortSerializer + filter_class = filters.RearPanelPortFilter + + class DeviceBayViewSet(ModelViewSet): queryset = DeviceBay.objects.select_related('installed_device').prefetch_related('tags') serializer_class = serializers.DeviceBaySerializer diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index a3226a6b2..d51ec97f3 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -209,6 +209,36 @@ IFACE_MODE_CHOICES = [ [IFACE_MODE_TAGGED_ALL, 'Tagged All'], ] +# Patch panel port types +PANELPORT_TYPE_8P8C = 1000 +PANELPORT_TYPE_ST = 2000 +PANELPORT_TYPE_SC_SIMPLEX = 2100 +PANELPORT_TYPE_SC_DUPLEX = 2110 +PANELPORT_TYPE_FC = 2200 +PANELPORT_TYPE_LC = 2300 +PANELPORT_TYPE_MTRJ = 2400 +PANELPORT_TYPE_MPO = 2500 +PANELPORT_TYPE_CHOICES = [ + [ + 'Copper', + [ + [PANELPORT_TYPE_8P8C, '8P8C'], + ], + ], + [ + 'Fiber Optic', + [ + [PANELPORT_TYPE_ST, 'ST'], + [PANELPORT_TYPE_SC_SIMPLEX, 'SC (Simplex)'], + [PANELPORT_TYPE_SC_DUPLEX, 'SC (Duplex)'], + [PANELPORT_TYPE_FC, 'FC'], + [PANELPORT_TYPE_LC, 'LC'], + [PANELPORT_TYPE_MTRJ, 'MTRJ'], + [PANELPORT_TYPE_MPO, 'MPO'], + ] + ] +] + # Device statuses DEVICE_STATUS_OFFLINE = 0 DEVICE_STATUS_ACTIVE = 1 diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 60cbbfcc1..3b370654e 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -14,9 +14,10 @@ from .constants import ( ) from .models import ( ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, Interface, InterfaceConnection, InterfaceTemplate, Manufacturer, - InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, - RackReservation, RackRole, Region, Site, VirtualChassis, + DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceConnection, + InterfaceTemplate, InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, + VirtualChassis, ) @@ -368,6 +369,20 @@ class InterfaceTemplateFilter(DeviceTypeComponentFilterSet): fields = ['name', 'form_factor', 'mgmt_only'] +class FrontPanelPortTemplateFilter(DeviceTypeComponentFilterSet): + + class Meta: + model = FrontPanelPortTemplate + fields = ['name', 'type'] + + +class RearPanelPortTemplateFilter(DeviceTypeComponentFilterSet): + + class Meta: + model = RearPanelPortTemplate + fields = ['name', 'type'] + + class DeviceBayTemplateFilter(DeviceTypeComponentFilterSet): class Meta: @@ -667,6 +682,20 @@ class InterfaceFilter(django_filters.FilterSet): return queryset.none() +class FrontPanelPortFilter(DeviceComponentFilterSet): + + class Meta: + model = FrontPanelPort + fields = ['name', 'type'] + + +class RearPanelPortFilter(DeviceComponentFilterSet): + + class Meta: + model = RearPanelPort + fields = ['name', 'type'] + + class DeviceBayFilter(DeviceComponentFilterSet): class Meta: diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 923079634..58f17c0a6 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -5,6 +5,8 @@ from django.contrib.auth.models import User from django.contrib.postgres.forms.array import SimpleArrayField from django.db.models import Count, Q from mptt.forms import TreeNodeChoiceField +from natsort import natsorted +from operator import attrgetter from taggit.forms import TagField from timezone_field import TimeZoneFormField @@ -19,17 +21,13 @@ from utilities.forms import ( FlexibleModelChoiceField, JSONField, Livesearch, SelectWithDisabled, SelectWithPK, SmallTextarea, SlugField, ) from virtualization.models import Cluster -from .constants import ( - CONNECTION_STATUS_CHOICES, CONNECTION_STATUS_CONNECTED, DEVICE_STATUS_CHOICES, IFACE_FF_CHOICES, IFACE_FF_LAG, - IFACE_MODE_ACCESS, IFACE_MODE_CHOICES, IFACE_MODE_TAGGED_ALL, IFACE_ORDERING_CHOICES, RACK_FACE_CHOICES, - RACK_TYPE_CHOICES, RACK_WIDTH_CHOICES, RACK_WIDTH_19IN, RACK_WIDTH_23IN, SITE_STATUS_CHOICES, SUBDEVICE_ROLE_CHILD, - SUBDEVICE_ROLE_PARENT, SUBDEVICE_ROLE_CHOICES, -) +from .constants import * from .models import ( DeviceBay, DeviceBayTemplate, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, - Device, DeviceRole, DeviceType, Interface, InterfaceConnection, InterfaceTemplate, Manufacturer, InventoryItem, - Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, - RackRole, Region, Site, VirtualChassis + Device, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceConnection, + InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, + VirtualChassis, ) DEVICE_BY_PK_RE = r'{\d+\}' @@ -532,7 +530,7 @@ class DeviceTypeForm(BootstrapMixin, CustomFieldForm): model = DeviceType fields = [ 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'is_console_server', 'is_pdu', - 'is_network_device', 'subdevice_role', 'interface_ordering', 'comments', 'tags', + 'is_network_device', 'is_patch_panel', 'subdevice_role', 'interface_ordering', 'comments', 'tags', ] labels = { 'interface_ordering': 'Order interfaces by', @@ -582,6 +580,9 @@ class DeviceTypeBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkE is_network_device = forms.NullBooleanField( required=False, widget=BulkEditNullBooleanSelect, label='Is a network device' ) + is_patch_panel = forms.NullBooleanField( + required=False, widget=BulkEditNullBooleanSelect, label='Is a patch panel' + ) class Meta: nullable_fields = [] @@ -602,6 +603,9 @@ class DeviceTypeFilterForm(BootstrapMixin, CustomFieldFilterForm): is_network_device = forms.BooleanField( required=False, label='Is a network device', widget=forms.CheckboxInput(attrs={'value': 'True'}) ) + is_patch_panel = forms.BooleanField( + required=False, label='Is a patch panel', widget=forms.CheckboxInput(attrs={'value': 'True'}) + ) subdevice_role = forms.NullBooleanField( required=False, label='Subdevice role', widget=forms.Select(choices=( ('', '---------'), @@ -696,6 +700,97 @@ class InterfaceTemplateBulkEditForm(BootstrapMixin, BulkEditForm): nullable_fields = [] +class FrontPanelPortTemplateForm(BootstrapMixin, forms.ModelForm): + + class Meta: + model = FrontPanelPortTemplate + fields = ['device_type', 'name', 'type', 'rear_port', 'rear_port_position'] + widgets = { + 'device_type': forms.HiddenInput(), + } + + +class FrontPanelPortTemplateCreateForm(ComponentForm): + name_pattern = ExpandableNameField( + label='Name' + ) + type = forms.ChoiceField( + choices=PANELPORT_TYPE_CHOICES + ) + rear_port_set = forms.MultipleChoiceField( + choices=[], + label='Rear ports', + help_text='Select one rear port assignment for each front port being created.' + ) + + def __init__(self, *args, **kwargs): + + super(FrontPanelPortTemplateCreateForm, self).__init__(*args, **kwargs) + + # Determine which rear port positions are occupied. These will be excluded from the list of available mappings. + occupied_port_positions = [ + (front_port.rear_port_id, front_port.rear_port_position) + for front_port in self.parent.front_panel_port_templates.all() + ] + + # Populate rear port choices + choices = [] + rear_ports = natsorted(RearPanelPortTemplate.objects.filter(device_type=self.parent), key=attrgetter('name')) + for rear_port in rear_ports: + for i in range(1, rear_port.positions + 1): + if (rear_port.pk, i) not in occupied_port_positions: + choices.append( + ('{}:{}'.format(rear_port.pk, i), '{}:{}'.format(rear_port.name, i)) + ) + self.fields['rear_port_set'].choices = choices + + def clean(self): + + # Validate that the number of ports being created equals the number of selected (rear port, position) tuples + front_port_count = len(self.cleaned_data['name_pattern']) + rear_port_count = len(self.cleaned_data['rear_port_set']) + if front_port_count != rear_port_count: + raise forms.ValidationError({ + 'rear_port_set': 'The provided name pattern will create {} ports, however {} rear port assignments ' + 'were selected. These counts must match.'.format(front_port_count, rear_port_count) + }) + + def get_iterative_data(self, iteration): + + # Assign rear port and position from selected set + rear_port, position = self.cleaned_data['rear_port_set'][iteration].split(':') + + return { + 'rear_port': int(rear_port), + 'rear_port_position': int(position), + } + + +class RearPanelPortTemplateForm(BootstrapMixin, forms.ModelForm): + + class Meta: + model = RearPanelPortTemplate + fields = ['device_type', 'name', 'type', 'positions'] + widgets = { + 'device_type': forms.HiddenInput(), + } + + +class RearPanelPortTemplateCreateForm(ComponentForm): + name_pattern = ExpandableNameField( + label='Name' + ) + type = forms.ChoiceField( + choices=PANELPORT_TYPE_CHOICES + ) + positions = forms.IntegerField( + min_value=1, + max_value=64, + initial=1, + help_text='The number of front ports which may be mapped to each rear port' + ) + + class DeviceBayTemplateForm(BootstrapMixin, forms.ModelForm): class Meta: @@ -2087,6 +2182,122 @@ class InterfaceConnectionCSVForm(forms.ModelForm): return interface +# +# Front panel ports +# + +class FrontPanelPortForm(BootstrapMixin, forms.ModelForm): + tags = TagField(required=False) + + class Meta: + model = FrontPanelPort + fields = ['device', 'name', 'type', 'rear_port', 'rear_port_position', 'tags'] + widgets = { + 'device': forms.HiddenInput(), + } + + +# TODO: Merge with FrontPanelPortTemplateCreateForm to remove duplicate logic +class FrontPanelPortCreateForm(ComponentForm): + name_pattern = ExpandableNameField( + label='Name' + ) + type = forms.ChoiceField( + choices=PANELPORT_TYPE_CHOICES + ) + rear_port_set = forms.MultipleChoiceField( + choices=[], + label='Rear ports', + help_text='Select one rear port assignment for each front port being created.' + ) + + def __init__(self, *args, **kwargs): + + super(FrontPanelPortCreateForm, self).__init__(*args, **kwargs) + + # Determine which rear port positions are occupied. These will be excluded from the list of available mappings. + occupied_port_positions = [ + (front_port.rear_port_id, front_port.rear_port_position) + for front_port in self.parent.front_panel_port_templates.all() + ] + + # Populate rear port choices + choices = [] + rear_ports = natsorted(RearPanelPort.objects.filter(device=self.parent), key=attrgetter('name')) + for rear_port in rear_ports: + for i in range(1, rear_port.positions + 1): + if (rear_port.pk, i) not in occupied_port_positions: + choices.append( + ('{}:{}'.format(rear_port.pk, i), '{}:{}'.format(rear_port.name, i)) + ) + self.fields['rear_port_set'].choices = choices + + def clean(self): + + # Validate that the number of ports being created equals the number of selected (rear port, position) tuples + front_port_count = len(self.cleaned_data['name_pattern']) + rear_port_count = len(self.cleaned_data['rear_port_set']) + if front_port_count != rear_port_count: + raise forms.ValidationError({ + 'rear_port_set': 'The provided name pattern will create {} ports, however {} rear port assignments ' + 'were selected. These counts must match.'.format(front_port_count, rear_port_count) + }) + + def get_iterative_data(self, iteration): + + # Assign rear port and position from selected set + rear_port, position = self.cleaned_data['rear_port_set'][iteration].split(':') + + return { + 'rear_port': int(rear_port), + 'rear_port_position': int(position), + } + + +class FrontPanelPortBulkRenameForm(BulkRenameForm): + pk = forms.ModelMultipleChoiceField( + queryset=FrontPanelPort.objects.all(), + widget=forms.MultipleHiddenInput + ) + + +# +# Rear panel ports +# + +class RearPanelPortForm(BootstrapMixin, forms.ModelForm): + tags = TagField(required=False) + + class Meta: + model = RearPanelPort + fields = ['device', 'name', 'type', 'positions', 'tags'] + widgets = { + 'device': forms.HiddenInput(), + } + + +class RearPanelPortCreateForm(ComponentForm): + name_pattern = ExpandableNameField( + label='Name' + ) + type = forms.ChoiceField( + choices=PANELPORT_TYPE_CHOICES + ) + positions = forms.IntegerField( + min_value=1, + max_value=64, + initial=1, + help_text='The number of front ports which may be mapped to each rear port' + ) + + +class RearPanelPortBulkRenameForm(BulkRenameForm): + pk = forms.ModelMultipleChoiceField( + queryset=RearPanelPort.objects.all(), + widget=forms.MultipleHiddenInput + ) + + # # Device bays # diff --git a/netbox/dcim/migrations/0065_patch_panel_ports.py b/netbox/dcim/migrations/0065_patch_panel_ports.py new file mode 100644 index 000000000..48b77e561 --- /dev/null +++ b/netbox/dcim/migrations/0065_patch_panel_ports.py @@ -0,0 +1,114 @@ +# Generated by Django 2.0.8 on 2018-10-03 17:26 + +import django.core.validators +from django.db import migrations, models +import django.db.models.deletion +import taggit.managers + + +class Migration(migrations.Migration): + + dependencies = [ + ('taggit', '0002_auto_20150616_2121'), + ('dcim', '0064_remove_platform_rpc_client'), + ] + + operations = [ + migrations.CreateModel( + name='FrontPanelPort', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), + ('name', models.CharField(max_length=64)), + ('type', models.PositiveSmallIntegerField()), + ('rear_port_position', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(64)])), + ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_panel_ports', to='dcim.Device')), + ], + options={ + 'ordering': ['device', 'name'], + }, + ), + migrations.CreateModel( + name='FrontPanelPortTemplate', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), + ('name', models.CharField(max_length=64)), + ('type', models.PositiveSmallIntegerField()), + ('rear_port_position', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(64)])), + ], + options={ + 'ordering': ['device_type', 'name'], + }, + ), + migrations.CreateModel( + name='RearPanelPort', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), + ('name', models.CharField(max_length=64)), + ('type', models.PositiveSmallIntegerField()), + ('positions', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(64)])), + ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rear_panel_ports', to='dcim.Device')), + ('tags', taggit.managers.TaggableManager(through='taggit.TaggedItem', to='taggit.Tag')), + ], + options={ + 'ordering': ['device', 'name'], + }, + ), + migrations.CreateModel( + name='RearPanelPortTemplate', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), + ('name', models.CharField(max_length=64)), + ('type', models.PositiveSmallIntegerField()), + ('positions', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(64)])), + ], + options={ + 'ordering': ['device_type', 'name'], + }, + ), + migrations.AddField( + model_name='devicetype', + name='is_patch_panel', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='rearpanelporttemplate', + name='device_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rear_panel_port_templates', to='dcim.DeviceType'), + ), + migrations.AddField( + model_name='frontpanelporttemplate', + name='device_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_panel_port_templates', to='dcim.DeviceType'), + ), + migrations.AddField( + model_name='frontpanelporttemplate', + name='rear_port', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_panel_port_templates', to='dcim.RearPanelPortTemplate'), + ), + migrations.AddField( + model_name='frontpanelport', + name='rear_port', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_panel_ports', to='dcim.RearPanelPort'), + ), + migrations.AddField( + model_name='frontpanelport', + name='tags', + field=taggit.managers.TaggableManager(through='taggit.TaggedItem', to='taggit.Tag'), + ), + migrations.AlterUniqueTogether( + name='rearpanelporttemplate', + unique_together={('device_type', 'name')}, + ), + migrations.AlterUniqueTogether( + name='rearpanelport', + unique_together={('device', 'name')}, + ), + migrations.AlterUniqueTogether( + name='frontpanelporttemplate', + unique_together={('rear_port', 'rear_port_position'), ('device_type', 'name')}, + ), + migrations.AlterUniqueTogether( + name='frontpanelport', + unique_together={('device', 'name'), ('rear_port', 'rear_port_position')}, + ), + ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index cd471a834..cdbf78525 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -769,6 +769,11 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): verbose_name='Is a network device', help_text='This type of device has network interfaces' ) + is_patch_panel = models.BooleanField( + default=False, + verbose_name='Is a patch panel', + help_text='This type of device has patch panel ports' + ) subdevice_role = models.NullBooleanField( default=None, verbose_name='Parent/child status', @@ -789,7 +794,7 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): csv_headers = [ 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'is_console_server', - 'is_pdu', 'is_network_device', 'subdevice_role', 'interface_ordering', 'comments', + 'is_pdu', 'is_network_device', 'is_patch_panel', 'subdevice_role', 'interface_ordering', 'comments', ] class Meta: @@ -822,6 +827,7 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): self.is_console_server, self.is_pdu, self.is_network_device, + self.is_patch_panel, self.get_subdevice_role_display() if self.subdevice_role else None, self.get_interface_ordering_display(), self.comments, @@ -861,6 +867,14 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): "device before declassifying it as a network device." }) + if not self.is_patch_panel and ( + self.front_panel_port_templates.exists() or self.rear_panel_port_templates.exists() + ): + raise ValidationError({ + 'is_patch_panel': "Must delete all patch panel port templates associated with this device before " + "declassifying it as a network device." + }) + if self.subdevice_role != SUBDEVICE_ROLE_PARENT and self.device_bay_templates.count(): raise ValidationError({ 'subdevice_role': "Must delete all device bay templates associated with this device before " @@ -1000,6 +1014,86 @@ class InterfaceTemplate(ComponentTemplateModel): return self.name +class FrontPanelPortTemplate(ComponentTemplateModel): + """ + A template for a front patch panel port on a new Device. + """ + device_type = models.ForeignKey( + to='dcim.DeviceType', + on_delete=models.CASCADE, + related_name='front_panel_port_templates' + ) + name = models.CharField( + max_length=64 + ) + type = models.PositiveSmallIntegerField( + choices=PANELPORT_TYPE_CHOICES + ) + rear_port = models.ForeignKey( + to='dcim.RearPanelPortTemplate', + on_delete=models.CASCADE, + related_name='front_panel_port_templates' + ) + rear_port_position = models.PositiveSmallIntegerField( + default=1, + validators=[MinValueValidator(1), MaxValueValidator(64)] + ) + + class Meta: + ordering = ['device_type', 'name'] + unique_together = [ + ['device_type', 'name'], + ['rear_port', 'rear_port_position'], + ] + + def __str__(self): + return self.name + + def clean(self): + + # Validate rear port assignment + if self.rear_port.device_type != self.device_type: + raise ValidationError( + "Rear port ({}) must belong to the same device type".format(self.rear_port) + ) + + # Validate rear port position assignment + if self.rear_port_position > self.rear_port.positions: + raise ValidationError( + "Invalid rear port position ({}); rear port {} has only {} positions".format( + self.rear_port_position, self.rear_port.name, self.rear_port.positions + ) + ) + + +class RearPanelPortTemplate(ComponentTemplateModel): + """ + A template for a rear patch panel port on a new Device. + """ + device_type = models.ForeignKey( + to='dcim.DeviceType', + on_delete=models.CASCADE, + related_name='rear_panel_port_templates' + ) + name = models.CharField( + max_length=64 + ) + type = models.PositiveSmallIntegerField( + choices=PANELPORT_TYPE_CHOICES + ) + positions = models.PositiveSmallIntegerField( + default=1, + validators=[MinValueValidator(1), MaxValueValidator(64)] + ) + + class Meta: + ordering = ['device_type', 'name'] + unique_together = ['device_type', 'name'] + + def __str__(self): + return self.name + + class DeviceBayTemplate(ComponentTemplateModel): """ A template for a DeviceBay to be created for a new parent Device. @@ -1417,6 +1511,23 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): [Interface(device=self, name=template.name, form_factor=template.form_factor, mgmt_only=template.mgmt_only) for template in self.device_type.interface_templates.all()] ) + RearPanelPort.objects.bulk_create([ + RearPanelPort( + device=self, + name=template.name, + type=template.type, + positions=template.positions + ) for template in self.device_type.rear_panel_port_templates.all() + ]) + FrontPanelPort.objects.bulk_create([ + FrontPanelPort( + device=self, + name=template.name, + type=template.type, + rear_port=RearPanelPort.objects.get(device=self, name=template.rear_port.name), + rear_port_position=template.rear_port_position, + ) for template in self.device_type.front_panel_port_templates.all() + ]) DeviceBay.objects.bulk_create( [DeviceBay(device=self, name=template.name) for template in self.device_type.device_bay_templates.all()] @@ -2040,6 +2151,94 @@ class InterfaceConnection(models.Model): ).save() +# +# Patch panel ports +# + +class FrontPanelPort(ComponentModel): + """ + A port on the front of a patch panel. + """ + device = models.ForeignKey( + to='dcim.Device', + on_delete=models.CASCADE, + related_name='front_panel_ports' + ) + name = models.CharField( + max_length=64 + ) + type = models.PositiveSmallIntegerField( + choices=PANELPORT_TYPE_CHOICES + ) + rear_port = models.ForeignKey( + to='dcim.RearPanelPort', + on_delete=models.CASCADE, + related_name='front_panel_ports' + ) + rear_port_position = models.PositiveSmallIntegerField( + default=1, + validators=[MinValueValidator(1), MaxValueValidator(64)] + ) + + tags = TaggableManager() + + class Meta: + ordering = ['device', 'name'] + unique_together = [ + ['device', 'name'], + ['rear_port', 'rear_port_position'], + ] + + def __str__(self): + return self.name + + def clean(self): + + # Validate rear port assignment + if self.rear_port.device != self.device: + raise ValidationError( + "Rear port ({}) must belong to the same device".format(self.rear_port) + ) + + # Validate rear port position assignment + if self.rear_port_position > self.rear_port.positions: + raise ValidationError( + "Invalid rear port position ({}); rear port {} has only {} positions".format( + self.rear_port_position, self.rear_port.name, self.rear_port.positions + ) + ) + + +class RearPanelPort(ComponentModel): + """ + A port on the rear of a patch panel. + """ + device = models.ForeignKey( + to='dcim.Device', + on_delete=models.CASCADE, + related_name='rear_panel_ports' + ) + name = models.CharField( + max_length=64 + ) + type = models.PositiveSmallIntegerField( + choices=PANELPORT_TYPE_CHOICES + ) + positions = models.PositiveSmallIntegerField( + default=1, + validators=[MinValueValidator(1), MaxValueValidator(64)] + ) + + tags = TaggableManager() + + class Meta: + ordering = ['device', 'name'] + unique_together = ['device', 'name'] + + def __str__(self): + return self.name + + # # Device bays # diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 8c3606713..a1a2c7a4d 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -5,9 +5,10 @@ from tenancy.tables import COL_TENANT from utilities.tables import BaseTable, BooleanColumn, ToggleColumn from .models import ( ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, Interface, InterfaceConnection, InterfaceTemplate, InventoryItem, - Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, - RackReservation, Region, Site, VirtualChassis, + DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceConnection, + InterfaceTemplate, InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RearPanelPort, RearPanelPortTemplate, Region, Site, + VirtualChassis, ) REGION_LINK = """ @@ -348,6 +349,7 @@ class DeviceTypeTable(BaseTable): is_console_server = BooleanColumn(verbose_name='CS') is_pdu = BooleanColumn(verbose_name='PDU') is_network_device = BooleanColumn(verbose_name='Net') + is_patch_panel = BooleanColumn(verbose_name='PP') subdevice_role = tables.TemplateColumn( template_code=SUBDEVICE_ROLE_TEMPLATE, verbose_name='Subdevice Role' @@ -361,7 +363,7 @@ class DeviceTypeTable(BaseTable): model = DeviceType fields = ( 'pk', 'model', 'manufacturer', 'part_number', 'u_height', 'is_full_depth', 'is_console_server', 'is_pdu', - 'is_network_device', 'subdevice_role', 'instance_count', + 'is_network_device', 'is_patch_panel', 'subdevice_role', 'instance_count', ) @@ -415,6 +417,24 @@ class InterfaceTemplateTable(BaseTable): empty_text = "None" +class FrontPanelPortTemplateTable(BaseTable): + pk = ToggleColumn() + + class Meta(BaseTable.Meta): + model = FrontPanelPortTemplate + fields = ('pk', 'name', 'type', 'rear_port', 'rear_port_position') + empty_text = "None" + + +class RearPanelPortTemplateTable(BaseTable): + pk = ToggleColumn() + + class Meta(BaseTable.Meta): + model = RearPanelPortTemplate + fields = ('pk', 'name', 'type', 'positions') + empty_text = "None" + + class DeviceBayTemplateTable(BaseTable): pk = ToggleColumn() @@ -574,6 +594,22 @@ class InterfaceTable(BaseTable): fields = ('name', 'form_factor', 'lag', 'enabled', 'mgmt_only', 'description') +class FrontPanelPortTable(BaseTable): + + class Meta(BaseTable.Meta): + model = FrontPanelPort + fields = ('name', 'type', 'rear_port', 'rear_port_position') + empty_text = "None" + + +class RearPanelPortTable(BaseTable): + + class Meta(BaseTable.Meta): + model = RearPanelPort + fields = ('name', 'type', 'positions') + empty_text = "None" + + class DeviceBayTable(BaseTable): class Meta(BaseTable.Meta): diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 4ba91f215..2d9c8d009 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -109,6 +109,14 @@ urlpatterns = [ url(r'^device-types/(?P\d+)/interfaces/edit/$', views.InterfaceTemplateBulkEditView.as_view(), name='devicetype_bulkedit_interface'), url(r'^device-types/(?P\d+)/interfaces/delete/$', views.InterfaceTemplateBulkDeleteView.as_view(), name='devicetype_delete_interface'), + # Front panel port templates + url(r'^device-types/(?P\d+)/front-panel-ports/add/$', views.FrontPanelPortTemplateCreateView.as_view(), name='devicetype_add_frontpanelport'), + url(r'^device-types/(?P\d+)/front-panel-ports/delete/$', views.FrontPanelPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_frontpanelport'), + + # Front panel port templates + url(r'^device-types/(?P\d+)/rear-panel-ports/add/$', views.RearPanelPortTemplateCreateView.as_view(), name='devicetype_add_rearpanelport'), + url(r'^device-types/(?P\d+)/rear-panel-ports/delete/$', views.RearPanelPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_rearpanelport'), + # Device bay templates url(r'^device-types/(?P\d+)/device-bays/add/$', views.DeviceBayTemplateCreateView.as_view(), name='devicetype_add_devicebay'), url(r'^device-types/(?P\d+)/device-bays/delete/$', views.DeviceBayTemplateBulkDeleteView.as_view(), name='devicetype_delete_devicebay'), @@ -204,6 +212,22 @@ urlpatterns = [ url(r'^interfaces/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='interface_changelog', kwargs={'model': Interface}), url(r'^interfaces/rename/$', views.InterfaceBulkRenameView.as_view(), name='interface_bulk_rename'), + # Front panel ports + # url(r'^devices/front-panel-ports/add/$', views.DeviceBulkAddFrontPanelPortView.as_view(), name='device_bulk_add_frontpanelport'), + url(r'^devices/(?P\d+)/front-panel-ports/add/$', views.FrontPanelPortCreateView.as_view(), name='frontpanelport_add'), + url(r'^devices/(?P\d+)/front-panel-ports/delete/$', views.FrontPanelPortBulkDeleteView.as_view(), name='frontpanelport_bulk_delete'), + url(r'^front-panel-ports/(?P\d+)/edit/$', views.FrontPanelPortEditView.as_view(), name='frontpanelport_edit'), + url(r'^front-panel-ports/(?P\d+)/delete/$', views.FrontPanelPortDeleteView.as_view(), name='frontpanelport_delete'), + url(r'^front-panel-ports/rename/$', views.FrontPanelPortBulkRenameView.as_view(), name='frontpanelport_bulk_rename'), + + # Rear panel ports + # url(r'^devices/rear-panel-ports/add/$', views.DeviceBulkAddRearPanelPortView.as_view(), name='device_bulk_add_rearpanelport'), + url(r'^devices/(?P\d+)/rear-panel-ports/add/$', views.RearPanelPortCreateView.as_view(), name='rearpanelport_add'), + url(r'^devices/(?P\d+)/rear-panel-ports/delete/$', views.RearPanelPortBulkDeleteView.as_view(), name='rearpanelport_bulk_delete'), + url(r'^rear-panel-ports/(?P\d+)/edit/$', views.RearPanelPortEditView.as_view(), name='rearpanelport_edit'), + url(r'^rear-panel-ports/(?P\d+)/delete/$', views.RearPanelPortDeleteView.as_view(), name='rearpanelport_delete'), + url(r'^rear-panel-ports/rename/$', views.RearPanelPortBulkRenameView.as_view(), name='rearpanelport_bulk_rename'), + # Device bays url(r'^devices/device-bays/add/$', views.DeviceBulkAddDeviceBayView.as_view(), name='device_bulk_add_devicebay'), url(r'^devices/(?P\d+)/bays/add/$', views.DeviceBayCreateView.as_view(), name='devicebay_add'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 62f610ce5..c7e57b89f 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -31,9 +31,10 @@ from . import filters, forms, tables from .constants import CONNECTION_STATUS_CONNECTED from .models import ( ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, Interface, InterfaceConnection, InterfaceTemplate, Manufacturer, - InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, - RackReservation, RackRole, Region, Site, VirtualChassis, + DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceConnection, + InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, + VirtualChassis, ) @@ -559,6 +560,14 @@ class DeviceTypeView(View): ).filter(device_type=devicetype)), orderable=False ) + front_panel_port_table = tables.FrontPanelPortTemplateTable( + natsorted(FrontPanelPortTemplate.objects.filter(device_type=devicetype), key=attrgetter('name')), + orderable=False + ) + rear_panel_port_table = tables.RearPanelPortTemplateTable( + natsorted(RearPanelPortTemplate.objects.filter(device_type=devicetype), key=attrgetter('name')), + orderable=False + ) devicebay_table = tables.DeviceBayTemplateTable( natsorted(DeviceBayTemplate.objects.filter(device_type=devicetype), key=attrgetter('name')), orderable=False @@ -569,6 +578,8 @@ class DeviceTypeView(View): powerport_table.columns.show('pk') poweroutlet_table.columns.show('pk') interface_table.columns.show('pk') + front_panel_port_table.columns.show('pk') + rear_panel_port_table.columns.show('pk') devicebay_table.columns.show('pk') return render(request, 'dcim/devicetype.html', { @@ -578,6 +589,8 @@ class DeviceTypeView(View): 'powerport_table': powerport_table, 'poweroutlet_table': poweroutlet_table, 'interface_table': interface_table, + 'front_panel_port_table': front_panel_port_table, + 'rear_panel_port_table': rear_panel_port_table, 'devicebay_table': devicebay_table, }) @@ -721,6 +734,40 @@ class InterfaceTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): table = tables.InterfaceTemplateTable +class FrontPanelPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView): + permission_required = 'dcim.add_frontpanelporttemplate' + parent_model = DeviceType + parent_field = 'device_type' + model = FrontPanelPortTemplate + form = forms.FrontPanelPortTemplateCreateForm + model_form = forms.FrontPanelPortTemplateForm + template_name = 'dcim/device_component_add.html' + + +class FrontPanelPortTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_frontpanelporttemplate' + queryset = FrontPanelPortTemplate.objects.all() + parent_model = DeviceType + table = tables.FrontPanelPortTemplateTable + + +class RearPanelPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView): + permission_required = 'dcim.add_rearpanelporttemplate' + parent_model = DeviceType + parent_field = 'device_type' + model = RearPanelPortTemplate + form = forms.RearPanelPortTemplateCreateForm + model_form = forms.RearPanelPortTemplateForm + template_name = 'dcim/device_component_add.html' + + +class RearPanelPortTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_rearpanelporttemplate' + queryset = RearPanelPortTemplate.objects.all() + parent_model = DeviceType + table = tables.RearPanelPortTemplateTable + + class DeviceBayTemplateCreateView(PermissionRequiredMixin, ComponentCreateView): permission_required = 'dcim.add_devicebaytemplate' parent_model = DeviceType @@ -859,6 +906,12 @@ class DeviceView(View): 'circuit_termination__circuit' ).prefetch_related('ip_addresses') + # Front panel ports + front_panel_ports = device.front_panel_ports.select_related('rear_port') + + # Rear panel ports + rear_panel_ports = device.rear_panel_ports.all() + # Device bays device_bays = natsorted( DeviceBay.objects.filter(device=device).select_related('installed_device__device_type__manufacturer'), @@ -891,6 +944,8 @@ class DeviceView(View): 'power_outlets': power_outlets, 'interfaces': interfaces, 'device_bays': device_bays, + 'front_panel_ports': front_panel_ports, + 'rear_panel_ports': rear_panel_ports, 'services': services, 'secrets': secrets, 'vc_members': vc_members, @@ -1701,6 +1756,82 @@ class InterfaceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): table = tables.InterfaceTable +# +# Front panel ports +# + +class FrontPanelPortCreateView(PermissionRequiredMixin, ComponentCreateView): + permission_required = 'dcim.add_frontpanelport' + parent_model = Device + parent_field = 'device' + model = FrontPanelPort + form = forms.FrontPanelPortCreateForm + model_form = forms.FrontPanelPortForm + template_name = 'dcim/device_component_add.html' + + +class FrontPanelPortEditView(PermissionRequiredMixin, ObjectEditView): + permission_required = 'dcim.change_frontpanelport' + model = FrontPanelPort + model_form = forms.FrontPanelPortForm + + +class FrontPanelPortDeleteView(PermissionRequiredMixin, ObjectDeleteView): + permission_required = 'dcim.delete_frontpanelport' + model = FrontPanelPort + + +class FrontPanelPortBulkRenameView(PermissionRequiredMixin, BulkRenameView): + permission_required = 'dcim.change_frontpanelport' + queryset = FrontPanelPort.objects.all() + form = forms.FrontPanelPortBulkRenameForm + + +class FrontPanelPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_frontpanelport' + queryset = FrontPanelPort.objects.all() + parent_model = Device + table = tables.FrontPanelPortTable + + +# +# Rear panel ports +# + +class RearPanelPortCreateView(PermissionRequiredMixin, ComponentCreateView): + permission_required = 'dcim.add_rearpanelport' + parent_model = Device + parent_field = 'device' + model = RearPanelPort + form = forms.RearPanelPortCreateForm + model_form = forms.RearPanelPortForm + template_name = 'dcim/device_component_add.html' + + +class RearPanelPortEditView(PermissionRequiredMixin, ObjectEditView): + permission_required = 'dcim.change_rearpanelport' + model = RearPanelPort + model_form = forms.RearPanelPortForm + + +class RearPanelPortDeleteView(PermissionRequiredMixin, ObjectDeleteView): + permission_required = 'dcim.delete_rearpanelport' + model = RearPanelPort + + +class RearPanelPortBulkRenameView(PermissionRequiredMixin, BulkRenameView): + permission_required = 'dcim.change_rearpanelport' + queryset = RearPanelPort.objects.all() + form = forms.RearPanelPortBulkRenameForm + + +class RearPanelPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_rearpanelport' + queryset = RearPanelPort.objects.all() + parent_model = Device + table = tables.RearPanelPortTable + + # # Device bays # diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 7b56269b1..50f8ebbb5 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -689,6 +689,111 @@ {% endif %} {% endif %} + {% if front_panel_ports or device.device_type.is_patch_panel %} +
+ {% csrf_token %} +
+
+ Front Panel Ports +
+ + + + {% if perms.dcim.change_frontpanelport or perms.dcim.delete_frontpanelport %} + + {% endif %} + + + + + + + + + {% for frontpanelport in front_panel_ports %} + {% include 'dcim/inc/frontpanelport.html' %} + {% empty %} + + + + {% endfor %} + +
NameTypeRear PortPosition
— No front panel ports defined —
+
+ {% if front_panel_ports and perms.dcim.change_frontpanelport %} + + {% endif %} + {% if front_panel_ports and perms.dcim.delete_frontpanelport %} + + {% endif %} + {% if perms.dcim.add_frontpanelport %} +
+ + Add front panel ports + +
+
+ {% endif %} +
+
+
+ {% endif %} + {% if rear_panel_ports or device.device_type.is_patch_panel %} +
+ {% csrf_token %} +
+
+ Rear Panel Ports +
+ + + + {% if perms.dcim.change_rearpanelport or perms.dcim.delete_rearpanelport %} + + {% endif %} + + + + + + + + {% for rearpanelport in rear_panel_ports %} + {% include 'dcim/inc/rearpanelport.html' %} + {% empty %} + + + + {% endfor %} + +
NameTypePositions
— No rear panel ports defined —
+
+ {% if rear_panel_ports and perms.dcim.change_rearpanelport %} + + {% endif %} + {% if rear_panel_ports and perms.dcim.delete_rearpanelport %} + + {% endif %} + {% if perms.dcim.add_rearpanelport %} +
+ + Add rear panel ports + +
+
+ {% endif %} +
+
+
+ {% endif %}
{% include 'inc/graphs_modal.html' %} diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 652c291e6..9d7f94b24 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -135,6 +135,19 @@ This device {% if devicetype.is_network_device %}has{% else %}does not have{% endif %} network interfaces + + + {% if devicetype.is_patch_panel %} + + {% else %} + + {% endif %} + + + Patch Panel
+ This device {% if devicetype.is_patch_panel %}has{% else %}does not have{% endif %} patch panel ports + + {% if devicetype.subdevice_role == True %} @@ -188,6 +201,12 @@ {% if devicetype.is_pdu or poweroutlet_table.rows %} {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' add_url='dcim:devicetype_add_poweroutlet' delete_url='dcim:devicetype_delete_poweroutlet' %} {% endif %} + {% if devicetype.is_patch_panel or front_panel_port_table.rows %} + {% include 'dcim/inc/devicetype_component_table.html' with table=front_panel_port_table title='Front Panel Ports' add_url='dcim:devicetype_add_frontpanelport' delete_url='dcim:devicetype_delete_frontpanelport' %} + {% endif %} + {% if devicetype.is_patch_panel or rear_panel_port_table.rows %} + {% include 'dcim/inc/devicetype_component_table.html' with table=rear_panel_port_table title='Rear Panel Ports' add_url='dcim:devicetype_add_rearpanelport' delete_url='dcim:devicetype_delete_rearpanelport' %} + {% endif %} {% endblock %} diff --git a/netbox/templates/dcim/devicetype_edit.html b/netbox/templates/dcim/devicetype_edit.html index d0ed2c204..14b8103e3 100644 --- a/netbox/templates/dcim/devicetype_edit.html +++ b/netbox/templates/dcim/devicetype_edit.html @@ -20,6 +20,7 @@ {% render_field form.is_console_server %} {% render_field form.is_pdu %} {% render_field form.is_network_device %} + {% render_field form.is_patch_panel %} {% render_field form.subdevice_role %} diff --git a/netbox/templates/dcim/inc/frontpanelport.html b/netbox/templates/dcim/inc/frontpanelport.html new file mode 100644 index 000000000..bef4c24c7 --- /dev/null +++ b/netbox/templates/dcim/inc/frontpanelport.html @@ -0,0 +1,25 @@ + + {% if perms.dcim.change_frontpanelport or perms.dcim.delete_frontpanelport %} + + + + {% endif %} + + {{ frontpanelport }} + + {{ frontpanelport.get_type_display }} + {{ frontpanelport.rear_port }} + {{ frontpanelport.rear_port_position }} + + {% if perms.dcim.change_frontpanelport %} + + + + {% endif %} + {% if perms.dcim.delete_frontpanelport %} + + + + {% endif %} + + diff --git a/netbox/templates/dcim/inc/rearpanelport.html b/netbox/templates/dcim/inc/rearpanelport.html new file mode 100644 index 000000000..a781de727 --- /dev/null +++ b/netbox/templates/dcim/inc/rearpanelport.html @@ -0,0 +1,24 @@ + + {% if perms.dcim.change_rearpanelport or perms.dcim.delete_rearpanelport %} + + + + {% endif %} + + {{ rearpanelport }} + + {{ rearpanelport.get_type_display }} + {{ rearpanelport.positions }} + + {% if perms.dcim.change_rearpanelport %} + + + + {% endif %} + {% if perms.dcim.delete_rearpanelport %} + + + + {% endif %} + + diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index ac8597dc5..966a0095e 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -643,6 +643,9 @@ class ComponentForm(BootstrapMixin, forms.Form): self.parent = parent super(ComponentForm, self).__init__(*args, **kwargs) + def get_iterative_data(self, iteration): + return {} + class BulkEditForm(forms.Form): """ diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index df0ca63cf..0e36f3220 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -711,10 +711,11 @@ class ComponentCreateView(View): data = deepcopy(request.POST) data[self.parent_field] = parent.pk - for name in form.cleaned_data['name_pattern']: + for i, name in enumerate(form.cleaned_data['name_pattern']): # Initialize the individual component form data['name'] = name + data.update(form.get_iterative_data(i)) component_form = self.model_form(data) if component_form.is_valid(): From ea5121ffe1adbdca08489fd0adf08592780012bb Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 18 Oct 2018 15:43:55 -0400 Subject: [PATCH 010/191] Preliminary work on Cables --- netbox/dcim/constants.py | 17 +++ netbox/dcim/migrations/0066_cables.py | 178 ++++++++++++++++++++++++++ netbox/dcim/models.py | 100 ++++++++++++++- netbox/dcim/signals.py | 28 +++- 4 files changed, 315 insertions(+), 8 deletions(-) create mode 100644 netbox/dcim/migrations/0066_cables.py diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index d51ec97f3..d63735347 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -282,3 +282,20 @@ CONNECTION_STATUS_CHOICES = [ [CONNECTION_STATUS_PLANNED, 'Planned'], [CONNECTION_STATUS_CONNECTED, 'Connected'], ] + +# Cable endpoint types +CABLE_ENDPOINT_TYPES = ( + 'consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', +) +CABLE_CONNECTION_TYPES = CABLE_ENDPOINT_TYPES + ( + 'frontpanelport', 'rearpanelport', +) + +# Cable types +# TODO: Add more types +CABLE_TYPE_COPPER = 1000 +CABLE_TYPE_FIBER = 2000 +CABLE_TYPE_CHOICES = ( + (CABLE_TYPE_COPPER, 'Copper'), + (CABLE_TYPE_FIBER, 'Fiber'), +) diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py new file mode 100644 index 000000000..2650e1636 --- /dev/null +++ b/netbox/dcim/migrations/0066_cables.py @@ -0,0 +1,178 @@ +# Generated by Django 2.0.8 on 2018-10-18 19:41 + +from django.db import migrations, models +import django.db.models.deletion +import utilities.fields + + +def console_connections_to_cables(apps, schema_editor): + """ + Copy all existing console connections as Cables + """ + ConsolePort = apps.get_model('dcim', 'ConsolePort') + Cable = apps.get_model('dcim', 'Cable') + + # Load content types + ContentType = apps.get_model('contenttypes', 'ContentType') + consoleport_type = ContentType.objects.get(app_label='dcim', model='consoleport') + consoleserverport_type = ContentType.objects.get(app_label='dcim', model='consoleserverport') + + # Create a new Cable instance from each console connection + for consoleport in ConsolePort.objects.filter(cs_port__isnull=False): + c = Cable() + # We have to assign GFK fields manually because we're inside a migration. + c.endpoint_a_type = consoleport_type + c.endpoint_a_id = consoleport.id + c.endpoint_b_type = consoleserverport_type + c.endpoint_b_id = consoleport.cs_port_id + c.connection_status = consoleport.connection_status + c.save() + + +def power_connections_to_cables(apps, schema_editor): + """ + Copy all existing power connections as Cables + """ + PowerPort = apps.get_model('dcim', 'PowerPort') + Cable = apps.get_model('dcim', 'Cable') + + # Load content types + ContentType = apps.get_model('contenttypes', 'ContentType') + powerport_type = ContentType.objects.get(app_label='dcim', model='powerport') + poweroutlet_type = ContentType.objects.get(app_label='dcim', model='poweroutlet') + + # Create a new Cable instance from each power connection + for powerport in PowerPort.objects.filter(power_outlet__isnull=False): + c = Cable() + # We have to assign GFK fields manually because we're inside a migration. + c.endpoint_a_type = powerport_type + c.endpoint_a_id = powerport.id + c.endpoint_b_type = poweroutlet_type + c.endpoint_b_id = powerport.power_outlet_id + c.connection_status = powerport.connection_status + c.save() + + +def interface_connections_to_cables(apps, schema_editor): + """ + Copy all InterfaceConnections as Cables + """ + InterfaceConnection = apps.get_model('dcim', 'InterfaceConnection') + Cable = apps.get_model('dcim', 'Cable') + + # Load content types + ContentType = apps.get_model('contenttypes', 'ContentType') + interface_type = ContentType.objects.get(app_label='dcim', model='interface') + + # Create a new Cable instance from each InterfaceConnection + for conn in InterfaceConnection.objects.all(): + c = Cable() + # We have to assign GFK fields manually because we're inside a migration. + c.endpoint_a_type = interface_type + c.endpoint_a_id = conn.interface_a_id + c.endpoint_b_type = interface_type + c.endpoint_b_id = conn.interface_b_id + c.connection_status = conn.connection_status + c.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('dcim', '0065_patch_panel_ports'), + ] + + operations = [ + migrations.CreateModel( + name='Cable', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), + ('created', models.DateField(auto_now_add=True, null=True)), + ('last_updated', models.DateTimeField(auto_now=True, null=True)), + ('endpoint_a_id', models.PositiveIntegerField()), + ('endpoint_b_id', models.PositiveIntegerField()), + ('type', models.PositiveSmallIntegerField(blank=True, null=True)), + ('status', models.BooleanField(default=True)), + ('label', models.CharField(blank=True, max_length=100)), + ('color', utilities.fields.ColorField(blank=True, max_length=6)), + ('endpoint_a_type', models.ForeignKey(limit_choices_to={'model__in': ('consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport')}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), + ('endpoint_b_type', models.ForeignKey(limit_choices_to={'model__in': ('consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport')}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), + ], + ), + migrations.AddField( + model_name='consoleport', + name='connected_endpoint_id', + field=models.PositiveIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='consoleport', + name='connected_endpoint_type', + field=models.ForeignKey(blank=True, limit_choices_to={'model__in': ('consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport')}, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType'), + ), + migrations.AddField( + model_name='consoleserverport', + name='connected_endpoint_id', + field=models.PositiveIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='consoleserverport', + name='connected_endpoint_type', + field=models.ForeignKey(blank=True, limit_choices_to={'model__in': ('consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport')}, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType'), + ), + migrations.AddField( + model_name='consoleserverport', + name='connection_status', + field=models.NullBooleanField(default=True), + ), + migrations.AddField( + model_name='interface', + name='connected_endpoint_id', + field=models.PositiveIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='interface', + name='connected_endpoint_type', + field=models.ForeignKey(blank=True, limit_choices_to={'model__in': ('consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport')}, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType'), + ), + migrations.AddField( + model_name='interface', + name='connection_status', + field=models.NullBooleanField(default=True), + ), + migrations.AddField( + model_name='poweroutlet', + name='connected_endpoint_id', + field=models.PositiveIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='poweroutlet', + name='connected_endpoint_type', + field=models.ForeignKey(blank=True, limit_choices_to={'model__in': ('consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport')}, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType'), + ), + migrations.AddField( + model_name='poweroutlet', + name='connection_status', + field=models.NullBooleanField(default=True), + ), + migrations.AddField( + model_name='powerport', + name='connected_endpoint_id', + field=models.PositiveIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='powerport', + name='connected_endpoint_type', + field=models.ForeignKey(blank=True, limit_choices_to={'model__in': ('consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport')}, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType'), + ), + migrations.AlterUniqueTogether( + name='cable', + unique_together={('endpoint_b_type', 'endpoint_b_id'), ('endpoint_a_type', 'endpoint_a_id')}, + ), + + # Copy console/power/interface connections as Cables + migrations.RunPython(console_connections_to_cables), + migrations.RunPython(power_connections_to_cables), + migrations.RunPython(interface_connections_to_cables), + + ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index cdbf78525..0a4d8afc5 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -3,7 +3,8 @@ from itertools import count, groupby from django.conf import settings from django.contrib.auth.models import User -from django.contrib.contenttypes.fields import GenericRelation +from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation +from django.contrib.contenttypes.models import ContentType from django.contrib.postgres.fields import ArrayField, JSONField from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.core.validators import MaxValueValidator, MinValueValidator @@ -65,6 +66,32 @@ class ComponentModel(models.Model): ).save() +class ConnectableModel(models.Model): + connected_endpoint_type = models.ForeignKey( + to=ContentType, + limit_choices_to={'model__in': CABLE_ENDPOINT_TYPES}, + on_delete=models.PROTECT, + related_name='+', + blank=True, + null=True + ) + connected_endpoint_id = models.PositiveIntegerField( + blank=True, + null=True + ) + connected_endpoint = GenericForeignKey( + ct_field='connected_endpoint_type', + fk_field='connected_endpoint_id' + ) + connection_status = models.NullBooleanField( + choices=CONNECTION_STATUS_CHOICES, + default=CONNECTION_STATUS_CONNECTED + ) + + class Meta: + abstract = True + + # # Regions # @@ -1616,7 +1643,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): # Console ports # -class ConsolePort(ComponentModel): +class ConsolePort(ConnectableModel, ComponentModel): """ A physical console port within a Device. ConsolePorts connect to ConsoleServerPorts. """ @@ -1679,7 +1706,7 @@ class ConsoleServerPortManager(models.Manager): }).order_by('device', 'name_padded') -class ConsoleServerPort(ComponentModel): +class ConsoleServerPort(ConnectableModel, ComponentModel): """ A physical port within a Device (typically a designated console server) which provides access to ConsolePorts. """ @@ -1720,7 +1747,7 @@ class ConsoleServerPort(ComponentModel): # Power ports # -class PowerPort(ComponentModel): +class PowerPort(ConnectableModel, ComponentModel): """ A physical power supply (intake) port within a Device. PowerPorts connect to PowerOutlets. """ @@ -1782,7 +1809,7 @@ class PowerOutletManager(models.Manager): }).order_by('device', 'name_padded') -class PowerOutlet(ComponentModel): +class PowerOutlet(ConnectableModel, ComponentModel): """ A physical power outlet (output) within a Device which provides power to a PowerPort. """ @@ -1823,7 +1850,7 @@ class PowerOutlet(ComponentModel): # Interfaces # -class Interface(ComponentModel): +class Interface(ConnectableModel, ComponentModel): """ A network interface within a Device or VirtualMachine. A physical Interface can connect to exactly one other Interface via the creation of an InterfaceConnection. @@ -2423,3 +2450,64 @@ class VirtualChassis(ChangeLoggedModel): self.master, self.domain, ) + + +# +# Cables +# + +class Cable(ChangeLoggedModel): + """ + A physical connection between two endpoints. + """ + endpoint_a_type = models.ForeignKey( + to=ContentType, + limit_choices_to={'model__in': CABLE_CONNECTION_TYPES}, + on_delete=models.PROTECT, + related_name='+' + ) + endpoint_a_id = models.PositiveIntegerField() + endpoint_a = GenericForeignKey( + ct_field='endpoint_a_type', + fk_field='endpoint_a_id' + ) + endpoint_b_type = models.ForeignKey( + to=ContentType, + limit_choices_to={'model__in': CABLE_CONNECTION_TYPES}, + on_delete=models.PROTECT, + related_name='+' + ) + endpoint_b_id = models.PositiveIntegerField() + endpoint_b = GenericForeignKey( + ct_field='endpoint_b_type', + fk_field='endpoint_b_id' + ) + type = models.PositiveSmallIntegerField( + choices=CABLE_TYPE_CHOICES, + blank=True, + null=True + ) + status = models.BooleanField( + choices=CONNECTION_STATUS_CHOICES, + default=CONNECTION_STATUS_CONNECTED + ) + label = models.CharField( + max_length=100, + blank=True + ) + color = ColorField( + blank=True + ) + + class Meta: + unique_together = ( + ('endpoint_a_type', 'endpoint_a_id'), + ('endpoint_b_type', 'endpoint_b_id'), + ) + + # TODO: This should follow all cables in a path + def get_path_endpoints(self): + """ + Return the endpoints connected by this cable path. + """ + return (self.endpoint_a, self.endpoint_b) diff --git a/netbox/dcim/signals.py b/netbox/dcim/signals.py index 2aefdc229..68dce2938 100644 --- a/netbox/dcim/signals.py +++ b/netbox/dcim/signals.py @@ -1,7 +1,7 @@ -from django.db.models.signals import post_save, pre_delete +from django.db.models.signals import post_save, post_delete, pre_delete from django.dispatch import receiver -from .models import Device, VirtualChassis +from .models import Cable, Device, VirtualChassis @receiver(post_save, sender=VirtualChassis) @@ -19,3 +19,27 @@ def clear_virtualchassis_members(instance, **kwargs): When a VirtualChassis is deleted, nullify the vc_position and vc_priority fields of its prior members. """ Device.objects.filter(virtual_chassis=instance.pk).update(vc_position=None, vc_priority=None) + + +@receiver(post_save, sender=Cable) +def update_connected_endpoints(instance, **kwargs): + """ + When a Cable is saved, update its connected endpoints. + """ + endpoint_a, endpoint_b = instance.get_path_endpoints() + endpoint_a.connected_endpoint = endpoint_b + endpoint_a.save() + endpoint_b.connected_endpoint = endpoint_a + endpoint_b.save() + + +@receiver(post_delete, sender=Cable) +def nullify_connected_endpoints(instance, **kwargs): + """ + When a Cable is deleted, nullify its connected endpoints. + """ + endpoint_a, endpoint_b = instance.get_path_endpoints() + endpoint_a.connected_endpoint = None + endpoint_a.save() + endpoint_b.connected_endpoint = None + endpoint_b.save() From d908dffab7a672b9243e8256162f644331e2c4c8 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 19 Oct 2018 10:38:15 -0400 Subject: [PATCH 011/191] Fixed content type assignment within migration --- netbox/dcim/migrations/0066_cables.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py index 2650e1636..6774f4c34 100644 --- a/netbox/dcim/migrations/0066_cables.py +++ b/netbox/dcim/migrations/0066_cables.py @@ -9,13 +9,14 @@ def console_connections_to_cables(apps, schema_editor): """ Copy all existing console connections as Cables """ + ContentType = apps.get_model('contenttypes', 'ContentType') ConsolePort = apps.get_model('dcim', 'ConsolePort') + ConsoleServerPort = apps.get_model('dcim', 'ConsoleServerPort') Cable = apps.get_model('dcim', 'Cable') # Load content types - ContentType = apps.get_model('contenttypes', 'ContentType') - consoleport_type = ContentType.objects.get(app_label='dcim', model='consoleport') - consoleserverport_type = ContentType.objects.get(app_label='dcim', model='consoleserverport') + consoleport_type = ContentType.objects.get_for_model(ConsolePort) + consoleserverport_type = ContentType.objects.get_for_model(ConsoleServerPort) # Create a new Cable instance from each console connection for consoleport in ConsolePort.objects.filter(cs_port__isnull=False): @@ -33,13 +34,14 @@ def power_connections_to_cables(apps, schema_editor): """ Copy all existing power connections as Cables """ + ContentType = apps.get_model('contenttypes', 'ContentType') PowerPort = apps.get_model('dcim', 'PowerPort') + PowerOutlet = apps.get_model('dcim', 'PowerOutlet') Cable = apps.get_model('dcim', 'Cable') # Load content types - ContentType = apps.get_model('contenttypes', 'ContentType') - powerport_type = ContentType.objects.get(app_label='dcim', model='powerport') - poweroutlet_type = ContentType.objects.get(app_label='dcim', model='poweroutlet') + powerport_type = ContentType.objects.get_for_model(PowerPort) + poweroutlet_type = ContentType.objects.get_for_model(PowerOutlet) # Create a new Cable instance from each power connection for powerport in PowerPort.objects.filter(power_outlet__isnull=False): @@ -57,12 +59,13 @@ def interface_connections_to_cables(apps, schema_editor): """ Copy all InterfaceConnections as Cables """ + ContentType = apps.get_model('contenttypes', 'ContentType') + Interface = apps.get_model('dcim', 'Interface') InterfaceConnection = apps.get_model('dcim', 'InterfaceConnection') Cable = apps.get_model('dcim', 'Cable') # Load content types - ContentType = apps.get_model('contenttypes', 'ContentType') - interface_type = ContentType.objects.get(app_label='dcim', model='interface') + interface_type = ContentType.objects.get_for_model(Interface) # Create a new Cable instance from each InterfaceConnection for conn in InterfaceConnection.objects.all(): From 59af8cc924a08f3954c1eac3498fcdb9e99ebfa4 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 19 Oct 2018 11:56:12 -0400 Subject: [PATCH 012/191] Remove ConnectableModel --- netbox/dcim/migrations/0066_cables.py | 65 --------------------------- netbox/dcim/models.py | 36 +++------------ 2 files changed, 5 insertions(+), 96 deletions(-) diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py index 6774f4c34..342590d20 100644 --- a/netbox/dcim/migrations/0066_cables.py +++ b/netbox/dcim/migrations/0066_cables.py @@ -103,71 +103,6 @@ class Migration(migrations.Migration): ('endpoint_b_type', models.ForeignKey(limit_choices_to={'model__in': ('consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport')}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), ], ), - migrations.AddField( - model_name='consoleport', - name='connected_endpoint_id', - field=models.PositiveIntegerField(blank=True, null=True), - ), - migrations.AddField( - model_name='consoleport', - name='connected_endpoint_type', - field=models.ForeignKey(blank=True, limit_choices_to={'model__in': ('consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport')}, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType'), - ), - migrations.AddField( - model_name='consoleserverport', - name='connected_endpoint_id', - field=models.PositiveIntegerField(blank=True, null=True), - ), - migrations.AddField( - model_name='consoleserverport', - name='connected_endpoint_type', - field=models.ForeignKey(blank=True, limit_choices_to={'model__in': ('consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport')}, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType'), - ), - migrations.AddField( - model_name='consoleserverport', - name='connection_status', - field=models.NullBooleanField(default=True), - ), - migrations.AddField( - model_name='interface', - name='connected_endpoint_id', - field=models.PositiveIntegerField(blank=True, null=True), - ), - migrations.AddField( - model_name='interface', - name='connected_endpoint_type', - field=models.ForeignKey(blank=True, limit_choices_to={'model__in': ('consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport')}, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType'), - ), - migrations.AddField( - model_name='interface', - name='connection_status', - field=models.NullBooleanField(default=True), - ), - migrations.AddField( - model_name='poweroutlet', - name='connected_endpoint_id', - field=models.PositiveIntegerField(blank=True, null=True), - ), - migrations.AddField( - model_name='poweroutlet', - name='connected_endpoint_type', - field=models.ForeignKey(blank=True, limit_choices_to={'model__in': ('consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport')}, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType'), - ), - migrations.AddField( - model_name='poweroutlet', - name='connection_status', - field=models.NullBooleanField(default=True), - ), - migrations.AddField( - model_name='powerport', - name='connected_endpoint_id', - field=models.PositiveIntegerField(blank=True, null=True), - ), - migrations.AddField( - model_name='powerport', - name='connected_endpoint_type', - field=models.ForeignKey(blank=True, limit_choices_to={'model__in': ('consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport')}, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType'), - ), migrations.AlterUniqueTogether( name='cable', unique_together={('endpoint_b_type', 'endpoint_b_id'), ('endpoint_a_type', 'endpoint_a_id')}, diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 0a4d8afc5..efa961d5b 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -66,32 +66,6 @@ class ComponentModel(models.Model): ).save() -class ConnectableModel(models.Model): - connected_endpoint_type = models.ForeignKey( - to=ContentType, - limit_choices_to={'model__in': CABLE_ENDPOINT_TYPES}, - on_delete=models.PROTECT, - related_name='+', - blank=True, - null=True - ) - connected_endpoint_id = models.PositiveIntegerField( - blank=True, - null=True - ) - connected_endpoint = GenericForeignKey( - ct_field='connected_endpoint_type', - fk_field='connected_endpoint_id' - ) - connection_status = models.NullBooleanField( - choices=CONNECTION_STATUS_CHOICES, - default=CONNECTION_STATUS_CONNECTED - ) - - class Meta: - abstract = True - - # # Regions # @@ -1643,7 +1617,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): # Console ports # -class ConsolePort(ConnectableModel, ComponentModel): +class ConsolePort(ComponentModel): """ A physical console port within a Device. ConsolePorts connect to ConsoleServerPorts. """ @@ -1706,7 +1680,7 @@ class ConsoleServerPortManager(models.Manager): }).order_by('device', 'name_padded') -class ConsoleServerPort(ConnectableModel, ComponentModel): +class ConsoleServerPort(ComponentModel): """ A physical port within a Device (typically a designated console server) which provides access to ConsolePorts. """ @@ -1747,7 +1721,7 @@ class ConsoleServerPort(ConnectableModel, ComponentModel): # Power ports # -class PowerPort(ConnectableModel, ComponentModel): +class PowerPort(ComponentModel): """ A physical power supply (intake) port within a Device. PowerPorts connect to PowerOutlets. """ @@ -1809,7 +1783,7 @@ class PowerOutletManager(models.Manager): }).order_by('device', 'name_padded') -class PowerOutlet(ConnectableModel, ComponentModel): +class PowerOutlet(ComponentModel): """ A physical power outlet (output) within a Device which provides power to a PowerPort. """ @@ -1850,7 +1824,7 @@ class PowerOutlet(ConnectableModel, ComponentModel): # Interfaces # -class Interface(ConnectableModel, ComponentModel): +class Interface(ComponentModel): """ A network interface within a Device or VirtualMachine. A physical Interface can connect to exactly one other Interface via the creation of an InterfaceConnection. From 471bddea097a6fbd1d2128140919d2ebdeea8234 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 22 Oct 2018 16:58:24 -0400 Subject: [PATCH 013/191] WIP: Initial work on the cable connection form --- netbox/dcim/constants.py | 30 ++++- netbox/dcim/forms.py | 93 ++++++++++++++- netbox/dcim/models.py | 4 +- netbox/dcim/urls.py | 12 +- netbox/dcim/views.py | 27 ++++- netbox/project-static/js/forms.js | 5 +- netbox/templates/dcim/cable_connect.html | 106 ++++++++++++++++++ netbox/templates/dcim/inc/consoleport.html | 2 +- .../templates/dcim/inc/consoleserverport.html | 2 +- netbox/templates/dcim/inc/poweroutlet.html | 2 +- netbox/templates/dcim/inc/powerport.html | 2 +- netbox/utilities/forms.py | 9 ++ .../templates/widgets/select_contenttype.html | 1 + 13 files changed, 275 insertions(+), 20 deletions(-) create mode 100644 netbox/templates/dcim/cable_connect.html create mode 100644 netbox/utilities/templates/widgets/select_contenttype.html diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index d63735347..7b11028d4 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -284,12 +284,9 @@ CONNECTION_STATUS_CHOICES = [ ] # Cable endpoint types -CABLE_ENDPOINT_TYPES = ( - 'consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', -) -CABLE_CONNECTION_TYPES = CABLE_ENDPOINT_TYPES + ( - 'frontpanelport', 'rearpanelport', -) +CABLE_ENDPOINT_TYPES = [ + 'consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport', +] # Cable types # TODO: Add more types @@ -299,3 +296,24 @@ CABLE_TYPE_CHOICES = ( (CABLE_TYPE_COPPER, 'Copper'), (CABLE_TYPE_FIBER, 'Fiber'), ) + +CABLE_ENDPOINT_TYPE_CHOICES = { + # (API endpoint, human-friendly name) + 'consoleport': ('console-ports', 'Console port'), + 'consoleserverport': ('console-server-ports', 'Console server port'), + 'powerport': ('power-ports', 'Power port'), + 'poweroutlet': ('power-outlets', 'Power outlet'), + 'interface': ('interfaces', 'Interface'), + 'frontpanelport': ('front-panel-ports', 'Front panel port'), + 'rearpanelport': ('rear-panel-ports', 'Rear panel port'), +} + +COMPATIBLE_ENDPOINT_TYPES = { + 'consoleport': ['consoleserverport', 'frontpanelport', 'rearpanelport'], + 'consoleserverport': ['consoleport', 'frontpanelport', 'rearpanelport'], + 'powerport': ['poweroutlet'], + 'poweroutlet': ['powerport'], + 'interface': ['interface', 'frontpanelport', 'rearpanelport'], + 'frontpanelport': ['consoleport', 'consoleserverport', 'interface', 'frontpanelport', 'rearpanelport'], + 'rearpanelport': ['consoleport', 'consoleserverport', 'interface', 'frontpanelport', 'rearpanelport'], +} diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 79913b70c..9565d5ef0 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -2,6 +2,7 @@ import re from django import forms from django.contrib.auth.models import User +from django.contrib.contenttypes.models import ContentType from django.contrib.postgres.forms.array import SimpleArrayField from django.db.models import Count, Q from mptt.forms import TreeNodeChoiceField @@ -19,11 +20,12 @@ from utilities.forms import ( BulkEditNullBooleanSelect, ChainedFieldsMixin, ChainedModelChoiceField, CommentField, ComponentForm, ConfirmationForm, CSVChoiceField, ExpandableNameField, FilterChoiceField, FilterTreeNodeMultipleChoiceField, FlexibleModelChoiceField, JSONField, Livesearch, SelectWithDisabled, SelectWithPK, SmallTextarea, SlugField, + ContentTypeSelect ) from virtualization.models import Cluster from .constants import * from .models import ( - DeviceBay, DeviceBayTemplate, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, + Cable, DeviceBay, DeviceBayTemplate, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceConnection, InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, @@ -2298,6 +2300,95 @@ class RearPanelPortBulkRenameForm(BulkRenameForm): ) +# +# Cables +# + +class CableForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): + endpoint_b_site = forms.ModelChoiceField( + queryset=Site.objects.all(), + label='Site', + required=False, + widget=forms.Select( + attrs={'filter-for': 'endpoint_b_rack'} + ) + ) + endpoint_b_rack = ChainedModelChoiceField( + queryset=Rack.objects.all(), + chains=( + ('site', 'endpoint_b_site'), + ), + label='Rack', + required=False, + widget=APISelect( + api_url='/api/dcim/racks/?site_id={{endpoint_b_site}}', + attrs={'filter-for': 'endpoint_b_device', 'nullable': 'true'} + ) + ) + endpoint_b_device = ChainedModelChoiceField( + queryset=Device.objects.all(), + chains=( + ('site', 'endpoint_b_site'), + ('rack', 'endpoint_b_rack'), + ), + label='Device', + required=False, + widget=APISelect( + api_url='/api/dcim/devices/?site_id={{endpoint_b_site}}&rack_id={{endpoint_b_rack}}', + display_field='display_name', + attrs={'filter-for': 'endpoint_b_id'} + ) + ) + livesearch = forms.CharField( + required=False, + label='Device', + widget=Livesearch( + query_key='q', + query_url='dcim-api:device-list', + field_to_update='endpoint_b_device' + ) + ) + endpoint_b_type = forms.ModelChoiceField( + queryset=ContentType.objects.all(), + label='Type', + widget=ContentTypeSelect( + attrs={'filter-for': 'endpoint_b_id'} + ) + ) + endpoint_b_id = forms.ChoiceField( + choices=[], + label='Name', + widget=APISelect( + api_url='/api/dcim/{{endpoint_b_type}}s/?device_id={{endpoint_b_device}}', + disabled_indicator='is_connected' + ) + ) + + class Meta: + model = Cable + fields = [ + 'endpoint_b_site', 'endpoint_b_rack', 'endpoint_b_device', 'livesearch', 'endpoint_b_type', + 'endpoint_b_id', 'status', 'label', + ] + + def __init__(self, *args, **kwargs): + super(CableForm, self).__init__(*args, **kwargs) + + # Define available types for endpoint B based on the type of endpoint A + endpoint_a_type = self.instance.endpoint_a._meta.model_name + self.fields['endpoint_b_type'].queryset = ContentType.objects.filter( + model__in=COMPATIBLE_ENDPOINT_TYPES.get(endpoint_a_type) + ) + + def clean(self): + + # Assign endpoint B + cleaned_data = super(CableForm, self).clean() + + + + + # # Device bays # diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 422f723c7..bc3812c29 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2455,7 +2455,7 @@ class Cable(ChangeLoggedModel): """ endpoint_a_type = models.ForeignKey( to=ContentType, - limit_choices_to={'model__in': CABLE_CONNECTION_TYPES}, + limit_choices_to={'model__in': CABLE_ENDPOINT_TYPES}, on_delete=models.PROTECT, related_name='+' ) @@ -2466,7 +2466,7 @@ class Cable(ChangeLoggedModel): ) endpoint_b_type = models.ForeignKey( to=ContentType, - limit_choices_to={'model__in': CABLE_CONNECTION_TYPES}, + limit_choices_to={'model__in': CABLE_ENDPOINT_TYPES}, on_delete=models.PROTECT, related_name='+' ) diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 2d9c8d009..ac283b79f 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -161,7 +161,8 @@ urlpatterns = [ url(r'^devices/console-ports/add/$', views.DeviceBulkAddConsolePortView.as_view(), name='device_bulk_add_consoleport'), url(r'^devices/(?P\d+)/console-ports/add/$', views.ConsolePortCreateView.as_view(), name='consoleport_add'), url(r'^devices/(?P\d+)/console-ports/delete/$', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'), - url(r'^console-ports/(?P\d+)/connect/$', views.ConsolePortConnectView.as_view(), name='consoleport_connect'), + # url(r'^console-ports/(?P\d+)/connect/$', views.ConsolePortConnectView.as_view(), name='consoleport_connect'), + url(r'^console-ports/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='consoleport_connect', kwargs={'endpoint_a_type': 'consoleport'}), url(r'^console-ports/(?P\d+)/disconnect/$', views.ConsolePortDisconnectView.as_view(), name='consoleport_disconnect'), url(r'^console-ports/(?P\d+)/edit/$', views.ConsolePortEditView.as_view(), name='consoleport_edit'), url(r'^console-ports/(?P\d+)/delete/$', views.ConsolePortDeleteView.as_view(), name='consoleport_delete'), @@ -171,7 +172,8 @@ urlpatterns = [ url(r'^devices/(?P\d+)/console-server-ports/add/$', views.ConsoleServerPortCreateView.as_view(), name='consoleserverport_add'), url(r'^devices/(?P\d+)/console-server-ports/disconnect/$', views.ConsoleServerPortBulkDisconnectView.as_view(), name='consoleserverport_bulk_disconnect'), url(r'^devices/(?P\d+)/console-server-ports/delete/$', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'), - url(r'^console-server-ports/(?P\d+)/connect/$', views.ConsoleServerPortConnectView.as_view(), name='consoleserverport_connect'), + # url(r'^console-server-ports/(?P\d+)/connect/$', views.ConsoleServerPortConnectView.as_view(), name='consoleserverport_connect'), + url(r'^console-server-ports/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='consoleserverport_connect', kwargs={'endpoint_a_type': 'consoleserverport'}), url(r'^console-server-ports/(?P\d+)/disconnect/$', views.ConsoleServerPortDisconnectView.as_view(), name='consoleserverport_disconnect'), url(r'^console-server-ports/(?P\d+)/edit/$', views.ConsoleServerPortEditView.as_view(), name='consoleserverport_edit'), url(r'^console-server-ports/(?P\d+)/delete/$', views.ConsoleServerPortDeleteView.as_view(), name='consoleserverport_delete'), @@ -181,7 +183,8 @@ urlpatterns = [ url(r'^devices/power-ports/add/$', views.DeviceBulkAddPowerPortView.as_view(), name='device_bulk_add_powerport'), url(r'^devices/(?P\d+)/power-ports/add/$', views.PowerPortCreateView.as_view(), name='powerport_add'), url(r'^devices/(?P\d+)/power-ports/delete/$', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'), - url(r'^power-ports/(?P\d+)/connect/$', views.PowerPortConnectView.as_view(), name='powerport_connect'), + # url(r'^power-ports/(?P\d+)/connect/$', views.PowerPortConnectView.as_view(), name='powerport_connect'), + url(r'^power-ports/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='powerport_connect', kwargs={'endpoint_a_type': 'powerport'}), url(r'^power-ports/(?P\d+)/disconnect/$', views.PowerPortDisconnectView.as_view(), name='powerport_disconnect'), url(r'^power-ports/(?P\d+)/edit/$', views.PowerPortEditView.as_view(), name='powerport_edit'), url(r'^power-ports/(?P\d+)/delete/$', views.PowerPortDeleteView.as_view(), name='powerport_delete'), @@ -191,7 +194,8 @@ urlpatterns = [ url(r'^devices/(?P\d+)/power-outlets/add/$', views.PowerOutletCreateView.as_view(), name='poweroutlet_add'), url(r'^devices/(?P\d+)/power-outlets/disconnect/$', views.PowerOutletBulkDisconnectView.as_view(), name='poweroutlet_bulk_disconnect'), url(r'^devices/(?P\d+)/power-outlets/delete/$', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'), - url(r'^power-outlets/(?P\d+)/connect/$', views.PowerOutletConnectView.as_view(), name='poweroutlet_connect'), + # url(r'^power-outlets/(?P\d+)/connect/$', views.PowerOutletConnectView.as_view(), name='poweroutlet_connect'), + url(r'^power-outlets/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='poweroutlet_connect', kwargs={'endpoint_a_type': 'poweroutlet'}), url(r'^power-outlets/(?P\d+)/disconnect/$', views.PowerOutletDisconnectView.as_view(), name='poweroutlet_disconnect'), url(r'^power-outlets/(?P\d+)/edit/$', views.PowerOutletEditView.as_view(), name='poweroutlet_edit'), url(r'^power-outlets/(?P\d+)/delete/$', views.PowerOutletDeleteView.as_view(), name='poweroutlet_delete'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index c7e57b89f..f598d6b51 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1,12 +1,14 @@ from operator import attrgetter +from django.apps import apps from django.contrib import messages from django.contrib.auth.mixins import PermissionRequiredMixin +from django.core.exceptions import ObjectDoesNotExist from django.core.paginator import EmptyPage, PageNotAnInteger from django.db import transaction from django.db.models import Count, Q from django.forms import modelformset_factory -from django.http import HttpResponseRedirect +from django.http import Http404, HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse from django.utils.html import escape @@ -30,7 +32,7 @@ from virtualization.models import VirtualMachine from . import filters, forms, tables from .constants import CONNECTION_STATUS_CONNECTED from .models import ( - ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, + Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceConnection, InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, @@ -2152,6 +2154,27 @@ class InterfaceConnectionsListView(ObjectListView): template_name = 'dcim/interface_connections_list.html' +class CableConnectView(PermissionRequiredMixin, ObjectEditView): + permission_required = 'dcim.add_cable' + model = Cable + model_form = forms.CableForm + template_name = 'dcim/cable_connect.html' + + def alter_obj(self, obj, request, url_args, url_kwargs): + # Retrieve endpoint A based on the given type and PK + endpoint_a_type = url_kwargs.get('endpoint_a_type') + endpoint_a_id = url_kwargs.get('endpoint_a_id') + try: + model = apps.get_model( + app_label='dcim', + model_name=endpoint_a_type + ) + obj.endpoint_a = model.objects.get(pk=endpoint_a_id) + except ObjectDoesNotExist: + raise Http404 + return obj + + # # Inventory items # diff --git a/netbox/project-static/js/forms.js b/netbox/project-static/js/forms.js index 6cb621071..7ea4b152b 100644 --- a/netbox/project-static/js/forms.js +++ b/netbox/project-static/js/forms.js @@ -93,7 +93,10 @@ $(document).ready(function() { var rendered_url = api_url; while (match = filter_regex.exec(api_url)) { var filter_field = $('#id_' + match[1]); - if (filter_field.val()) { + var custom_attr = $('option:selected', filter_field).attr('api-value'); + if (custom_attr) { + rendered_url = rendered_url.replace(match[0], custom_attr); + } else if (filter_field.val()) { rendered_url = rendered_url.replace(match[0], filter_field.val()); } else if (filter_field.attr('nullable') == 'true') { rendered_url = rendered_url.replace(match[0], '0'); diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html new file mode 100644 index 000000000..66327170e --- /dev/null +++ b/netbox/templates/dcim/cable_connect.html @@ -0,0 +1,106 @@ +{% extends '_base.html' %} +{% load static from staticfiles %} +{% load form_helpers %} + +{% block content %} +
+ {% csrf_token %} + {% for field in form.hidden_fields %} + {{ field }} + {% endfor %} + {% if form.non_field_errors %} +
+
+
+
Errors
+
+ {{ form.non_field_errors }} +
+
+
+
+ {% endif %} + {% with endpoint_a=form.instance.endpoint_a %} +

{% block title %}Connect {{ endpoint_a.device }} {{ endpoint_a }}{% endblock %}

+
+
+
+
+ A Side +
+
+
+ +
+

{{ endpoint_a.device.site }}

+
+
+
+ +
+

{{ endpoint_a.device.rack|default:"None" }}

+
+
+
+ +
+

{{ endpoint_a.device }}

+
+
+
+ +
+

{{ endpoint_a }}

+
+
+
+
+
+
+ +
+
+
+
+ B Side +
+
+ +
+ +
+ {% render_field form.endpoint_b_site %} + {% render_field form.endpoint_b_rack %} + {% render_field form.endpoint_b_device %} +
+
+ {% render_field form.endpoint_b_type %} + {% render_field form.endpoint_b_id %} +
+
+
+
+
+
+ {% render_field form.status %} + {% render_field form.label %} +
+
+
+
+ + Cancel +
+
+ {% endwith %} +
+{% endblock %} + +{% block javascript %} + +{% endblock %} diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html index 4d75cc65b..91d60f7e3 100644 --- a/netbox/templates/dcim/inc/consoleport.html +++ b/netbox/templates/dcim/inc/consoleport.html @@ -30,7 +30,7 @@ {% else %} - + {% endif %} diff --git a/netbox/templates/dcim/inc/consoleserverport.html b/netbox/templates/dcim/inc/consoleserverport.html index 673f51388..979b040b1 100644 --- a/netbox/templates/dcim/inc/consoleserverport.html +++ b/netbox/templates/dcim/inc/consoleserverport.html @@ -35,7 +35,7 @@ {% else %} - + {% endif %} diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index 18cfb7f2c..84c018460 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -35,7 +35,7 @@ {% else %} - + {% endif %} diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index 32e7f20fd..7db2003b0 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -30,7 +30,7 @@ {% else %} - + {% endif %} diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index 1c2f7dcf0..57e89ac1d 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -207,6 +207,15 @@ class SelectWithPK(forms.Select): option_template_name = 'widgets/select_option_with_pk.html' +class ContentTypeSelect(forms.Select): + """ + Appends an `api-value` attribute equal to the slugified model name for each ContentType. For example: + + This attribute can be used to reference the relevant API endpoint for a particular ContentType. + """ + option_template_name = 'widgets/select_contenttype.html' + + class ArrayFieldSelectMultiple(SelectWithDisabled, forms.SelectMultiple): """ MultiSelect widget for a SimpleArrayField. Choices must be populated on the widget. diff --git a/netbox/utilities/templates/widgets/select_contenttype.html b/netbox/utilities/templates/widgets/select_contenttype.html new file mode 100644 index 000000000..ca7fe326e --- /dev/null +++ b/netbox/utilities/templates/widgets/select_contenttype.html @@ -0,0 +1 @@ + From ea0de629df32801e63ceb0dfcb3ae6c7f833bbac Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 23 Oct 2018 13:40:10 -0400 Subject: [PATCH 014/191] Fixed cable creation form --- netbox/dcim/forms.py | 11 +---------- netbox/dcim/urls.py | 12 ++++++------ netbox/dcim/views.py | 11 +++-------- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 9565d5ef0..0777d20aa 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -2355,8 +2355,7 @@ class CableForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): attrs={'filter-for': 'endpoint_b_id'} ) ) - endpoint_b_id = forms.ChoiceField( - choices=[], + endpoint_b_id = forms.IntegerField( label='Name', widget=APISelect( api_url='/api/dcim/{{endpoint_b_type}}s/?device_id={{endpoint_b_device}}', @@ -2380,14 +2379,6 @@ class CableForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): model__in=COMPATIBLE_ENDPOINT_TYPES.get(endpoint_a_type) ) - def clean(self): - - # Assign endpoint B - cleaned_data = super(CableForm, self).clean() - - - - # # Device bays diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index ac283b79f..3e011b4c3 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -5,8 +5,8 @@ from ipam.views import ServiceCreateView from secrets.views import secret_add from . import views from .models import ( - Device, DeviceRole, DeviceType, Interface, Manufacturer, Platform, Rack, RackGroup, RackReservation, RackRole, - Region, Site, VirtualChassis, + ConsolePort, ConsoleServerPort, Device, DeviceRole, DeviceType, Interface, Manufacturer, Platform, PowerPort, + PowerOutlet, Rack, RackGroup, RackReservation, RackRole, Region, Site, VirtualChassis, ) app_name = 'dcim' @@ -162,7 +162,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/console-ports/add/$', views.ConsolePortCreateView.as_view(), name='consoleport_add'), url(r'^devices/(?P\d+)/console-ports/delete/$', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'), # url(r'^console-ports/(?P\d+)/connect/$', views.ConsolePortConnectView.as_view(), name='consoleport_connect'), - url(r'^console-ports/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='consoleport_connect', kwargs={'endpoint_a_type': 'consoleport'}), + url(r'^console-ports/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='consoleport_connect', kwargs={'endpoint_a_type': ConsolePort}), url(r'^console-ports/(?P\d+)/disconnect/$', views.ConsolePortDisconnectView.as_view(), name='consoleport_disconnect'), url(r'^console-ports/(?P\d+)/edit/$', views.ConsolePortEditView.as_view(), name='consoleport_edit'), url(r'^console-ports/(?P\d+)/delete/$', views.ConsolePortDeleteView.as_view(), name='consoleport_delete'), @@ -173,7 +173,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/console-server-ports/disconnect/$', views.ConsoleServerPortBulkDisconnectView.as_view(), name='consoleserverport_bulk_disconnect'), url(r'^devices/(?P\d+)/console-server-ports/delete/$', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'), # url(r'^console-server-ports/(?P\d+)/connect/$', views.ConsoleServerPortConnectView.as_view(), name='consoleserverport_connect'), - url(r'^console-server-ports/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='consoleserverport_connect', kwargs={'endpoint_a_type': 'consoleserverport'}), + url(r'^console-server-ports/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='consoleserverport_connect', kwargs={'endpoint_a_type': ConsoleServerPort}), url(r'^console-server-ports/(?P\d+)/disconnect/$', views.ConsoleServerPortDisconnectView.as_view(), name='consoleserverport_disconnect'), url(r'^console-server-ports/(?P\d+)/edit/$', views.ConsoleServerPortEditView.as_view(), name='consoleserverport_edit'), url(r'^console-server-ports/(?P\d+)/delete/$', views.ConsoleServerPortDeleteView.as_view(), name='consoleserverport_delete'), @@ -184,7 +184,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/power-ports/add/$', views.PowerPortCreateView.as_view(), name='powerport_add'), url(r'^devices/(?P\d+)/power-ports/delete/$', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'), # url(r'^power-ports/(?P\d+)/connect/$', views.PowerPortConnectView.as_view(), name='powerport_connect'), - url(r'^power-ports/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='powerport_connect', kwargs={'endpoint_a_type': 'powerport'}), + url(r'^power-ports/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='powerport_connect', kwargs={'endpoint_a_type': PowerPort}), url(r'^power-ports/(?P\d+)/disconnect/$', views.PowerPortDisconnectView.as_view(), name='powerport_disconnect'), url(r'^power-ports/(?P\d+)/edit/$', views.PowerPortEditView.as_view(), name='powerport_edit'), url(r'^power-ports/(?P\d+)/delete/$', views.PowerPortDeleteView.as_view(), name='powerport_delete'), @@ -195,7 +195,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/power-outlets/disconnect/$', views.PowerOutletBulkDisconnectView.as_view(), name='poweroutlet_bulk_disconnect'), url(r'^devices/(?P\d+)/power-outlets/delete/$', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'), # url(r'^power-outlets/(?P\d+)/connect/$', views.PowerOutletConnectView.as_view(), name='poweroutlet_connect'), - url(r'^power-outlets/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='poweroutlet_connect', kwargs={'endpoint_a_type': 'poweroutlet'}), + url(r'^power-outlets/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='poweroutlet_connect', kwargs={'endpoint_a_type': PowerOutlet}), url(r'^power-outlets/(?P\d+)/disconnect/$', views.PowerOutletDisconnectView.as_view(), name='poweroutlet_disconnect'), url(r'^power-outlets/(?P\d+)/edit/$', views.PowerOutletEditView.as_view(), name='poweroutlet_edit'), url(r'^power-outlets/(?P\d+)/delete/$', views.PowerOutletDeleteView.as_view(), name='poweroutlet_delete'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index f598d6b51..a97b3a98a 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2161,17 +2161,12 @@ class CableConnectView(PermissionRequiredMixin, ObjectEditView): template_name = 'dcim/cable_connect.html' def alter_obj(self, obj, request, url_args, url_kwargs): + # Retrieve endpoint A based on the given type and PK endpoint_a_type = url_kwargs.get('endpoint_a_type') endpoint_a_id = url_kwargs.get('endpoint_a_id') - try: - model = apps.get_model( - app_label='dcim', - model_name=endpoint_a_type - ) - obj.endpoint_a = model.objects.get(pk=endpoint_a_id) - except ObjectDoesNotExist: - raise Http404 + obj.endpoint_a = endpoint_a_type.objects.get(pk=endpoint_a_id) + return obj From 1595a5ecd72df554dde7f02d714b1c5e158ed3f8 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 24 Oct 2018 10:37:54 -0400 Subject: [PATCH 015/191] Renamed ConsolePort.cs_port to connected_endpoint --- netbox/dcim/api/serializers.py | 12 ++--- netbox/dcim/api/views.py | 6 +-- netbox/dcim/filters.py | 4 +- netbox/dcim/fixtures/dcim.json | 30 +++++------ netbox/dcim/forms.py | 34 ++++++------- netbox/dcim/migrations/0066_cables.py | 29 ++++++++--- netbox/dcim/models.py | 13 +++-- netbox/dcim/tables.py | 12 +++-- netbox/dcim/tests/test_api.py | 16 +++--- netbox/dcim/views.py | 51 +++++++++++-------- netbox/extras/models.py | 4 +- netbox/netbox/views.py | 2 +- .../templates/dcim/consoleport_connect.html | 2 +- .../dcim/consoleport_disconnect.html | 2 +- .../dcim/consoleserverport_disconnect.html | 2 +- netbox/templates/dcim/device.html | 8 +-- netbox/templates/dcim/inc/consoleport.html | 12 ++--- .../templates/dcim/inc/consoleserverport.html | 18 +++---- 18 files changed, 143 insertions(+), 114 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index df1261d55..80f54a2a3 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -504,8 +504,8 @@ class ConsoleServerPortSerializer(TaggitSerializer, ValidatedModelSerializer): class Meta: model = ConsoleServerPort - fields = ['id', 'device', 'name', 'connected_console', 'tags'] - read_only_fields = ['connected_console'] + fields = ['id', 'device', 'name', 'connected_endpoint', 'tags'] + read_only_fields = ['connected_endpoint'] class NestedConsoleServerPortSerializer(WritableNestedSerializer): @@ -518,7 +518,7 @@ class NestedConsoleServerPortSerializer(WritableNestedSerializer): fields = ['id', 'url', 'device', 'name', 'is_connected'] def get_is_connected(self, obj): - return hasattr(obj, 'connected_console') and obj.connected_console is not None + return hasattr(obj, 'connected_endpoint') and obj.connected_endpoint is not None # @@ -527,12 +527,12 @@ class NestedConsoleServerPortSerializer(WritableNestedSerializer): class ConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): device = NestedDeviceSerializer() - cs_port = NestedConsoleServerPortSerializer(required=False, allow_null=True) + connected_endpoint = NestedConsoleServerPortSerializer(required=False, allow_null=True) tags = TagListSerializerField(required=False) class Meta: model = ConsolePort - fields = ['id', 'device', 'name', 'cs_port', 'connection_status', 'tags'] + fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'tags'] class NestedConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): @@ -545,7 +545,7 @@ class NestedConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): fields = ['id', 'url', 'device', 'name', 'is_connected'] def get_is_connected(self, obj): - return obj.cs_port is not None + return obj.connected_endpoint is not None # diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 127784e83..ef4bec9cd 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -331,13 +331,13 @@ class DeviceViewSet(CustomFieldModelViewSet): # class ConsolePortViewSet(ModelViewSet): - queryset = ConsolePort.objects.select_related('device', 'cs_port__device').prefetch_related('tags') + queryset = ConsolePort.objects.select_related('device', 'connected_endpoint__device').prefetch_related('tags') serializer_class = serializers.ConsolePortSerializer filter_class = filters.ConsolePortFilter class ConsoleServerPortViewSet(ModelViewSet): - queryset = ConsoleServerPort.objects.select_related('device', 'connected_console__device').prefetch_related('tags') + queryset = ConsoleServerPort.objects.select_related('device', 'connected_endpoint__device').prefetch_related('tags') serializer_class = serializers.ConsoleServerPortSerializer filter_class = filters.ConsoleServerPortFilter @@ -399,7 +399,7 @@ class InventoryItemViewSet(ModelViewSet): # class ConsoleConnectionViewSet(ListModelMixin, GenericViewSet): - queryset = ConsolePort.objects.select_related('device', 'cs_port__device').filter(cs_port__isnull=False) + queryset = ConsolePort.objects.select_related('device', 'connected_endpoint__device').filter(connected_endpoint__isnull=False) serializer_class = serializers.ConsolePortSerializer filter_class = filters.ConsoleConnectionFilter diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 3b370654e..3b854dd61 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -803,14 +803,14 @@ class ConsoleConnectionFilter(django_filters.FilterSet): def filter_site(self, queryset, name, value): if not value.strip(): return queryset - return queryset.filter(cs_port__device__site__slug=value) + return queryset.filter(connected_endpoint__device__site__slug=value) def filter_device(self, queryset, name, value): if not value.strip(): return queryset return queryset.filter( Q(device__name__icontains=value) | - Q(cs_port__device__name__icontains=value) + Q(connected_endpoint__device__name__icontains=value) ) diff --git a/netbox/dcim/fixtures/dcim.json b/netbox/dcim/fixtures/dcim.json index 709995f95..148ce8ca6 100644 --- a/netbox/dcim/fixtures/dcim.json +++ b/netbox/dcim/fixtures/dcim.json @@ -2151,7 +2151,7 @@ "fields": { "device": 1, "name": "Console (RE0)", - "cs_port": 27, + "connected_endpoint": 27, "connection_status": true } }, @@ -2161,7 +2161,7 @@ "fields": { "device": 1, "name": "Console (RE1)", - "cs_port": 38, + "connected_endpoint": 38, "connection_status": true } }, @@ -2171,7 +2171,7 @@ "fields": { "device": 2, "name": "Console (RE0)", - "cs_port": 5, + "connected_endpoint": 5, "connection_status": true } }, @@ -2181,7 +2181,7 @@ "fields": { "device": 2, "name": "Console (RE1)", - "cs_port": 16, + "connected_endpoint": 16, "connection_status": true } }, @@ -2191,7 +2191,7 @@ "fields": { "device": 3, "name": "Console", - "cs_port": 49, + "connected_endpoint": 49, "connection_status": true } }, @@ -2201,7 +2201,7 @@ "fields": { "device": 4, "name": "Console", - "cs_port": 48, + "connected_endpoint": 48, "connection_status": true } }, @@ -2211,7 +2211,7 @@ "fields": { "device": 5, "name": "Console", - "cs_port": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2221,7 +2221,7 @@ "fields": { "device": 6, "name": "Console", - "cs_port": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2231,7 +2231,7 @@ "fields": { "device": 7, "name": "Console (RE0)", - "cs_port": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2241,7 +2241,7 @@ "fields": { "device": 7, "name": "Console (RE1)", - "cs_port": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2251,7 +2251,7 @@ "fields": { "device": 8, "name": "Console (RE0)", - "cs_port": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2261,7 +2261,7 @@ "fields": { "device": 8, "name": "Console (RE1)", - "cs_port": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2271,7 +2271,7 @@ "fields": { "device": 9, "name": "Console", - "cs_port": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2281,7 +2281,7 @@ "fields": { "device": 11, "name": "Serial", - "cs_port": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2291,7 +2291,7 @@ "fields": { "device": 12, "name": "Serial", - "cs_port": null, + "connected_endpoint": null, "connection_status": true } }, diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 0777d20aa..a59553b49 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1301,8 +1301,8 @@ class ConsoleConnectionCSVForm(forms.ModelForm): 'invalid_choice': 'Console server not found', } ) - cs_port = forms.CharField( - help_text='Console server port name' + connected_endpoint = forms.CharField( + help_text='Console server port' ) device = FlexibleModelChoiceField( queryset=Device.objects.all(), @@ -1322,7 +1322,7 @@ class ConsoleConnectionCSVForm(forms.ModelForm): class Meta: model = ConsolePort - fields = ['console_server', 'cs_port', 'device', 'console_port', 'connection_status'] + fields = ['console_server', 'connected_endpoint', 'device', 'console_port', 'connection_status'] def clean_console_port(self): @@ -1336,7 +1336,7 @@ class ConsoleConnectionCSVForm(forms.ModelForm): device=self.cleaned_data['device'], name=console_port_name ) # Check if the console port is already connected - if consoleport.cs_port is not None: + if consoleport.connected_endpoint is not None: raise forms.ValidationError("{} {} is already connected".format( self.cleaned_data['device'], console_port_name )) @@ -1348,28 +1348,28 @@ class ConsoleConnectionCSVForm(forms.ModelForm): self.instance = consoleport return consoleport - def clean_cs_port(self): + def clean_connected_endpoint(self): - cs_port_name = self.cleaned_data.get('cs_port') - if not self.cleaned_data.get('console_server') or not cs_port_name: + consoleserverport_name = self.cleaned_data.get('connected_endpoint') + if not self.cleaned_data.get('console_server') or not consoleserverport_name: return None try: # Retrieve console server port by name - cs_port = ConsoleServerPort.objects.get( - device=self.cleaned_data['console_server'], name=cs_port_name + consoleserverport = ConsoleServerPort.objects.get( + device=self.cleaned_data['console_server'], name=consoleserverport_name ) # Check if the console server port is already connected - if ConsolePort.objects.filter(cs_port=cs_port).count(): + if ConsolePort.objects.filter(connected_endpoint=consoleserverport).count(): raise forms.ValidationError("{} {} is already connected".format( - self.cleaned_data['console_server'], cs_port_name + self.cleaned_data['console_server'], consoleserverport_name )) except ConsoleServerPort.DoesNotExist: raise forms.ValidationError("Invalid console server port ({} {})".format( - self.cleaned_data['console_server'], cs_port_name + self.cleaned_data['console_server'], consoleserverport_name )) - return cs_port + return consoleserverport class ConsolePortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): @@ -1403,7 +1403,7 @@ class ConsolePortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelF widget=APISelect( api_url='/api/dcim/devices/?site_id={{site}}&rack_id={{rack}}&is_console_server=True', display_field='display_name', - attrs={'filter-for': 'cs_port'} + attrs={'filter-for': 'connected_endpoint'} ) ) livesearch = forms.CharField( @@ -1415,7 +1415,7 @@ class ConsolePortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelF field_to_update='console_server', ) ) - cs_port = ChainedModelChoiceField( + connected_endpoint = ChainedModelChoiceField( queryset=ConsoleServerPort.objects.all(), chains=( ('device', 'console_server'), @@ -1429,9 +1429,9 @@ class ConsolePortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelF class Meta: model = ConsolePort - fields = ['site', 'rack', 'console_server', 'livesearch', 'cs_port', 'connection_status'] + fields = ['site', 'rack', 'console_server', 'livesearch', 'connected_endpoint', 'connection_status'] labels = { - 'cs_port': 'Port', + 'connected_endpoint': 'Port', 'connection_status': 'Status', } diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py index 342590d20..d160e57d7 100644 --- a/netbox/dcim/migrations/0066_cables.py +++ b/netbox/dcim/migrations/0066_cables.py @@ -1,5 +1,3 @@ -# Generated by Django 2.0.8 on 2018-10-18 19:41 - from django.db import migrations, models import django.db.models.deletion import utilities.fields @@ -19,13 +17,13 @@ def console_connections_to_cables(apps, schema_editor): consoleserverport_type = ContentType.objects.get_for_model(ConsoleServerPort) # Create a new Cable instance from each console connection - for consoleport in ConsolePort.objects.filter(cs_port__isnull=False): + for consoleport in ConsolePort.objects.filter(connected_endpoint__isnull=False): c = Cable() # We have to assign GFK fields manually because we're inside a migration. c.endpoint_a_type = consoleport_type c.endpoint_a_id = consoleport.id c.endpoint_b_type = consoleserverport_type - c.endpoint_b_id = consoleport.cs_port_id + c.endpoint_b_id = consoleport.connected_endpoint_id c.connection_status = consoleport.connection_status c.save() @@ -87,6 +85,8 @@ class Migration(migrations.Migration): ] operations = [ + + # Create the Cable model migrations.CreateModel( name='Cable', fields=[ @@ -99,8 +99,8 @@ class Migration(migrations.Migration): ('status', models.BooleanField(default=True)), ('label', models.CharField(blank=True, max_length=100)), ('color', utilities.fields.ColorField(blank=True, max_length=6)), - ('endpoint_a_type', models.ForeignKey(limit_choices_to={'model__in': ('consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport')}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), - ('endpoint_b_type', models.ForeignKey(limit_choices_to={'model__in': ('consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport')}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), + ('endpoint_a_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), + ('endpoint_b_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), ], ), migrations.AlterUniqueTogether( @@ -108,6 +108,23 @@ class Migration(migrations.Migration): unique_together={('endpoint_b_type', 'endpoint_b_id'), ('endpoint_a_type', 'endpoint_a_id')}, ), + # Rename model fields + migrations.RenameField( + model_name='consoleport', + old_name='cs_port', + new_name='connected_endpoint' + ), + migrations.AlterField( + model_name='consoleport', + name='connected_endpoint', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='connected_endpoint', to='dcim.ConsoleServerPort'), + ), + migrations.AlterField( + model_name='consoleserverport', + name='device', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='consoleserverports', to='dcim.Device'), + ), + # Copy console/power/interface connections as Cables migrations.RunPython(console_connections_to_cables), migrations.RunPython(power_connections_to_cables), diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index bc3812c29..412079682 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1629,11 +1629,10 @@ class ConsolePort(ComponentModel): name = models.CharField( max_length=50 ) - cs_port = models.OneToOneField( + connected_endpoint = models.OneToOneField( to='dcim.ConsoleServerPort', on_delete=models.SET_NULL, - related_name='connected_console', - verbose_name='Console server port', + related_name='connected_endpoint', blank=True, null=True ) @@ -1644,7 +1643,7 @@ class ConsolePort(ComponentModel): tags = TaggableManager() - csv_headers = ['console_server', 'cs_port', 'device', 'console_port', 'connection_status'] + csv_headers = ['console_server', 'connected_endpoint', 'device', 'console_port', 'connection_status'] class Meta: ordering = ['device', 'name'] @@ -1658,8 +1657,8 @@ class ConsolePort(ComponentModel): def to_csv(self): return ( - self.cs_port.device.identifier if self.cs_port else None, - self.cs_port.name if self.cs_port else None, + self.connected_endpoint.device.identifier if self.connected_endpoint else None, + self.connected_endpoint.name if self.connected_endpoint else None, self.device.identifier, self.name, self.get_connection_status_display(), @@ -1687,7 +1686,7 @@ class ConsoleServerPort(ComponentModel): device = models.ForeignKey( to='dcim.Device', on_delete=models.CASCADE, - related_name='cs_ports' + related_name='consoleserverports' ) name = models.CharField( max_length=50 diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index a1a2c7a4d..b5f62e792 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -622,15 +622,19 @@ class DeviceBayTable(BaseTable): # class ConsoleConnectionTable(BaseTable): - console_server = tables.LinkColumn('dcim:device', accessor=Accessor('cs_port.device'), - args=[Accessor('cs_port.device.pk')], verbose_name='Console server') - cs_port = tables.Column(verbose_name='Port') + console_server = tables.LinkColumn( + 'dcim:device', + accessor=Accessor('connected_endpoint.device'), + args=[Accessor('connected_endpoint.device.pk')], + verbose_name='Console server' + ) + connected_endpoint = tables.Column(verbose_name='Port') device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device') name = tables.Column(verbose_name='Console port') class Meta(BaseTable.Meta): model = ConsolePort - fields = ('console_server', 'cs_port', 'device', 'name') + fields = ('console_server', 'connected_endpoint', 'device', 'name') class PowerConnectionTable(BaseTable): diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 52ee16a44..040c6dab5 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -2005,7 +2005,7 @@ class ConsolePortTest(APITestCase): data = { 'device': self.device.pk, 'name': 'Test Console Port X', - 'cs_port': consoleserverport.pk, + 'connected_endpoint': consoleserverport.pk, } url = reverse('dcim-api:consoleport-detail', kwargs={'pk': self.consoleport1.pk}) @@ -2015,7 +2015,7 @@ class ConsolePortTest(APITestCase): self.assertEqual(ConsolePort.objects.count(), 3) consoleport1 = ConsolePort.objects.get(pk=response.data['id']) self.assertEqual(consoleport1.name, data['name']) - self.assertEqual(consoleport1.cs_port_id, data['cs_port']) + self.assertEqual(consoleport1.connected_endpoint_id, data['connected_endpoint']) def test_delete_consoleport(self): @@ -2820,17 +2820,17 @@ class ConsoleConnectionTest(APITestCase): device2 = Device.objects.create( device_type=devicetype, device_role=devicerole, name='Test Device 2', site=site ) - cs_port1 = ConsoleServerPort.objects.create(device=device1, name='Test CS Port 1') - cs_port2 = ConsoleServerPort.objects.create(device=device1, name='Test CS Port 2') - cs_port3 = ConsoleServerPort.objects.create(device=device1, name='Test CS Port 3') + consoleserverport1 = ConsoleServerPort.objects.create(device=device1, name='Test Console Server Port 1') + consoleserverport2 = ConsoleServerPort.objects.create(device=device1, name='Test Console Server Port 2') + consoleserverport3 = ConsoleServerPort.objects.create(device=device1, name='Test Console Server Port 3') ConsolePort.objects.create( - device=device2, cs_port=cs_port1, name='Test Console Port 1', connection_status=True + device=device2, connected_endpoint=consoleserverport1, name='Test Console Port 1', connection_status=True ) ConsolePort.objects.create( - device=device2, cs_port=cs_port2, name='Test Console Port 2', connection_status=True + device=device2, connected_endpoint=consoleserverport2, name='Test Console Port 2', connection_status=True ) ConsolePort.objects.create( - device=device2, cs_port=cs_port3, name='Test Console Port 3', connection_status=True + device=device2, connected_endpoint=consoleserverport3, name='Test Console Port 3', connection_status=True ) def test_list_consoleconnections(self): diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index a97b3a98a..bcf39f626 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -886,11 +886,11 @@ class DeviceView(View): # Console ports console_ports = natsorted( - ConsolePort.objects.filter(device=device).select_related('cs_port__device'), key=attrgetter('name') + ConsolePort.objects.filter(device=device).select_related('connected_endpoint__device'), key=attrgetter('name') ) # Console server ports - cs_ports = ConsoleServerPort.objects.filter(device=device).select_related('connected_console') + consoleserverports = ConsoleServerPort.objects.filter(device=device).select_related('connected_endpoint') # Power ports power_ports = natsorted( @@ -941,7 +941,7 @@ class DeviceView(View): return render(request, 'dcim/device.html', { 'device': device, 'console_ports': console_ports, - 'cs_ports': cs_ports, + 'consoleserverports': consoleserverports, 'power_ports': power_ports, 'power_outlets': power_outlets, 'interfaces': interfaces, @@ -1133,9 +1133,9 @@ class ConsolePortConnectView(PermissionRequiredMixin, View): consoleport.device.get_absolute_url(), escape(consoleport.device), escape(consoleport.name), - consoleport.cs_port.device.get_absolute_url(), - escape(consoleport.cs_port.device), - escape(consoleport.cs_port.name), + consoleport.connected_endpoint.device.get_absolute_url(), + escape(consoleport.connected_endpoint.device), + escape(consoleport.connected_endpoint.name), ) messages.success(request, mark_safe(msg)) @@ -1156,7 +1156,7 @@ class ConsolePortDisconnectView(PermissionRequiredMixin, View): consoleport = get_object_or_404(ConsolePort, pk=pk) form = ConfirmationForm() - if not consoleport.cs_port: + if not consoleport.connected_endpoint: messages.warning( request, "Cannot disconnect console port {}: It is not connected to anything.".format(consoleport) ) @@ -1174,18 +1174,17 @@ class ConsolePortDisconnectView(PermissionRequiredMixin, View): form = ConfirmationForm(request.POST) if form.is_valid(): - - cs_port = consoleport.cs_port - consoleport.cs_port = None + consoleserverport = consoleport.connected_endpoint + consoleport.connected_endpoint = None consoleport.connection_status = None consoleport.save() msg = 'Disconnected {} {} from {} {}'.format( consoleport.device.get_absolute_url(), escape(consoleport.device), escape(consoleport.name), - cs_port.device.get_absolute_url(), - escape(cs_port.device), - escape(cs_port.name), + consoleserverport.device.get_absolute_url(), + escape(consoleserverport.device), + escape(consoleserverport.name), ) messages.success(request, mark_safe(msg)) @@ -1264,7 +1263,7 @@ class ConsoleServerPortConnectView(PermissionRequiredMixin, View): if form.is_valid(): consoleport = form.cleaned_data['port'] - consoleport.cs_port = consoleserverport + consoleport.connected_endpoint = consoleserverport consoleport.connection_status = form.cleaned_data['connection_status'] consoleport.save() msg = 'Connected {} {} to {} {}'.format( @@ -1294,7 +1293,7 @@ class ConsoleServerPortDisconnectView(PermissionRequiredMixin, View): consoleserverport = get_object_or_404(ConsoleServerPort, pk=pk) form = ConfirmationForm() - if not hasattr(consoleserverport, 'connected_console'): + if not hasattr(consoleserverport, 'connected_endpoint'): messages.warning( request, "Cannot disconnect console server port {}: Nothing is connected to it.".format(consoleserverport) @@ -1314,8 +1313,8 @@ class ConsoleServerPortDisconnectView(PermissionRequiredMixin, View): if form.is_valid(): - consoleport = consoleserverport.connected_console - consoleport.cs_port = None + consoleport = consoleserverport.connected_endpoint + consoleport.connected_endpoint = None consoleport.connection_status = None consoleport.save() msg = 'Disconnected {} {} from {} {}'.format( @@ -1359,8 +1358,13 @@ class ConsoleServerPortBulkDisconnectView(PermissionRequiredMixin, BulkDisconnec model = ConsoleServerPort form = forms.ConsoleServerPortBulkDisconnectForm - def disconnect_objects(self, cs_ports): - return ConsolePort.objects.filter(cs_port__in=cs_ports).update(cs_port=None, connection_status=None) + def disconnect_objects(self, consoleserverports): + return ConsolePort.objects.filter( + connected_endpoint__in=consoleserverports + ).update( + connected_endpoint=None, + connection_status=None + ) class ConsoleServerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): @@ -2125,8 +2129,13 @@ class InterfaceConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView # class ConsoleConnectionsListView(ObjectListView): - queryset = ConsolePort.objects.select_related('device', 'cs_port__device').filter(cs_port__isnull=False) \ - .order_by('cs_port__device__name', 'cs_port__name') + queryset = ConsolePort.objects.select_related( + 'device', 'connected_endpoint__device' + ).filter( + connected_endpoint__isnull=False + ).order_by( + 'connected_endpoint__device__name', 'connected_endpoint__name' + ) filter = filters.ConsoleConnectionFilter filter_form = forms.ConsoleConnectionFilterForm table = tables.ConsoleConnectionTable diff --git a/netbox/extras/models.py b/netbox/extras/models.py index a9c0b9ef5..5e7dbac24 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -526,10 +526,10 @@ class TopologyMap(models.Model): from dcim.models import ConsolePort # Add all console connections to the graph - console_ports = ConsolePort.objects.filter(device__in=devices, cs_port__device__in=devices) + console_ports = ConsolePort.objects.filter(device__in=devices, connected_endpoint__device__in=devices) for cp in console_ports: style = 'solid' if cp.connection_status == CONNECTION_STATUS_CONNECTED else 'dashed' - self.graph.edge(cp.cs_port.device.name, cp.device.name, style=style) + self.graph.edge(cp.connected_endpoint.device.name, cp.device.name, style=style) def add_power_connections(self, devices): diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index b2f726060..d7bb29f2e 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -167,7 +167,7 @@ class HomeView(View): 'rack_count': Rack.objects.count(), 'device_count': Device.objects.count(), 'interface_connections_count': InterfaceConnection.objects.count(), - 'console_connections_count': ConsolePort.objects.filter(cs_port__isnull=False).count(), + 'console_connections_count': ConsolePort.objects.filter(connected_endpoint__isnull=False).count(), 'power_connections_count': PowerPort.objects.filter(power_outlet__isnull=False).count(), # IPAM diff --git a/netbox/templates/dcim/consoleport_connect.html b/netbox/templates/dcim/consoleport_connect.html index 679540960..5d8596fd5 100644 --- a/netbox/templates/dcim/consoleport_connect.html +++ b/netbox/templates/dcim/consoleport_connect.html @@ -35,7 +35,7 @@ {% render_field form.console_server %} - {% render_field form.cs_port %} + {% render_field form.connected_endpoint %} {% render_field form.connection_status %} diff --git a/netbox/templates/dcim/consoleport_disconnect.html b/netbox/templates/dcim/consoleport_disconnect.html index dfd5cf2e7..f83329832 100644 --- a/netbox/templates/dcim/consoleport_disconnect.html +++ b/netbox/templates/dcim/consoleport_disconnect.html @@ -4,5 +4,5 @@ {% block title %}Disconnect console port {{ consoleport }}?{% endblock %} {% block message %} -

Are you sure you want to disconnect this console port from {{ consoleport.cs_port.device }} {{ consoleport.cs_port }}?

+

Are you sure you want to disconnect this console port from {{ consoleport.connected_endpoint.device }} {{ consoleport.connected_endpoint }}?

{% endblock %} diff --git a/netbox/templates/dcim/consoleserverport_disconnect.html b/netbox/templates/dcim/consoleserverport_disconnect.html index 5c0594464..8404f9e94 100644 --- a/netbox/templates/dcim/consoleserverport_disconnect.html +++ b/netbox/templates/dcim/consoleserverport_disconnect.html @@ -4,5 +4,5 @@ {% block title %}Disconnect {{ consoleserverport.device }} {{ consoleserverport }}?{% endblock %} {% block message %} -

Are you sure you want to disconnect {{ consoleserverport.connected_console.device }} {{ consoleserverport.connected_console }} from this port?

+

Are you sure you want to disconnect {{ consoleserverport.connected_endpoint.device }} {{ consoleserverport.connected_endpoint }} from this port?

{% endblock %} diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 50f8ebbb5..194b6ab64 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -573,7 +573,7 @@ {% endif %} {% endif %} - {% if cs_ports or device.device_type.is_console_server %} + {% if consoleserverports or device.device_type.is_console_server %} {% if perms.dcim.delete_consoleserverport %}
{% csrf_token %} @@ -594,7 +594,7 @@ - {% for csp in cs_ports %} + {% for csp in consoleserverports %} {% include 'dcim/inc/consoleserverport.html' %} {% empty %} @@ -604,7 +604,7 @@
- {% if cs_ports and perms.dcim.change_consoleport %} + {% if consoleserverports and perms.dcim.change_consoleport %} @@ -612,7 +612,7 @@ Disconnect {% endif %} - {% if cs_ports and perms.dcim.delete_consoleserverport %} + {% if consoleserverports and perms.dcim.delete_consoleserverport %} diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html index 91d60f7e3..70511408b 100644 --- a/netbox/templates/dcim/inc/consoleport.html +++ b/netbox/templates/dcim/inc/consoleport.html @@ -1,13 +1,13 @@ - + {{ cp }} - {% if cp.cs_port %} + {% if cp.connected_endpoint %} - {{ cp.cs_port.device }} + {{ cp.connected_endpoint.device }} - {{ cp.cs_port }} + {{ cp.connected_endpoint }} {% else %} @@ -16,7 +16,7 @@ {% endif %} {% if perms.dcim.change_consoleport %} - {% if cp.cs_port %} + {% if cp.connected_endpoint %} {% if cp.connection_status %} @@ -39,7 +39,7 @@ {% endif %} {% if perms.dcim.delete_consoleport %} - {% if cp.cs_port %} + {% if cp.connected_endpoint %} diff --git a/netbox/templates/dcim/inc/consoleserverport.html b/netbox/templates/dcim/inc/consoleserverport.html index 979b040b1..e23ffe5e9 100644 --- a/netbox/templates/dcim/inc/consoleserverport.html +++ b/netbox/templates/dcim/inc/consoleserverport.html @@ -1,4 +1,4 @@ - + {% if perms.dcim.change_consoleserverport or perms.dcim.delete_consoleserverport %} @@ -7,12 +7,12 @@ {{ csp }} - {% if csp.connected_console %} + {% if csp.connected_endpoint %} - {{ csp.connected_console.device }} + {{ csp.connected_endpoint.device }} - {{ csp.connected_console }} + {{ csp.connected_endpoint }} {% else %} @@ -21,13 +21,13 @@ {% endif %} {% if perms.dcim.change_consoleserverport %} - {% if csp.connected_console %} - {% if csp.connected_console.connection_status %} - + {% if csp.connected_endpoint %} + {% if csp.connected_endpoint.connection_status %} + {% else %} - + {% endif %} @@ -44,7 +44,7 @@ {% endif %} {% if perms.dcim.delete_consoleserverport %} - {% if csp.connected_console %} + {% if csp.connected_endpoint %} From 2ec8dc83193339a5c44f8622009c10592b5339a3 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 24 Oct 2018 11:00:13 -0400 Subject: [PATCH 016/191] Renamed PowerPort.power_outlet to connected_endpoint --- netbox/dcim/api/serializers.py | 12 ++--- netbox/dcim/api/views.py | 16 ++++-- netbox/dcim/filters.py | 4 +- netbox/dcim/fixtures/dcim.json | 50 +++++++++--------- netbox/dcim/forms.py | 32 ++++++------ netbox/dcim/migrations/0066_cables.py | 23 ++++++-- netbox/dcim/models.py | 12 ++--- netbox/dcim/tables.py | 12 +++-- netbox/dcim/tests/test_api.py | 16 +++--- netbox/dcim/views.py | 52 +++++++++++-------- netbox/extras/models.py | 8 ++- netbox/netbox/views.py | 2 +- netbox/templates/dcim/device.html | 8 +-- netbox/templates/dcim/inc/poweroutlet.html | 18 +++---- netbox/templates/dcim/inc/powerport.html | 12 ++--- .../dcim/poweroutlet_disconnect.html | 2 +- netbox/templates/dcim/powerport_connect.html | 2 +- .../templates/dcim/powerport_disconnect.html | 2 +- 18 files changed, 158 insertions(+), 125 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 80f54a2a3..b2b77b78c 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -558,8 +558,8 @@ class PowerOutletSerializer(TaggitSerializer, ValidatedModelSerializer): class Meta: model = PowerOutlet - fields = ['id', 'device', 'name', 'connected_port', 'tags'] - read_only_fields = ['connected_port'] + fields = ['id', 'device', 'name', 'connected_endpoint', 'tags'] + read_only_fields = ['connected_endpoint'] class NestedPowerOutletSerializer(WritableNestedSerializer): @@ -572,7 +572,7 @@ class NestedPowerOutletSerializer(WritableNestedSerializer): fields = ['id', 'url', 'device', 'name', 'is_connected'] def get_is_connected(self, obj): - return hasattr(obj, 'connected_port') and obj.connected_port is not None + return hasattr(obj, 'connected_endpoint') and obj.connected_endpoint is not None # @@ -581,12 +581,12 @@ class NestedPowerOutletSerializer(WritableNestedSerializer): class PowerPortSerializer(TaggitSerializer, ValidatedModelSerializer): device = NestedDeviceSerializer() - power_outlet = NestedPowerOutletSerializer(required=False, allow_null=True) + connected_endpoint = NestedPowerOutletSerializer(required=False, allow_null=True) tags = TagListSerializerField(required=False) class Meta: model = PowerPort - fields = ['id', 'device', 'name', 'power_outlet', 'connection_status', 'tags'] + fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'tags'] class NestedPowerPortSerializer(TaggitSerializer, ValidatedModelSerializer): @@ -599,7 +599,7 @@ class NestedPowerPortSerializer(TaggitSerializer, ValidatedModelSerializer): fields = ['id', 'url', 'device', 'name', 'is_connected'] def get_is_connected(self, obj): - return obj.power_outlet is not None + return obj.connected_endpoint is not None # diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index ef4bec9cd..db7149d18 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -343,13 +343,13 @@ class ConsoleServerPortViewSet(ModelViewSet): class PowerPortViewSet(ModelViewSet): - queryset = PowerPort.objects.select_related('device', 'power_outlet__device').prefetch_related('tags') + queryset = PowerPort.objects.select_related('device', 'connected_endpoint__device').prefetch_related('tags') serializer_class = serializers.PowerPortSerializer filter_class = filters.PowerPortFilter class PowerOutletViewSet(ModelViewSet): - queryset = PowerOutlet.objects.select_related('device', 'connected_port__device').prefetch_related('tags') + queryset = PowerOutlet.objects.select_related('device', 'connected_endpoint__device').prefetch_related('tags') serializer_class = serializers.PowerOutletSerializer filter_class = filters.PowerOutletFilter @@ -399,13 +399,21 @@ class InventoryItemViewSet(ModelViewSet): # class ConsoleConnectionViewSet(ListModelMixin, GenericViewSet): - queryset = ConsolePort.objects.select_related('device', 'connected_endpoint__device').filter(connected_endpoint__isnull=False) + queryset = ConsolePort.objects.select_related( + 'device', 'connected_endpoint__device' + ).filter( + connected_endpoint__isnull=False + ) serializer_class = serializers.ConsolePortSerializer filter_class = filters.ConsoleConnectionFilter class PowerConnectionViewSet(ListModelMixin, GenericViewSet): - queryset = PowerPort.objects.select_related('device', 'power_outlet__device').filter(power_outlet__isnull=False) + queryset = PowerPort.objects.select_related( + 'device', 'connected_endpoint__device' + ).filter( + connected_endpoint__isnull=False + ) serializer_class = serializers.PowerPortSerializer filter_class = filters.PowerConnectionFilter diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 3b854dd61..da2055506 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -831,14 +831,14 @@ class PowerConnectionFilter(django_filters.FilterSet): def filter_site(self, queryset, name, value): if not value.strip(): return queryset - return queryset.filter(power_outlet__device__site__slug=value) + return queryset.filter(connected_endpoint__device__site__slug=value) def filter_device(self, queryset, name, value): if not value.strip(): return queryset return queryset.filter( Q(device__name__icontains=value) | - Q(power_outlet__device__name__icontains=value) + Q(connected_endpoint__device__name__icontains=value) ) diff --git a/netbox/dcim/fixtures/dcim.json b/netbox/dcim/fixtures/dcim.json index 148ce8ca6..6c3e4b7df 100644 --- a/netbox/dcim/fixtures/dcim.json +++ b/netbox/dcim/fixtures/dcim.json @@ -2685,7 +2685,7 @@ "fields": { "device": 1, "name": "PEM0", - "power_outlet": 25, + "connected_endpoint": 25, "connection_status": true } }, @@ -2695,7 +2695,7 @@ "fields": { "device": 1, "name": "PEM1", - "power_outlet": 49, + "connected_endpoint": 49, "connection_status": true } }, @@ -2705,7 +2705,7 @@ "fields": { "device": 1, "name": "PEM2", - "power_outlet": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2715,7 +2715,7 @@ "fields": { "device": 1, "name": "PEM3", - "power_outlet": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2725,7 +2725,7 @@ "fields": { "device": 2, "name": "PEM0", - "power_outlet": 26, + "connected_endpoint": 26, "connection_status": true } }, @@ -2735,7 +2735,7 @@ "fields": { "device": 2, "name": "PEM1", - "power_outlet": 50, + "connected_endpoint": 50, "connection_status": true } }, @@ -2745,7 +2745,7 @@ "fields": { "device": 2, "name": "PEM2", - "power_outlet": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2755,7 +2755,7 @@ "fields": { "device": 2, "name": "PEM3", - "power_outlet": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2765,7 +2765,7 @@ "fields": { "device": 4, "name": "PSU0", - "power_outlet": 28, + "connected_endpoint": 28, "connection_status": true } }, @@ -2775,7 +2775,7 @@ "fields": { "device": 4, "name": "PSU1", - "power_outlet": 52, + "connected_endpoint": 52, "connection_status": true } }, @@ -2785,7 +2785,7 @@ "fields": { "device": 5, "name": "PSU0", - "power_outlet": 56, + "connected_endpoint": 56, "connection_status": true } }, @@ -2795,7 +2795,7 @@ "fields": { "device": 5, "name": "PSU1", - "power_outlet": 32, + "connected_endpoint": 32, "connection_status": true } }, @@ -2805,7 +2805,7 @@ "fields": { "device": 3, "name": "PSU0", - "power_outlet": 27, + "connected_endpoint": 27, "connection_status": true } }, @@ -2815,7 +2815,7 @@ "fields": { "device": 3, "name": "PSU1", - "power_outlet": 51, + "connected_endpoint": 51, "connection_status": true } }, @@ -2825,7 +2825,7 @@ "fields": { "device": 7, "name": "PEM0", - "power_outlet": 53, + "connected_endpoint": 53, "connection_status": true } }, @@ -2835,7 +2835,7 @@ "fields": { "device": 7, "name": "PEM1", - "power_outlet": 29, + "connected_endpoint": 29, "connection_status": true } }, @@ -2845,7 +2845,7 @@ "fields": { "device": 7, "name": "PEM2", - "power_outlet": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2855,7 +2855,7 @@ "fields": { "device": 7, "name": "PEM3", - "power_outlet": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2865,7 +2865,7 @@ "fields": { "device": 8, "name": "PEM0", - "power_outlet": 54, + "connected_endpoint": 54, "connection_status": true } }, @@ -2875,7 +2875,7 @@ "fields": { "device": 8, "name": "PEM1", - "power_outlet": 30, + "connected_endpoint": 30, "connection_status": true } }, @@ -2885,7 +2885,7 @@ "fields": { "device": 8, "name": "PEM2", - "power_outlet": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2895,7 +2895,7 @@ "fields": { "device": 8, "name": "PEM3", - "power_outlet": null, + "connected_endpoint": null, "connection_status": true } }, @@ -2905,7 +2905,7 @@ "fields": { "device": 6, "name": "PSU0", - "power_outlet": 55, + "connected_endpoint": 55, "connection_status": true } }, @@ -2915,7 +2915,7 @@ "fields": { "device": 6, "name": "PSU1", - "power_outlet": 31, + "connected_endpoint": 31, "connection_status": true } }, @@ -2925,7 +2925,7 @@ "fields": { "device": 9, "name": "PSU", - "power_outlet": null, + "connected_endpoint": null, "connection_status": true } }, diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index a59553b49..762fe7c4c 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1570,7 +1570,7 @@ class PowerConnectionCSVForm(forms.ModelForm): 'invalid_choice': 'PDU not found.', } ) - power_outlet = forms.CharField( + connected_endpoint = forms.CharField( help_text='Power outlet name' ) device = FlexibleModelChoiceField( @@ -1591,7 +1591,7 @@ class PowerConnectionCSVForm(forms.ModelForm): class Meta: model = PowerPort - fields = ['pdu', 'power_outlet', 'device', 'power_port', 'connection_status'] + fields = ['pdu', 'connected_endpoint', 'device', 'power_port', 'connection_status'] def clean_power_port(self): @@ -1605,7 +1605,7 @@ class PowerConnectionCSVForm(forms.ModelForm): device=self.cleaned_data['device'], name=power_port_name ) # Check if the power port is already connected - if powerport.power_outlet is not None: + if powerport.connected_endpoint is not None: raise forms.ValidationError("{} {} is already connected".format( self.cleaned_data['device'], power_port_name )) @@ -1617,28 +1617,28 @@ class PowerConnectionCSVForm(forms.ModelForm): self.instance = powerport return powerport - def clean_power_outlet(self): + def clean_connected_endpoint(self): - power_outlet_name = self.cleaned_data.get('power_outlet') - if not self.cleaned_data.get('pdu') or not power_outlet_name: + poweroutlet_name = self.cleaned_data.get('connected_endpoint') + if not self.cleaned_data.get('pdu') or not poweroutlet_name: return None try: # Retrieve power outlet by name - power_outlet = PowerOutlet.objects.get( - device=self.cleaned_data['pdu'], name=power_outlet_name + poweroutlet = PowerOutlet.objects.get( + device=self.cleaned_data['pdu'], name=poweroutlet_name ) # Check if the power outlet is already connected - if PowerPort.objects.filter(power_outlet=power_outlet).count(): + if PowerPort.objects.filter(connected_endpoint=poweroutlet).count(): raise forms.ValidationError("{} {} is already connected".format( - self.cleaned_data['pdu'], power_outlet_name + self.cleaned_data['pdu'], poweroutlet_name )) except PowerOutlet.DoesNotExist: raise forms.ValidationError("Invalid power outlet ({} {})".format( - self.cleaned_data['pdu'], power_outlet_name + self.cleaned_data['pdu'], poweroutlet_name )) - return power_outlet + return poweroutlet class PowerPortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): @@ -1672,7 +1672,7 @@ class PowerPortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelFor widget=APISelect( api_url='/api/dcim/devices/?site_id={{site}}&rack_id={{rack}}&is_pdu=True', display_field='display_name', - attrs={'filter-for': 'power_outlet'} + attrs={'filter-for': 'connected_endpoint'} ) ) livesearch = forms.CharField( @@ -1684,7 +1684,7 @@ class PowerPortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelFor field_to_update='pdu' ) ) - power_outlet = ChainedModelChoiceField( + connected_endpoint = ChainedModelChoiceField( queryset=PowerOutlet.objects.all(), chains=( ('device', 'pdu'), @@ -1698,9 +1698,9 @@ class PowerPortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelFor class Meta: model = PowerPort - fields = ['site', 'rack', 'pdu', 'livesearch', 'power_outlet', 'connection_status'] + fields = ['site', 'rack', 'pdu', 'livesearch', 'connected_endpoint', 'connection_status'] labels = { - 'power_outlet': 'Outlet', + 'connected_endpoint': 'Outlet', 'connection_status': 'Status', } diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py index d160e57d7..2413fa3a5 100644 --- a/netbox/dcim/migrations/0066_cables.py +++ b/netbox/dcim/migrations/0066_cables.py @@ -42,13 +42,13 @@ def power_connections_to_cables(apps, schema_editor): poweroutlet_type = ContentType.objects.get_for_model(PowerOutlet) # Create a new Cable instance from each power connection - for powerport in PowerPort.objects.filter(power_outlet__isnull=False): + for powerport in PowerPort.objects.filter(connected_endpoint__isnull=False): c = Cable() # We have to assign GFK fields manually because we're inside a migration. c.endpoint_a_type = powerport_type c.endpoint_a_id = powerport.id c.endpoint_b_type = poweroutlet_type - c.endpoint_b_id = powerport.power_outlet_id + c.endpoint_b_id = powerport.connected_endpoint_id c.connection_status = powerport.connection_status c.save() @@ -108,7 +108,7 @@ class Migration(migrations.Migration): unique_together={('endpoint_b_type', 'endpoint_b_id'), ('endpoint_a_type', 'endpoint_a_id')}, ), - # Rename model fields + # Alter console port models migrations.RenameField( model_name='consoleport', old_name='cs_port', @@ -125,6 +125,23 @@ class Migration(migrations.Migration): field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='consoleserverports', to='dcim.Device'), ), + # Alter power port models + migrations.RenameField( + model_name='powerport', + old_name='power_outlet', + new_name='connected_endpoint' + ), + migrations.AlterField( + model_name='powerport', + name='connected_endpoint', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='connected_endpoint', to='dcim.PowerOutlet'), + ), + migrations.AlterField( + model_name='poweroutlet', + name='device', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='poweroutlets', to='dcim.Device'), + ), + # Copy console/power/interface connections as Cables migrations.RunPython(console_connections_to_cables), migrations.RunPython(power_connections_to_cables), diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 412079682..53459143c 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1732,10 +1732,10 @@ class PowerPort(ComponentModel): name = models.CharField( max_length=50 ) - power_outlet = models.OneToOneField( + connected_endpoint = models.OneToOneField( to='dcim.PowerOutlet', on_delete=models.SET_NULL, - related_name='connected_port', + related_name='connected_endpoint', blank=True, null=True ) @@ -1746,7 +1746,7 @@ class PowerPort(ComponentModel): tags = TaggableManager() - csv_headers = ['pdu', 'power_outlet', 'device', 'power_port', 'connection_status'] + csv_headers = ['pdu', 'connected_endpoint', 'device', 'power_port', 'connection_status'] class Meta: ordering = ['device', 'name'] @@ -1760,8 +1760,8 @@ class PowerPort(ComponentModel): def to_csv(self): return ( - self.power_outlet.device.identifier if self.power_outlet else None, - self.power_outlet.name if self.power_outlet else None, + self.connected_endpoint.device.identifier if self.connected_endpoint else None, + self.connected_endpoint.name if self.connected_endpoint else None, self.device.identifier, self.name, self.get_connection_status_display(), @@ -1789,7 +1789,7 @@ class PowerOutlet(ComponentModel): device = models.ForeignKey( to='dcim.Device', on_delete=models.CASCADE, - related_name='power_outlets' + related_name='poweroutlets' ) name = models.CharField( max_length=50 diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index b5f62e792..6174593af 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -638,15 +638,19 @@ class ConsoleConnectionTable(BaseTable): class PowerConnectionTable(BaseTable): - pdu = tables.LinkColumn('dcim:device', accessor=Accessor('power_outlet.device'), - args=[Accessor('power_outlet.device.pk')], verbose_name='PDU') - power_outlet = tables.Column(verbose_name='Outlet') + pdu = tables.LinkColumn( + 'dcim:device', + accessor=Accessor('connected_endpoint.device'), + args=[Accessor('connected_endpoint.device.pk')], + verbose_name='PDU' + ) + connected_endpoint = tables.Column(verbose_name='Outlet') device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device') name = tables.Column(verbose_name='Power Port') class Meta(BaseTable.Meta): model = PowerPort - fields = ('pdu', 'power_outlet', 'device', 'name') + fields = ('pdu', 'connected_endpoint', 'device', 'name') class InterfaceConnectionTable(BaseTable): diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 040c6dab5..e6cc02537 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -2231,7 +2231,7 @@ class PowerPortTest(APITestCase): data = { 'device': self.device.pk, 'name': 'Test Power Port X', - 'power_outlet': poweroutlet.pk, + 'connected_endpoint': poweroutlet.pk, } url = reverse('dcim-api:powerport-detail', kwargs={'pk': self.powerport1.pk}) @@ -2241,7 +2241,7 @@ class PowerPortTest(APITestCase): self.assertEqual(PowerPort.objects.count(), 3) powerport1 = PowerPort.objects.get(pk=response.data['id']) self.assertEqual(powerport1.name, data['name']) - self.assertEqual(powerport1.power_outlet_id, data['power_outlet']) + self.assertEqual(powerport1.connected_endpoint_id, data['connected_endpoint']) def test_delete_powerport(self): @@ -2861,17 +2861,17 @@ class PowerConnectionTest(APITestCase): device2 = Device.objects.create( device_type=devicetype, device_role=devicerole, name='Test Device 2', site=site ) - power_outlet1 = PowerOutlet.objects.create(device=device1, name='Test Power Outlet 1') - power_outlet2 = PowerOutlet.objects.create(device=device1, name='Test Power Outlet 2') - power_outlet3 = PowerOutlet.objects.create(device=device1, name='Test Power Outlet 3') + poweroutlet1 = PowerOutlet.objects.create(device=device1, name='Test Power Outlet 1') + poweroutlet2 = PowerOutlet.objects.create(device=device1, name='Test Power Outlet 2') + poweroutlet3 = PowerOutlet.objects.create(device=device1, name='Test Power Outlet 3') PowerPort.objects.create( - device=device2, power_outlet=power_outlet1, name='Test Power Port 1', connection_status=True + device=device2, connected_endpoint=poweroutlet1, name='Test Power Port 1', connection_status=True ) PowerPort.objects.create( - device=device2, power_outlet=power_outlet2, name='Test Power Port 2', connection_status=True + device=device2, connected_endpoint=poweroutlet2, name='Test Power Port 2', connection_status=True ) PowerPort.objects.create( - device=device2, power_outlet=power_outlet3, name='Test Power Port 3', connection_status=True + device=device2, connected_endpoint=poweroutlet3, name='Test Power Port 3', connection_status=True ) def test_list_powerconnections(self): diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index bcf39f626..5dcb70c0e 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -862,8 +862,9 @@ class PlatformBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # class DeviceListView(ObjectListView): - queryset = Device.objects.select_related('device_type__manufacturer', 'device_role', 'tenant', 'site', 'rack', - 'primary_ip4', 'primary_ip6') + queryset = Device.objects.select_related( + 'device_type__manufacturer', 'device_role', 'tenant', 'site', 'rack', 'primary_ip4', 'primary_ip6' + ) filter = filters.DeviceFilter filter_form = forms.DeviceFilterForm table = tables.DeviceDetailTable @@ -894,11 +895,11 @@ class DeviceView(View): # Power ports power_ports = natsorted( - PowerPort.objects.filter(device=device).select_related('power_outlet__device'), key=attrgetter('name') + PowerPort.objects.filter(device=device).select_related('connected_endpoint__device'), key=attrgetter('name') ) # Power outlets - power_outlets = PowerOutlet.objects.filter(device=device).select_related('connected_port') + poweroutlets = PowerOutlet.objects.filter(device=device).select_related('connected_endpoint') # Interfaces interfaces = device.vc_interfaces.order_naturally( @@ -943,7 +944,7 @@ class DeviceView(View): 'console_ports': console_ports, 'consoleserverports': consoleserverports, 'power_ports': power_ports, - 'power_outlets': power_outlets, + 'poweroutlets': poweroutlets, 'interfaces': interfaces, 'device_bays': device_bays, 'front_panel_ports': front_panel_ports, @@ -1419,9 +1420,9 @@ class PowerPortConnectView(PermissionRequiredMixin, View): powerport.device.get_absolute_url(), escape(powerport.device), escape(powerport.name), - powerport.power_outlet.device.get_absolute_url(), - escape(powerport.power_outlet.device), - escape(powerport.power_outlet.name), + powerport.connected_endpoint.device.get_absolute_url(), + escape(powerport.connected_endpoint.device), + escape(powerport.connected_endpoint.name), ) messages.success(request, mark_safe(msg)) @@ -1442,7 +1443,7 @@ class PowerPortDisconnectView(PermissionRequiredMixin, View): powerport = get_object_or_404(PowerPort, pk=pk) form = ConfirmationForm() - if not powerport.power_outlet: + if not powerport.connected_endpoint: messages.warning( request, "Cannot disconnect power port {}: It is not connected to an outlet.".format(powerport) ) @@ -1461,17 +1462,17 @@ class PowerPortDisconnectView(PermissionRequiredMixin, View): if form.is_valid(): - power_outlet = powerport.power_outlet - powerport.power_outlet = None + poweroutlet = powerport.connected_endpoint + powerport.connected_endpoint = None powerport.connection_status = None powerport.save() msg = 'Disconnected {} {} from {} {}'.format( powerport.device.get_absolute_url(), escape(powerport.device), escape(powerport.name), - power_outlet.device.get_absolute_url(), - escape(power_outlet.device), - escape(power_outlet.name), + poweroutlet.device.get_absolute_url(), + escape(poweroutlet.device), + escape(poweroutlet.name), ) messages.success(request, mark_safe(msg)) @@ -1549,7 +1550,7 @@ class PowerOutletConnectView(PermissionRequiredMixin, View): if form.is_valid(): powerport = form.cleaned_data['port'] - powerport.power_outlet = poweroutlet + powerport.connected_endpoint = poweroutlet powerport.connection_status = form.cleaned_data['connection_status'] powerport.save() msg = 'Connected {} {} to {} {}'.format( @@ -1579,7 +1580,7 @@ class PowerOutletDisconnectView(PermissionRequiredMixin, View): poweroutlet = get_object_or_404(PowerOutlet, pk=pk) form = ConfirmationForm() - if not hasattr(poweroutlet, 'connected_port'): + if not hasattr(poweroutlet, 'connected_endpoint'): messages.warning( request, "Cannot disconnect power outlet {}: Nothing is connected to it.".format(poweroutlet) ) @@ -1598,8 +1599,8 @@ class PowerOutletDisconnectView(PermissionRequiredMixin, View): if form.is_valid(): - powerport = poweroutlet.connected_port - powerport.power_outlet = None + powerport = poweroutlet.connected_endpoint + powerport.connected_endpoint = None powerport.connection_status = None powerport.save() msg = 'Disconnected {} {} from {} {}'.format( @@ -1643,9 +1644,9 @@ class PowerOutletBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView) model = PowerOutlet form = forms.PowerOutletBulkDisconnectForm - def disconnect_objects(self, power_outlets): - return PowerPort.objects.filter(power_outlet__in=power_outlets).update( - power_outlet=None, connection_status=None + def disconnect_objects(self, poweroutlets): + return PowerPort.objects.filter(connected_endpoint__in=poweroutlets).update( + connected_endpoint=None, connection_status=None ) @@ -2143,8 +2144,13 @@ class ConsoleConnectionsListView(ObjectListView): class PowerConnectionsListView(ObjectListView): - queryset = PowerPort.objects.select_related('device', 'power_outlet__device').filter(power_outlet__isnull=False) \ - .order_by('power_outlet__device__name', 'power_outlet__name') + queryset = PowerPort.objects.select_related( + 'device', 'connected_endpoint__device' + ).filter( + connected_endpoint__isnull=False + ).order_by( + 'connected_endpoint__device__name', 'connected_endpoint__name' + ) filter = filters.PowerConnectionFilter filter_form = forms.PowerConnectionFilterForm table = tables.PowerConnectionTable diff --git a/netbox/extras/models.py b/netbox/extras/models.py index 5e7dbac24..8bc0a8726 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -526,8 +526,7 @@ class TopologyMap(models.Model): from dcim.models import ConsolePort # Add all console connections to the graph - console_ports = ConsolePort.objects.filter(device__in=devices, connected_endpoint__device__in=devices) - for cp in console_ports: + for cp in ConsolePort.objects.filter(device__in=devices, connected_endpoint__device__in=devices): style = 'solid' if cp.connection_status == CONNECTION_STATUS_CONNECTED else 'dashed' self.graph.edge(cp.connected_endpoint.device.name, cp.device.name, style=style) @@ -536,10 +535,9 @@ class TopologyMap(models.Model): from dcim.models import PowerPort # Add all power connections to the graph - power_ports = PowerPort.objects.filter(device__in=devices, power_outlet__device__in=devices) - for pp in power_ports: + for pp in PowerPort.objects.filter(device__in=devices, connected_endpoint__device__in=devices): style = 'solid' if pp.connection_status == CONNECTION_STATUS_CONNECTED else 'dashed' - self.graph.edge(pp.power_outlet.device.name, pp.device.name, style=style) + self.graph.edge(pp.connected_endpoint.device.name, pp.device.name, style=style) # diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index d7bb29f2e..e13a3df5a 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -168,7 +168,7 @@ class HomeView(View): 'device_count': Device.objects.count(), 'interface_connections_count': InterfaceConnection.objects.count(), 'console_connections_count': ConsolePort.objects.filter(connected_endpoint__isnull=False).count(), - 'power_connections_count': PowerPort.objects.filter(power_outlet__isnull=False).count(), + 'power_connections_count': PowerPort.objects.filter(connected_endpoint__isnull=False).count(), # IPAM 'vrf_count': VRF.objects.count(), diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 194b6ab64..2d838704c 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -631,7 +631,7 @@ {% endif %} {% endif %} - {% if power_outlets or device.device_type.is_pdu %} + {% if poweroutlets or device.device_type.is_pdu %} {% if perms.dcim.delete_poweroutlet %}
{% csrf_token %} @@ -652,7 +652,7 @@ - {% for po in power_outlets %} + {% for po in poweroutlets %} {% include 'dcim/inc/poweroutlet.html' %} {% empty %} @@ -662,7 +662,7 @@
- {% if power_outlets and perms.dcim.change_powerport %} + {% if poweroutlets and perms.dcim.change_powerport %} @@ -670,7 +670,7 @@ Disconnect {% endif %} - {% if power_outlets and perms.dcim.delete_poweroutlet %} + {% if poweroutlets and perms.dcim.delete_poweroutlet %} diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index 84c018460..313f458e9 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -1,4 +1,4 @@ - + {% if perms.dcim.change_poweroutlet or perms.dcim.delete_poweroutlet %} @@ -7,12 +7,12 @@ {{ po }} - {% if po.connected_port %} + {% if po.connected_endpoint %} - {{ po.connected_port.device }} + {{ po.connected_endpoint.device }} - {{ po.connected_port }} + {{ po.connected_endpoint }} {% else %} @@ -21,13 +21,13 @@ {% endif %} {% if perms.dcim.change_poweroutlet %} - {% if po.connected_port %} - {% if po.connected_port.connection_status %} - + {% if po.connected_endpoint %} + {% if po.connected_endpoint.connection_status %} + {% else %} - + {% endif %} @@ -44,7 +44,7 @@ {% endif %} {% if perms.dcim.delete_poweroutlet %} - {% if po.connected_port %} + {% if po.connected_endpoint %} diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index 7db2003b0..47989ddee 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -1,13 +1,13 @@ - + {{ pp }} - {% if pp.power_outlet %} + {% if pp.connected_endpoint %} - {{ pp.power_outlet.device }} + {{ pp.connected_endpoint.device }} - {{ pp.power_outlet }} + {{ pp.connected_endpoint }} {% else %} @@ -16,7 +16,7 @@ {% endif %} {% if perms.dcim.change_powerport %} - {% if pp.power_outlet %} + {% if pp.connected_endpoint %} {% if pp.connection_status %} @@ -39,7 +39,7 @@ {% endif %} {% if perms.dcim.delete_powerport %} - {% if pp.power_outlet %} + {% if pp.connected_endpoint %} diff --git a/netbox/templates/dcim/poweroutlet_disconnect.html b/netbox/templates/dcim/poweroutlet_disconnect.html index 81372033b..d315c75ee 100644 --- a/netbox/templates/dcim/poweroutlet_disconnect.html +++ b/netbox/templates/dcim/poweroutlet_disconnect.html @@ -4,5 +4,5 @@ {% block title %}Disconnect {{ poweroutlet.device }} {{ poweroutlet }}?{% endblock %} {% block message %} -

Are you sure you want to disconnect {{ poweroutlet.connected_port.device }} {{ poweroutlet.connected_port }} from this port?

+

Are you sure you want to disconnect {{ poweroutlet.connected_endpoint.device }} {{ poweroutlet.connected_endpoint }} from this port?

{% endblock %} diff --git a/netbox/templates/dcim/powerport_connect.html b/netbox/templates/dcim/powerport_connect.html index 1ffa6de28..70cb8d426 100644 --- a/netbox/templates/dcim/powerport_connect.html +++ b/netbox/templates/dcim/powerport_connect.html @@ -35,7 +35,7 @@ {% render_field form.pdu %}
- {% render_field form.power_outlet %} + {% render_field form.connected_endpoint %} {% render_field form.connection_status %} diff --git a/netbox/templates/dcim/powerport_disconnect.html b/netbox/templates/dcim/powerport_disconnect.html index f98694d9f..6953b1e2f 100644 --- a/netbox/templates/dcim/powerport_disconnect.html +++ b/netbox/templates/dcim/powerport_disconnect.html @@ -4,5 +4,5 @@ {% block title %}Disconnect power port {{ powerport }}?{% endblock %} {% block message %} -

Are you sure you want to disconnect this power port from {{ powerport.power_outlet.device }} {{ powerport.power_outlet }}?

+

Are you sure you want to disconnect this power port from {{ powerport.connected_endpoint.device }} {{ powerport.connected_endpoint }}?

{% endblock %} From f30367e09420b1c3d49c2c01162db465cd44ad92 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 24 Oct 2018 13:59:44 -0400 Subject: [PATCH 017/191] Deprecated the InterfaceConnection model --- netbox/circuits/forms.py | 4 +- netbox/dcim/api/serializers.py | 55 ++--- netbox/dcim/api/urls.py | 2 +- netbox/dcim/api/views.py | 18 +- netbox/dcim/filters.py | 17 +- netbox/dcim/fixtures/dcim.json | 153 ------------- netbox/dcim/forms.py | 174 +------------- netbox/dcim/migrations/0066_cables.py | 49 ++++ netbox/dcim/models.py | 159 ++----------- netbox/dcim/tables.py | 41 ++-- netbox/dcim/tests/test_api.py | 214 ++++-------------- netbox/dcim/urls.py | 11 +- netbox/dcim/views.py | 139 ++---------- netbox/extras/constants.py | 2 +- netbox/extras/models.py | 15 +- netbox/netbox/views.py | 22 +- .../dcim/console_connections_list.html | 3 - netbox/templates/dcim/device.html | 2 +- netbox/templates/dcim/inc/interface.html | 2 +- .../dcim/interface_connections_list.html | 3 - .../dcim/power_connections_list.html | 3 - netbox/templates/inc/nav_menu.html | 15 -- 22 files changed, 219 insertions(+), 884 deletions(-) diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py index b6a8f0efc..b5883e6ec 100644 --- a/netbox/circuits/forms.py +++ b/netbox/circuits/forms.py @@ -237,9 +237,7 @@ class CircuitTerminationForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm ) ) interface = ChainedModelChoiceField( - queryset=Interface.objects.connectable().select_related( - 'circuit_termination', 'connected_as_a', 'connected_as_b' - ), + queryset=Interface.objects.connectable().select_related('circuit_termination'), chains=( ('device', 'device'), ), diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index b2b77b78c..6e113d394 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -6,10 +6,9 @@ from circuits.models import Circuit, CircuitTermination from dcim.constants import * from dcim.models import ( ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceType, DeviceRole, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceConnection, - InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, - PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, - VirtualChassis, + DeviceBayTemplate, DeviceType, DeviceRole, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate, + Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, + RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis, ) from extras.api.customfields import CustomFieldModelSerializer from ipam.models import IPAddress, VLAN @@ -614,7 +613,7 @@ class IsConnectedMixin(object): """ Return True if the interface has a connected interface or circuit. """ - if obj.connection: + if obj.connected_endpoint: return True if hasattr(obj, 'circuit_termination') and obj.circuit_termination is not None: return True @@ -662,8 +661,8 @@ class InterfaceSerializer(TaggitSerializer, IsConnectedMixin, ValidatedModelSeri device = NestedDeviceSerializer() form_factor = ChoiceField(choices=IFACE_FF_CHOICES, required=False) lag = NestedInterfaceSerializer(required=False, allow_null=True) + connected_endpoint = NestedInterfaceSerializer(required=False, allow_null=True) is_connected = serializers.SerializerMethodField(read_only=True) - interface_connection = serializers.SerializerMethodField(read_only=True) circuit_termination = InterfaceCircuitTerminationSerializer(read_only=True) mode = ChoiceField(choices=IFACE_MODE_CHOICES, required=False, allow_null=True) untagged_vlan = InterfaceVLANSerializer(required=False, allow_null=True) @@ -679,7 +678,7 @@ class InterfaceSerializer(TaggitSerializer, IsConnectedMixin, ValidatedModelSeri model = Interface fields = [ 'id', 'device', 'name', 'form_factor', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description', - 'is_connected', 'interface_connection', 'circuit_termination', 'mode', 'untagged_vlan', 'tagged_vlans', + 'is_connected', 'connected_endpoint', 'circuit_termination', 'mode', 'untagged_vlan', 'tagged_vlans', 'tags', ] @@ -702,15 +701,6 @@ class InterfaceSerializer(TaggitSerializer, IsConnectedMixin, ValidatedModelSeri return super(InterfaceSerializer, self).validate(data) - def get_interface_connection(self, obj): - if obj.connection: - context = { - 'request': self.context['request'], - 'interface': obj.connected_interface, - } - return ContextualInterfaceConnectionSerializer(obj.connection, context=context).data - return None - # # Rear panel ports @@ -804,36 +794,17 @@ class InventoryItemSerializer(TaggitSerializer, ValidatedModelSerializer): # class InterfaceConnectionSerializer(ValidatedModelSerializer): - interface_a = NestedInterfaceSerializer() - interface_b = NestedInterfaceSerializer() + interface_a = serializers.SerializerMethodField() + interface_b = NestedInterfaceSerializer(source='connected_endpoint') connection_status = ChoiceField(choices=CONNECTION_STATUS_CHOICES, required=False) class Meta: - model = InterfaceConnection - fields = ['id', 'interface_a', 'interface_b', 'connection_status'] + model = Interface + fields = ['interface_a', 'interface_b', 'connection_status'] - -class NestedInterfaceConnectionSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interfaceconnection-detail') - - class Meta: - model = InterfaceConnection - fields = ['id', 'url', 'connection_status'] - - -class ContextualInterfaceConnectionSerializer(serializers.ModelSerializer): - """ - A read-only representation of an InterfaceConnection from the perspective of either of its two connected Interfaces. - """ - interface = serializers.SerializerMethodField(read_only=True) - connection_status = ChoiceField(choices=CONNECTION_STATUS_CHOICES, read_only=True) - - class Meta: - model = InterfaceConnection - fields = ['id', 'interface', 'connection_status'] - - def get_interface(self, obj): - return NestedInterfaceSerializer(self.context['interface'], context=self.context).data + def get_interface_a(self, obj): + context = {'request': self.context['request']} + return NestedInterfaceSerializer(instance=obj, context=context).data # diff --git a/netbox/dcim/api/urls.py b/netbox/dcim/api/urls.py index 0e6a5d344..4ddbaf9a8 100644 --- a/netbox/dcim/api/urls.py +++ b/netbox/dcim/api/urls.py @@ -60,7 +60,7 @@ router.register(r'inventory-items', views.InventoryItemViewSet) # Connections router.register(r'console-connections', views.ConsoleConnectionViewSet, base_name='consoleconnections') router.register(r'power-connections', views.PowerConnectionViewSet, base_name='powerconnections') -router.register(r'interface-connections', views.InterfaceConnectionViewSet) +router.register(r'interface-connections', views.InterfaceConnectionViewSet, base_name='interfaceconnections') # Virtual chassis router.register(r'virtual-chassis', views.VirtualChassisViewSet) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index db7149d18..6128d3411 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -1,6 +1,7 @@ from collections import OrderedDict from django.conf import settings +from django.db.models import F from django.http import HttpResponseForbidden from django.shortcuts import get_object_or_404 from drf_yasg import openapi @@ -14,10 +15,9 @@ from rest_framework.viewsets import GenericViewSet, ViewSet from dcim import filters from dcim.models import ( ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceConnection, - InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, - PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, - VirtualChassis, + DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate, + Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, + RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis, ) from extras.api.serializers import RenderedGraphSerializer from extras.api.views import CustomFieldModelViewSet @@ -35,8 +35,7 @@ class DCIMFieldChoicesViewSet(FieldChoicesViewSet): fields = ( (Device, ['face', 'status']), (ConsolePort, ['connection_status']), - (Interface, ['form_factor', 'mode']), - (InterfaceConnection, ['connection_status']), + (Interface, ['connection_status', 'form_factor', 'mode']), (InterfaceTemplate, ['form_factor']), (PowerPort, ['connection_status']), (Rack, ['type', 'width']), @@ -419,7 +418,12 @@ class PowerConnectionViewSet(ListModelMixin, GenericViewSet): class InterfaceConnectionViewSet(ModelViewSet): - queryset = InterfaceConnection.objects.select_related('interface_a__device', 'interface_b__device') + queryset = Interface.objects.select_related( + 'device', 'connected_endpoint__device' + ).filter( + connected_endpoint__isnull=False, + pk__lt=F('connected_endpoint') + ) serializer_class = serializers.InterfaceConnectionSerializer filter_class = filters.InterfaceConnectionFilter diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index da2055506..93d46bf01 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -14,10 +14,9 @@ from .constants import ( ) from .models import ( ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceConnection, - InterfaceTemplate, InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, - PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, - VirtualChassis, + DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate, + InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, + RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis, ) @@ -853,21 +852,21 @@ class InterfaceConnectionFilter(django_filters.FilterSet): ) class Meta: - model = InterfaceConnection + model = Interface fields = ['connection_status'] def filter_site(self, queryset, name, value): if not value.strip(): return queryset return queryset.filter( - Q(interface_a__device__site__slug=value) | - Q(interface_b__device__site__slug=value) + Q(device__site__slug=value) | + Q(connected_endpoint__device__site__slug=value) ) def filter_device(self, queryset, name, value): if not value.strip(): return queryset return queryset.filter( - Q(interface_a__device__name__icontains=value) | - Q(interface_b__device__name__icontains=value) + Q(device__name__icontains=value) | + Q(connected_endpoint__device__name__icontains=value) ) diff --git a/netbox/dcim/fixtures/dcim.json b/netbox/dcim/fixtures/dcim.json index 6c3e4b7df..9ebe9d4c7 100644 --- a/netbox/dcim/fixtures/dcim.json +++ b/netbox/dcim/fixtures/dcim.json @@ -5746,158 +5746,5 @@ "mgmt_only": true, "description": "" } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 3, - "fields": { - "interface_a": 99, - "interface_b": 15, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 4, - "fields": { - "interface_a": 100, - "interface_b": 153, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 5, - "fields": { - "interface_a": 46, - "interface_b": 14, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 6, - "fields": { - "interface_a": 47, - "interface_b": 152, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 7, - "fields": { - "interface_a": 91, - "interface_b": 144, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 8, - "fields": { - "interface_a": 92, - "interface_b": 145, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 16, - "fields": { - "interface_a": 189, - "interface_b": 37, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 17, - "fields": { - "interface_a": 192, - "interface_b": 175, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 18, - "fields": { - "interface_a": 195, - "interface_b": 41, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 19, - "fields": { - "interface_a": 198, - "interface_b": 179, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 20, - "fields": { - "interface_a": 191, - "interface_b": 197, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 21, - "fields": { - "interface_a": 194, - "interface_b": 200, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 22, - "fields": { - "interface_a": 9, - "interface_b": 218, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 23, - "fields": { - "interface_a": 8, - "interface_b": 206, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 24, - "fields": { - "interface_a": 7, - "interface_b": 212, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 25, - "fields": { - "interface_a": 217, - "interface_b": 205, - "connection_status": true - } -}, -{ - "model": "dcim.interfaceconnection", - "pk": 26, - "fields": { - "interface_a": 216, - "interface_b": 211, - "connection_status": true - } } ] diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 762fe7c4c..fd31bb1bf 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -26,10 +26,9 @@ from virtualization.models import Cluster from .constants import * from .models import ( Cable, DeviceBay, DeviceBayTemplate, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, - Device, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceConnection, - InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, - PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, - VirtualChassis, + Device, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate, Manufacturer, + InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, + RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis, ) DEVICE_BY_PK_RE = r'{\d+\}' @@ -2017,173 +2016,6 @@ class InterfaceBulkDisconnectForm(ConfirmationForm): pk = forms.ModelMultipleChoiceField(queryset=Interface.objects.all(), widget=forms.MultipleHiddenInput) -# -# Interface connections -# - -class InterfaceConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): - interface_a = forms.ChoiceField( - choices=[], - widget=SelectWithDisabled, - label='Interface' - ) - site_b = forms.ModelChoiceField( - queryset=Site.objects.all(), - label='Site', - required=False, - widget=forms.Select( - attrs={'filter-for': 'rack_b'} - ) - ) - rack_b = ChainedModelChoiceField( - queryset=Rack.objects.all(), - chains=( - ('site', 'site_b'), - ), - label='Rack', - required=False, - widget=APISelect( - api_url='/api/dcim/racks/?site_id={{site_b}}', - attrs={'filter-for': 'device_b', 'nullable': 'true'} - ) - ) - device_b = ChainedModelChoiceField( - queryset=Device.objects.all(), - chains=( - ('site', 'site_b'), - ('rack', 'rack_b'), - ), - label='Device', - required=False, - widget=APISelect( - api_url='/api/dcim/devices/?site_id={{site_b}}&rack_id={{rack_b}}', - display_field='display_name', - attrs={'filter-for': 'interface_b'} - ) - ) - livesearch = forms.CharField( - required=False, - label='Device', - widget=Livesearch( - query_key='q', - query_url='dcim-api:device-list', - field_to_update='device_b' - ) - ) - interface_b = ChainedModelChoiceField( - queryset=Interface.objects.connectable().select_related( - 'circuit_termination', 'connected_as_a', 'connected_as_b' - ), - chains=( - ('device', 'device_b'), - ), - label='Interface', - widget=APISelect( - api_url='/api/dcim/interfaces/?device_id={{device_b}}&type=physical', - disabled_indicator='is_connected' - ) - ) - - class Meta: - model = InterfaceConnection - fields = ['interface_a', 'site_b', 'rack_b', 'device_b', 'interface_b', 'livesearch', 'connection_status'] - - def __init__(self, device_a, *args, **kwargs): - - super(InterfaceConnectionForm, self).__init__(*args, **kwargs) - - # Initialize interface A choices - device_a_interfaces = device_a.vc_interfaces.connectable().order_naturally().select_related( - 'circuit_termination', 'connected_as_a', 'connected_as_b' - ) - self.fields['interface_a'].choices = [ - (iface.id, {'label': iface.name, 'disabled': iface.is_connected}) for iface in device_a_interfaces - ] - - # Mark connected interfaces as disabled - if self.data.get('device_b'): - self.fields['interface_b'].choices = [] - for iface in self.fields['interface_b'].queryset: - self.fields['interface_b'].choices.append( - (iface.id, {'label': iface.name, 'disabled': iface.is_connected}) - ) - - -class InterfaceConnectionCSVForm(forms.ModelForm): - device_a = FlexibleModelChoiceField( - queryset=Device.objects.all(), - to_field_name='name', - help_text='Name or ID of device A', - error_messages={'invalid_choice': 'Device A not found.'} - ) - interface_a = forms.CharField( - help_text='Name of interface A' - ) - device_b = FlexibleModelChoiceField( - queryset=Device.objects.all(), - to_field_name='name', - help_text='Name or ID of device B', - error_messages={'invalid_choice': 'Device B not found.'} - ) - interface_b = forms.CharField( - help_text='Name of interface B' - ) - connection_status = CSVChoiceField( - choices=CONNECTION_STATUS_CHOICES, - help_text='Connection status' - ) - - class Meta: - model = InterfaceConnection - fields = InterfaceConnection.csv_headers - - def clean_interface_a(self): - - interface_name = self.cleaned_data.get('interface_a') - if not interface_name: - return None - - try: - # Retrieve interface by name - interface = Interface.objects.get( - device=self.cleaned_data['device_a'], name=interface_name - ) - # Check for an existing connection to this interface - if InterfaceConnection.objects.filter(Q(interface_a=interface) | Q(interface_b=interface)).count(): - raise forms.ValidationError("{} {} is already connected".format( - self.cleaned_data['device_a'], interface_name - )) - except Interface.DoesNotExist: - raise forms.ValidationError("Invalid interface ({} {})".format( - self.cleaned_data['device_a'], interface_name - )) - - return interface - - def clean_interface_b(self): - - interface_name = self.cleaned_data.get('interface_b') - if not interface_name: - return None - - try: - # Retrieve interface by name - interface = Interface.objects.get( - device=self.cleaned_data['device_b'], name=interface_name - ) - # Check for an existing connection to this interface - if InterfaceConnection.objects.filter(Q(interface_a=interface) | Q(interface_b=interface)).count(): - raise forms.ValidationError("{} {} is already connected".format( - self.cleaned_data['device_b'], interface_name - )) - except Interface.DoesNotExist: - raise forms.ValidationError("Invalid interface ({} {})".format( - self.cleaned_data['device_b'], interface_name - )) - - return interface - - # # Front panel ports # diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py index 2413fa3a5..ce16c4a93 100644 --- a/netbox/dcim/migrations/0066_cables.py +++ b/netbox/dcim/migrations/0066_cables.py @@ -17,6 +17,7 @@ def console_connections_to_cables(apps, schema_editor): consoleserverport_type = ContentType.objects.get_for_model(ConsoleServerPort) # Create a new Cable instance from each console connection + print("\n Adding console connections... ", end='', flush=True) for consoleport in ConsolePort.objects.filter(connected_endpoint__isnull=False): c = Cable() # We have to assign GFK fields manually because we're inside a migration. @@ -27,6 +28,9 @@ def console_connections_to_cables(apps, schema_editor): c.connection_status = consoleport.connection_status c.save() + cable_count = Cable.objects.filter(endpoint_a_type=consoleport_type).count() + print("{} cables created".format(cable_count)) + def power_connections_to_cables(apps, schema_editor): """ @@ -42,6 +46,7 @@ def power_connections_to_cables(apps, schema_editor): poweroutlet_type = ContentType.objects.get_for_model(PowerOutlet) # Create a new Cable instance from each power connection + print(" Adding power connections... ", end='', flush=True) for powerport in PowerPort.objects.filter(connected_endpoint__isnull=False): c = Cable() # We have to assign GFK fields manually because we're inside a migration. @@ -52,6 +57,9 @@ def power_connections_to_cables(apps, schema_editor): c.connection_status = powerport.connection_status c.save() + cable_count = Cable.objects.filter(endpoint_a_type=powerport_type).count() + print("{} cables created".format(cable_count)) + def interface_connections_to_cables(apps, schema_editor): """ @@ -66,6 +74,7 @@ def interface_connections_to_cables(apps, schema_editor): interface_type = ContentType.objects.get_for_model(Interface) # Create a new Cable instance from each InterfaceConnection + print(" Adding interface connections... ", end='', flush=True) for conn in InterfaceConnection.objects.all(): c = Cable() # We have to assign GFK fields manually because we're inside a migration. @@ -76,8 +85,23 @@ def interface_connections_to_cables(apps, schema_editor): c.connection_status = conn.connection_status c.save() + # connected_endpoint and connection_status must be manually assigned + # since these are new fields on Interface + Interface.objects.filter(pk=conn.interface_a_id).update( + connected_endpoint=conn.interface_b_id, + connection_status=conn.connection_status + ) + Interface.objects.filter(pk=conn.interface_b_id).update( + connected_endpoint=conn.interface_a_id, + connection_status=conn.connection_status + ) + + cable_count = Cable.objects.filter(endpoint_a_type=interface_type).count() + print("{} cables created".format(cable_count)) + class Migration(migrations.Migration): + atomic = False dependencies = [ ('contenttypes', '0002_remove_content_type_name'), @@ -142,9 +166,34 @@ class Migration(migrations.Migration): field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='poweroutlets', to='dcim.Device'), ), + # Alter the Interface model + migrations.AddField( + model_name='interface', + name='connected_endpoint', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Interface'), + ), + migrations.AddField( + model_name='interface', + name='connection_status', + field=models.NullBooleanField(default=True), + ), + # Copy console/power/interface connections as Cables migrations.RunPython(console_connections_to_cables), migrations.RunPython(power_connections_to_cables), migrations.RunPython(interface_connections_to_cables), + # Delete the InterfaceConnection model + migrations.RemoveField( + model_name='interfaceconnection', + name='interface_a', + ), + migrations.RemoveField( + model_name='interfaceconnection', + name='interface_b', + ), + migrations.DeleteModel( + name='InterfaceConnection', + ), + ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 53459143c..d69718013 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1826,7 +1826,7 @@ class PowerOutlet(ComponentModel): class Interface(ComponentModel): """ A network interface within a Device or VirtualMachine. A physical Interface can connect to exactly one other - Interface via the creation of an InterfaceConnection. + Interface. """ device = models.ForeignKey( to='Device', @@ -1842,6 +1842,20 @@ class Interface(ComponentModel): null=True, blank=True ) + name = models.CharField( + max_length=64 + ) + connected_endpoint = models.OneToOneField( + to='self', + on_delete=models.SET_NULL, + related_name='+', + blank=True, + null=True + ) + connection_status = models.NullBooleanField( + choices=CONNECTION_STATUS_CHOICES, + default=CONNECTION_STATUS_CONNECTED + ) lag = models.ForeignKey( to='self', on_delete=models.SET_NULL, @@ -1850,9 +1864,6 @@ class Interface(ComponentModel): blank=True, verbose_name='Parent LAG' ) - name = models.CharField( - max_length=64 - ) form_factor = models.PositiveSmallIntegerField( choices=IFACE_FF_CHOICES, default=IFACE_FF_10GE_SFP_PLUS @@ -2002,10 +2013,7 @@ class Interface(ComponentModel): changed_object=self, related_object=parent_obj, action=action, - object_data=serialize_object(self, extra={ - 'connected_interface': self.connected_interface.pk if self.connection else None, - 'connection_status': self.connection.connection_status if self.connection else None, - }) + object_data=serialize_object(self) ).save() @property @@ -2034,140 +2042,7 @@ class Interface(ComponentModel): return bool(self.circuit_termination) except ObjectDoesNotExist: pass - return bool(self.connection) - - @property - def connection(self): - try: - return self.connected_as_a - except ObjectDoesNotExist: - pass - try: - return self.connected_as_b - except ObjectDoesNotExist: - pass - return None - - @property - def connected_interface(self): - try: - if self.connected_as_a: - return self.connected_as_a.interface_b - except ObjectDoesNotExist: - pass - try: - if self.connected_as_b: - return self.connected_as_b.interface_a - except ObjectDoesNotExist: - pass - return None - - -class InterfaceConnection(models.Model): - """ - An InterfaceConnection represents a symmetrical, one-to-one connection between two Interfaces. There is no - significant difference between the interface_a and interface_b fields. - """ - interface_a = models.OneToOneField( - to='dcim.Interface', - on_delete=models.CASCADE, - related_name='connected_as_a' - ) - interface_b = models.OneToOneField( - to='dcim.Interface', - on_delete=models.CASCADE, - related_name='connected_as_b' - ) - connection_status = models.BooleanField( - choices=CONNECTION_STATUS_CHOICES, - default=CONNECTION_STATUS_CONNECTED, - verbose_name='Status' - ) - - csv_headers = ['device_a', 'interface_a', 'device_b', 'interface_b', 'connection_status'] - - def clean(self): - - # An interface cannot be connected to itself - if self.interface_a == self.interface_b: - raise ValidationError({ - 'interface_b': "Cannot connect an interface to itself." - }) - - # Only connectable interface types are permitted - if self.interface_a.form_factor in NONCONNECTABLE_IFACE_TYPES: - raise ValidationError({ - 'interface_a': '{} is not a connectable interface type.'.format( - self.interface_a.get_form_factor_display() - ) - }) - if self.interface_b.form_factor in NONCONNECTABLE_IFACE_TYPES: - raise ValidationError({ - 'interface_b': '{} is not a connectable interface type.'.format( - self.interface_b.get_form_factor_display() - ) - }) - - # Prevent the A side of one connection from being the B side of another - interface_a_connections = InterfaceConnection.objects.filter( - Q(interface_a=self.interface_a) | - Q(interface_b=self.interface_a) - ).exclude(pk=self.pk) - if interface_a_connections.exists(): - raise ValidationError({ - 'interface_a': "This interface is already connected." - }) - interface_b_connections = InterfaceConnection.objects.filter( - Q(interface_a=self.interface_b) | - Q(interface_b=self.interface_b) - ).exclude(pk=self.pk) - if interface_b_connections.exists(): - raise ValidationError({ - 'interface_b': "This interface is already connected." - }) - - def to_csv(self): - return ( - self.interface_a.device.identifier, - self.interface_a.name, - self.interface_b.device.identifier, - self.interface_b.name, - self.get_connection_status_display(), - ) - - def log_change(self, user, request_id, action): - """ - Create a new ObjectChange for each of the two affected Interfaces. - """ - interfaces = ( - (self.interface_a, self.interface_b), - (self.interface_b, self.interface_a), - ) - - for interface, peer_interface in interfaces: - if action == OBJECTCHANGE_ACTION_DELETE: - connection_data = { - 'connected_interface': None, - } - else: - connection_data = { - 'connected_interface': peer_interface.pk, - 'connection_status': self.connection_status - } - - try: - parent_obj = interface.parent - except ObjectDoesNotExist: - parent_obj = None - - ObjectChange( - user=user, - request_id=request_id, - changed_object=interface, - related_object=parent_obj, - action=OBJECTCHANGE_ACTION_UPDATE, - object_data=serialize_object(interface, extra=connection_data) - ).save() + return bool(self.connected_endpoint) # diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 6174593af..d72497ecd 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -5,10 +5,9 @@ from tenancy.tables import COL_TENANT from utilities.tables import BaseTable, BooleanColumn, ToggleColumn from .models import ( ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceConnection, - InterfaceTemplate, InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, - PowerPortTemplate, Rack, RackGroup, RackReservation, RearPanelPort, RearPanelPortTemplate, Region, Site, - VirtualChassis, + DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate, + InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, + RackGroup, RackReservation, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis, ) REGION_LINK = """ @@ -654,17 +653,33 @@ class PowerConnectionTable(BaseTable): class InterfaceConnectionTable(BaseTable): - device_a = tables.LinkColumn('dcim:device', accessor=Accessor('interface_a.device'), - args=[Accessor('interface_a.device.pk')], verbose_name='Device A') - interface_a = tables.LinkColumn('dcim:interface', accessor=Accessor('interface_a'), - args=[Accessor('interface_a.pk')], verbose_name='Interface A') - device_b = tables.LinkColumn('dcim:device', accessor=Accessor('interface_b.device'), - args=[Accessor('interface_b.device.pk')], verbose_name='Device B') - interface_b = tables.LinkColumn('dcim:interface', accessor=Accessor('interface_b'), - args=[Accessor('interface_b.pk')], verbose_name='Interface B') + device_a = tables.LinkColumn( + viewname='dcim:device', + accessor=Accessor('device'), + args=[Accessor('device.pk')], + verbose_name='Device A' + ) + interface_a = tables.LinkColumn( + viewname='dcim:interface', + accessor=Accessor('name'), + args=[Accessor('pk')], + verbose_name='Interface A' + ) + device_b = tables.LinkColumn( + viewname='dcim:device', + accessor=Accessor('connected_endpoint.device'), + args=[Accessor('connected_endpoint.device.pk')], + verbose_name='Device B' + ) + interface_b = tables.LinkColumn( + viewname='dcim:interface', + accessor=Accessor('connected_endpoint.name'), + args=[Accessor('connected_endpoint.pk')], + verbose_name='Interface B' + ) class Meta(BaseTable.Meta): - model = InterfaceConnection + model = Interface fields = ('device_a', 'interface_a', 'device_b', 'interface_b') diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index e6cc02537..774725725 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -8,7 +8,7 @@ from dcim.constants import ( ) from dcim.models import ( ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, Interface, InterfaceConnection, InterfaceTemplate, Manufacturer, + DeviceBayTemplate, DeviceRole, DeviceType, Interface, InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerPort, PowerPortTemplate, PowerOutlet, PowerOutletTemplate, Rack, RackGroup, RackReservation, RackRole, Region, Site, VirtualChassis, ) @@ -2393,6 +2393,7 @@ class InterfaceTest(APITestCase): url = reverse('dcim-api:interface-detail', kwargs={'pk': self.interface1.pk}) response = self.client.get(url, **self.header) + self.assertHttpStatus(response, status.HTTP_200_OK) self.assertEqual(response.data['name'], self.interface1.name) def test_get_interface_graphs(self): @@ -2882,179 +2883,44 @@ class PowerConnectionTest(APITestCase): self.assertEqual(response.data['count'], 3) -class InterfaceConnectionTest(APITestCase): - - def setUp(self): - - super(InterfaceConnectionTest, self).setUp() - - site = Site.objects.create(name='Test Site 1', slug='test-site-1') - manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1') - devicetype = DeviceType.objects.create( - manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1' - ) - devicerole = DeviceRole.objects.create( - name='Test Device Role 1', slug='test-device-role-1', color='ff0000' - ) - self.device = Device.objects.create( - device_type=devicetype, device_role=devicerole, name='Test Device 1', site=site - ) - self.interface1 = Interface.objects.create(device=self.device, name='Test Interface 1') - self.interface2 = Interface.objects.create(device=self.device, name='Test Interface 2') - self.interface3 = Interface.objects.create(device=self.device, name='Test Interface 3') - self.interface4 = Interface.objects.create(device=self.device, name='Test Interface 4') - self.interface5 = Interface.objects.create(device=self.device, name='Test Interface 5') - self.interface6 = Interface.objects.create(device=self.device, name='Test Interface 6') - self.interface7 = Interface.objects.create(device=self.device, name='Test Interface 7') - self.interface8 = Interface.objects.create(device=self.device, name='Test Interface 8') - self.interface9 = Interface.objects.create(device=self.device, name='Test Interface 9') - self.interface10 = Interface.objects.create(device=self.device, name='Test Interface 10') - self.interface11 = Interface.objects.create(device=self.device, name='Test Interface 11') - self.interface12 = Interface.objects.create(device=self.device, name='Test Interface 12') - self.interfaceconnection1 = InterfaceConnection.objects.create( - interface_a=self.interface1, interface_b=self.interface2 - ) - self.interfaceconnection2 = InterfaceConnection.objects.create( - interface_a=self.interface3, interface_b=self.interface4 - ) - self.interfaceconnection3 = InterfaceConnection.objects.create( - interface_a=self.interface5, interface_b=self.interface6 - ) - - def test_get_interfaceconnection(self): - - url = reverse('dcim-api:interfaceconnection-detail', kwargs={'pk': self.interfaceconnection1.pk}) - response = self.client.get(url, **self.header) - - self.assertEqual(response.data['interface_a']['id'], self.interfaceconnection1.interface_a_id) - self.assertEqual(response.data['interface_b']['id'], self.interfaceconnection1.interface_b_id) - - def test_list_interfaceconnections(self): - - url = reverse('dcim-api:interfaceconnection-list') - response = self.client.get(url, **self.header) - - self.assertEqual(response.data['count'], 3) - - def test_list_interfaceconnections_brief(self): - - url = reverse('dcim-api:interfaceconnection-list') - response = self.client.get('{}?brief=1'.format(url), **self.header) - - self.assertEqual( - sorted(response.data['results'][0]), - ['connection_status', 'id', 'url'] - ) - - def test_create_interfaceconnection(self): - - data = { - 'interface_a': self.interface7.pk, - 'interface_b': self.interface8.pk, - } - - url = reverse('dcim-api:interfaceconnection-list') - response = self.client.post(url, data, format='json', **self.header) - - self.assertHttpStatus(response, status.HTTP_201_CREATED) - self.assertEqual(InterfaceConnection.objects.count(), 4) - interfaceconnection4 = InterfaceConnection.objects.get(pk=response.data['id']) - self.assertEqual(interfaceconnection4.interface_a_id, data['interface_a']) - self.assertEqual(interfaceconnection4.interface_b_id, data['interface_b']) - - def test_create_interfaceconnection_bulk(self): - - data = [ - { - 'interface_a': self.interface7.pk, - 'interface_b': self.interface8.pk, - }, - { - 'interface_a': self.interface9.pk, - 'interface_b': self.interface10.pk, - }, - { - 'interface_a': self.interface11.pk, - 'interface_b': self.interface12.pk, - }, - ] - - url = reverse('dcim-api:interfaceconnection-list') - response = self.client.post(url, data, format='json', **self.header) - - self.assertHttpStatus(response, status.HTTP_201_CREATED) - self.assertEqual(InterfaceConnection.objects.count(), 6) - for i in range(0, 3): - self.assertEqual(response.data[i]['interface_a']['id'], data[i]['interface_a']) - self.assertEqual(response.data[i]['interface_b']['id'], data[i]['interface_b']) - - def test_update_interfaceconnection(self): - - new_connection_status = not self.interfaceconnection1.connection_status - - data = { - 'interface_a': self.interface7.pk, - 'interface_b': self.interface8.pk, - 'connection_status': new_connection_status, - } - - url = reverse('dcim-api:interfaceconnection-detail', kwargs={'pk': self.interfaceconnection1.pk}) - response = self.client.put(url, data, format='json', **self.header) - - self.assertHttpStatus(response, status.HTTP_200_OK) - self.assertEqual(InterfaceConnection.objects.count(), 3) - interfaceconnection1 = InterfaceConnection.objects.get(pk=response.data['id']) - self.assertEqual(interfaceconnection1.interface_a_id, data['interface_a']) - self.assertEqual(interfaceconnection1.interface_b_id, data['interface_b']) - self.assertEqual(interfaceconnection1.connection_status, data['connection_status']) - - def test_delete_interfaceconnection(self): - - url = reverse('dcim-api:interfaceconnection-detail', kwargs={'pk': self.interfaceconnection1.pk}) - response = self.client.delete(url, **self.header) - - self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT) - self.assertEqual(InterfaceConnection.objects.count(), 2) - - -class ConnectedDeviceTest(APITestCase): - - def setUp(self): - - super(ConnectedDeviceTest, self).setUp() - - self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1') - self.site2 = Site.objects.create(name='Test Site 2', slug='test-site-2') - manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1') - self.devicetype1 = DeviceType.objects.create( - manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1' - ) - self.devicetype2 = DeviceType.objects.create( - manufacturer=manufacturer, model='Test Device Type 2', slug='test-device-type-2' - ) - self.devicerole1 = DeviceRole.objects.create( - name='Test Device Role 1', slug='test-device-role-1', color='ff0000' - ) - self.devicerole2 = DeviceRole.objects.create( - name='Test Device Role 2', slug='test-device-role-2', color='00ff00' - ) - self.device1 = Device.objects.create( - device_type=self.devicetype1, device_role=self.devicerole1, name='TestDevice1', site=self.site1 - ) - self.device2 = Device.objects.create( - device_type=self.devicetype1, device_role=self.devicerole1, name='TestDevice2', site=self.site1 - ) - self.interface1 = Interface.objects.create(device=self.device1, name='eth0') - self.interface2 = Interface.objects.create(device=self.device2, name='eth0') - InterfaceConnection.objects.create(interface_a=self.interface1, interface_b=self.interface2) - - def test_get_connected_device(self): - - url = reverse('dcim-api:connected-device-list') - response = self.client.get(url + '?peer-device=TestDevice2&peer-interface=eth0', **self.header) - - self.assertHttpStatus(response, status.HTTP_200_OK) - self.assertEqual(response.data['name'], self.device1.name) +# class ConnectedDeviceTest(APITestCase): +# +# def setUp(self): +# +# super(ConnectedDeviceTest, self).setUp() +# +# self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1') +# self.site2 = Site.objects.create(name='Test Site 2', slug='test-site-2') +# manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1') +# self.devicetype1 = DeviceType.objects.create( +# manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1' +# ) +# self.devicetype2 = DeviceType.objects.create( +# manufacturer=manufacturer, model='Test Device Type 2', slug='test-device-type-2' +# ) +# self.devicerole1 = DeviceRole.objects.create( +# name='Test Device Role 1', slug='test-device-role-1', color='ff0000' +# ) +# self.devicerole2 = DeviceRole.objects.create( +# name='Test Device Role 2', slug='test-device-role-2', color='00ff00' +# ) +# self.device1 = Device.objects.create( +# device_type=self.devicetype1, device_role=self.devicerole1, name='TestDevice1', site=self.site1 +# ) +# self.device2 = Device.objects.create( +# device_type=self.devicetype1, device_role=self.devicerole1, name='TestDevice2', site=self.site1 +# ) +# self.interface1 = Interface.objects.create(device=self.device1, name='eth0') +# self.interface2 = Interface.objects.create(device=self.device2, name='eth0') +# InterfaceConnection.objects.create(interface_a=self.interface1, interface_b=self.interface2) +# +# def test_get_connected_device(self): +# +# url = reverse('dcim-api:connected-device-list') +# response = self.client.get(url + '?peer-device=TestDevice2&peer-interface=eth0', **self.header) +# +# self.assertHttpStatus(response, status.HTTP_200_OK) +# self.assertEqual(response.data['name'], self.device1.name) class VirtualChassisTest(APITestCase): diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 3e011b4c3..a7f52b80c 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -207,8 +207,9 @@ urlpatterns = [ url(r'^devices/(?P\d+)/interfaces/edit/$', views.InterfaceBulkEditView.as_view(), name='interface_bulk_edit'), url(r'^devices/(?P\d+)/interfaces/disconnect/$', views.InterfaceBulkDisconnectView.as_view(), name='interface_bulk_disconnect'), url(r'^devices/(?P\d+)/interfaces/delete/$', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'), - url(r'^devices/(?P\d+)/interface-connections/add/$', views.InterfaceConnectionAddView.as_view(), name='interfaceconnection_add'), - url(r'^interface-connections/(?P\d+)/delete/$', views.InterfaceConnectionDeleteView.as_view(), name='interfaceconnection_delete'), + # url(r'^devices/(?P\d+)/interface-connections/add/$', views.InterfaceConnectionAddView.as_view(), name='interfaceconnection_add'), + url(r'^interfaces/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='interface_connect', kwargs={'endpoint_a_type': Interface}), + # url(r'^interface-connections/(?P\d+)/delete/$', views.InterfaceConnectionDeleteView.as_view(), name='interfaceconnection_delete'), url(r'^interfaces/(?P\d+)/$', views.InterfaceView.as_view(), name='interface'), url(r'^interfaces/(?P\d+)/edit/$', views.InterfaceEditView.as_view(), name='interface_edit'), url(r'^interfaces/(?P\d+)/assign-vlans/$', views.InterfaceAssignVLANsView.as_view(), name='interface_assign_vlans'), @@ -253,11 +254,11 @@ urlpatterns = [ # Console/power/interface connections url(r'^console-connections/$', views.ConsoleConnectionsListView.as_view(), name='console_connections_list'), - url(r'^console-connections/import/$', views.ConsoleConnectionsBulkImportView.as_view(), name='console_connections_import'), + # url(r'^console-connections/import/$', views.ConsoleConnectionsBulkImportView.as_view(), name='console_connections_import'), url(r'^power-connections/$', views.PowerConnectionsListView.as_view(), name='power_connections_list'), - url(r'^power-connections/import/$', views.PowerConnectionsBulkImportView.as_view(), name='power_connections_import'), + # url(r'^power-connections/import/$', views.PowerConnectionsBulkImportView.as_view(), name='power_connections_import'), url(r'^interface-connections/$', views.InterfaceConnectionsListView.as_view(), name='interface_connections_list'), - url(r'^interface-connections/import/$', views.InterfaceConnectionsBulkImportView.as_view(), name='interface_connections_import'), + # url(r'^interface-connections/import/$', views.InterfaceConnectionsBulkImportView.as_view(), name='interface_connections_import'), # Virtual chassis url(r'^virtual-chassis/$', views.VirtualChassisListView.as_view(), name='virtualchassis_list'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 5dcb70c0e..991ec2ac0 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -6,7 +6,7 @@ from django.contrib.auth.mixins import PermissionRequiredMixin from django.core.exceptions import ObjectDoesNotExist from django.core.paginator import EmptyPage, PageNotAnInteger from django.db import transaction -from django.db.models import Count, Q +from django.db.models import Count, F, Q from django.forms import modelformset_factory from django.http import Http404, HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render @@ -33,10 +33,9 @@ from . import filters, forms, tables from .constants import CONNECTION_STATUS_CONNECTED from .models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceConnection, - InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, - PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, - VirtualChassis, + DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate, + Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, + RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis, ) @@ -905,8 +904,7 @@ class DeviceView(View): interfaces = device.vc_interfaces.order_naturally( device.device_type.interface_ordering ).select_related( - 'connected_as_a__interface_b__device', 'connected_as_b__interface_a__device', - 'circuit_termination__circuit' + 'connected_endpoint__device', 'circuit_termination__circuit' ).prefetch_related('ip_addresses') # Front panel ports @@ -999,7 +997,7 @@ class DeviceLLDPNeighborsView(PermissionRequiredMixin, View): interfaces = device.vc_interfaces.order_naturally( device.device_type.interface_ordering ).connectable().select_related( - 'connected_as_a', 'connected_as_b' + 'connected_endpoint__device' ) return render(request, 'dcim/device_lldp_neighbors.html', { @@ -1736,10 +1734,9 @@ class InterfaceBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView): form = forms.InterfaceBulkDisconnectForm def disconnect_objects(self, interfaces): - count, _ = InterfaceConnection.objects.filter( - Q(interface_a__in=interfaces) | Q(interface_b__in=interfaces) - ).delete() - return count + return Interface.objects.filter(connected_endpoint__in=interfaces).update( + connected_endpoint=None, connection_status=None + ) class InterfaceBulkEditView(PermissionRequiredMixin, BulkEditView): @@ -2016,115 +2013,6 @@ class DeviceBulkAddDeviceBayView(PermissionRequiredMixin, BulkComponentCreateVie default_return_url = 'dcim:device_list' -# -# Interface connections -# - -class InterfaceConnectionAddView(PermissionRequiredMixin, GetReturnURLMixin, View): - permission_required = 'dcim.add_interfaceconnection' - default_return_url = 'dcim:device_list' - - def get(self, request, pk): - - device = get_object_or_404(Device, pk=pk) - form = forms.InterfaceConnectionForm(device, initial={ - 'interface_a': request.GET.get('interface_a'), - 'site_b': request.GET.get('site_b'), - 'rack_b': request.GET.get('rack_b'), - 'device_b': request.GET.get('device_b'), - 'interface_b': request.GET.get('interface_b'), - }) - - return render(request, 'dcim/interfaceconnection_edit.html', { - 'device': device, - 'form': form, - 'return_url': device.get_absolute_url(), - }) - - def post(self, request, pk): - - device = get_object_or_404(Device, pk=pk) - form = forms.InterfaceConnectionForm(device, request.POST) - - if form.is_valid(): - - interfaceconnection = form.save() - msg = 'Connected {} {} to {} {}'.format( - interfaceconnection.interface_a.device.get_absolute_url(), - escape(interfaceconnection.interface_a.device), - escape(interfaceconnection.interface_a.name), - interfaceconnection.interface_b.device.get_absolute_url(), - escape(interfaceconnection.interface_b.device), - escape(interfaceconnection.interface_b.name), - ) - messages.success(request, mark_safe(msg)) - - if '_addanother' in request.POST: - base_url = reverse('dcim:interfaceconnection_add', kwargs={'pk': device.pk}) - device_b = interfaceconnection.interface_b.device - params = urlencode({ - 'rack_b': device_b.rack.pk if device_b.rack else '', - 'device_b': device_b.pk, - }) - return HttpResponseRedirect('{}?{}'.format(base_url, params)) - else: - return redirect('dcim:device', pk=device.pk) - - return render(request, 'dcim/interfaceconnection_edit.html', { - 'device': device, - 'form': form, - 'return_url': device.get_absolute_url(), - }) - - -class InterfaceConnectionDeleteView(PermissionRequiredMixin, GetReturnURLMixin, View): - permission_required = 'dcim.delete_interfaceconnection' - default_return_url = 'dcim:device_list' - - def get(self, request, pk): - - interfaceconnection = get_object_or_404(InterfaceConnection, pk=pk) - form = forms.ConfirmationForm() - - return render(request, 'dcim/interfaceconnection_delete.html', { - 'interfaceconnection': interfaceconnection, - 'form': form, - 'return_url': self.get_return_url(request, interfaceconnection), - }) - - def post(self, request, pk): - - interfaceconnection = get_object_or_404(InterfaceConnection, pk=pk) - form = forms.ConfirmationForm(request.POST) - - if form.is_valid(): - interfaceconnection.delete() - msg = 'Disconnected {} {} from {} {}'.format( - interfaceconnection.interface_a.device.get_absolute_url(), - escape(interfaceconnection.interface_a.device), - escape(interfaceconnection.interface_a.name), - interfaceconnection.interface_b.device.get_absolute_url(), - escape(interfaceconnection.interface_b.device), - escape(interfaceconnection.interface_b.name), - ) - messages.success(request, mark_safe(msg)) - - return redirect(self.get_return_url(request, interfaceconnection)) - - return render(request, 'dcim/interfaceconnection_delete.html', { - 'interfaceconnection': interfaceconnection, - 'form': form, - 'return_url': self.get_return_url(request, interfaceconnection), - }) - - -class InterfaceConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView): - permission_required = 'dcim.change_interface' - model_form = forms.InterfaceConnectionCSVForm - table = tables.InterfaceConnectionTable - default_return_url = 'dcim:interface_connections_list' - - # # Connections # @@ -2158,10 +2046,11 @@ class PowerConnectionsListView(ObjectListView): class InterfaceConnectionsListView(ObjectListView): - queryset = InterfaceConnection.objects.select_related( - 'interface_a__device', 'interface_b__device' - ).order_by( - 'interface_a__device__name', 'interface_a__name' + queryset = Interface.objects.select_related( + 'connected_endpoint__device', + ).filter( + connected_endpoint__isnull=False, + pk__lt=F('connected_endpoint'), ) filter = filters.InterfaceConnectionFilter filter_form = forms.InterfaceConnectionFilterForm diff --git a/netbox/extras/constants.py b/netbox/extras/constants.py index 2397ece7b..5c7939e68 100644 --- a/netbox/extras/constants.py +++ b/netbox/extras/constants.py @@ -49,7 +49,7 @@ GRAPH_TYPE_CHOICES = ( EXPORTTEMPLATE_MODELS = [ 'provider', 'circuit', # Circuits 'site', 'region', 'rack', 'rackgroup', 'manufacturer', 'devicetype', 'device', # DCIM - 'consoleport', 'powerport', 'interfaceconnection', 'virtualchassis', # DCIM + 'consoleport', 'powerport', 'interface', 'virtualchassis', # DCIM 'aggregate', 'prefix', 'ipaddress', 'vlan', 'vrf', 'service', # IPAM 'secret', # Secrets 'tenant', # Tenancy diff --git a/netbox/extras/models.py b/netbox/extras/models.py index 8bc0a8726..abd9cf49d 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -504,15 +504,18 @@ class TopologyMap(models.Model): def add_network_connections(self, devices): from circuits.models import CircuitTermination - from dcim.models import InterfaceConnection + from dcim.models import Interface # Add all interface connections to the graph - connections = InterfaceConnection.objects.filter( - interface_a__device__in=devices, interface_b__device__in=devices + connected_interfaces = Interface.objects.select_related( + 'connected_endpoint__device' + ).filter( + Q(device__in=devices) | Q(connected_endpoint__device__in=devices), + connected_endpoint__isnull=False, ) - for c in connections: - style = 'solid' if c.connection_status == CONNECTION_STATUS_CONNECTED else 'dashed' - self.graph.edge(c.interface_a.device.name, c.interface_b.device.name, style=style) + for interface in connected_interfaces: + style = 'solid' if interface.connection_status == CONNECTION_STATUS_CONNECTED else 'dashed' + self.graph.edge(interface.device.name, interface.connected_endpoint.device.name, style=style) # Add all circuits to the graph for termination in CircuitTermination.objects.filter(term_side='A', interface__device__in=devices): diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index e13a3df5a..b75debefe 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -1,6 +1,6 @@ from collections import OrderedDict -from django.db.models import Count +from django.db.models import Count, F from django.shortcuts import render from django.views.generic import View from rest_framework.response import Response @@ -14,8 +14,7 @@ from dcim.filters import ( DeviceFilter, DeviceTypeFilter, RackFilter, RackGroupFilter, SiteFilter, VirtualChassisFilter ) from dcim.models import ( - ConsolePort, Device, DeviceType, InterfaceConnection, PowerPort, Rack, RackGroup, Site, - VirtualChassis + ConsolePort, Device, DeviceType, Interface, PowerPort, Rack, RackGroup, Site, VirtualChassis ) from dcim.tables import ( DeviceDetailTable, DeviceTypeTable, RackTable, RackGroupTable, SiteTable, VirtualChassisTable @@ -157,6 +156,17 @@ class HomeView(View): def get(self, request): + connected_consoleports = ConsolePort.objects.filter( + connected_endpoint__isnull=False + ) + connected_powerports = PowerPort.objects.filter( + connected_endpoint__isnull=False + ) + connected_interfaces = Interface.objects.filter( + connected_endpoint__isnull=False, + pk__lt=F('connected_endpoint') + ) + stats = { # Organization @@ -166,9 +176,9 @@ class HomeView(View): # DCIM 'rack_count': Rack.objects.count(), 'device_count': Device.objects.count(), - 'interface_connections_count': InterfaceConnection.objects.count(), - 'console_connections_count': ConsolePort.objects.filter(connected_endpoint__isnull=False).count(), - 'power_connections_count': PowerPort.objects.filter(connected_endpoint__isnull=False).count(), + 'interface_connections_count': connected_interfaces.count(), + 'console_connections_count': connected_consoleports.count(), + 'power_connections_count': connected_powerports.count(), # IPAM 'vrf_count': VRF.objects.count(), diff --git a/netbox/templates/dcim/console_connections_list.html b/netbox/templates/dcim/console_connections_list.html index 89eb0822d..cf47d426c 100644 --- a/netbox/templates/dcim/console_connections_list.html +++ b/netbox/templates/dcim/console_connections_list.html @@ -3,9 +3,6 @@ {% block content %}
- {% if perms.dcim.change_consoleport %} - {% import_button 'dcim:console_connections_import' %} - {% endif %} {% export_button content_type %}

{% block title %}Console Connections{% endblock %}

diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 2d838704c..165a86595 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -549,7 +549,7 @@ Edit {% endif %} - {% if interfaces and perms.dcim.delete_interfaceconnection %} + {% if interfaces and perms.dcim.change_interface %} diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 229f6f2eb..723f14760 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -106,7 +106,7 @@ {% else %} - + {% endif %} diff --git a/netbox/templates/dcim/interface_connections_list.html b/netbox/templates/dcim/interface_connections_list.html index 950eb2f0b..e81eb55ee 100644 --- a/netbox/templates/dcim/interface_connections_list.html +++ b/netbox/templates/dcim/interface_connections_list.html @@ -3,9 +3,6 @@ {% block content %}
- {% if perms.dcim.add_interfaceconnection %} - {% import_button 'dcim:interface_connections_import' %} - {% endif %} {% export_button content_type %}

{% block title %}Interface Connections{% endblock %}

diff --git a/netbox/templates/dcim/power_connections_list.html b/netbox/templates/dcim/power_connections_list.html index 4e351eb6a..a41d571fb 100644 --- a/netbox/templates/dcim/power_connections_list.html +++ b/netbox/templates/dcim/power_connections_list.html @@ -3,9 +3,6 @@ {% block content %}
- {% if perms.dcim.change_powerport %} - {% import_button 'dcim:power_connections_import' %} - {% endif %} {% export_button content_type %}

{% block title %}Power Connections{% endblock %}

diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html index aeddf1969..08ecb926d 100644 --- a/netbox/templates/inc/nav_menu.html +++ b/netbox/templates/inc/nav_menu.html @@ -180,27 +180,12 @@
  • Connections
  • - {% if perms.dcim.change_consoleport %} -
    - -
    - {% endif %} Console Connections
  • - {% if perms.dcim.change_powerport %} -
    - -
    - {% endif %} Power Connections
  • - {% if perms.dcim.add_interfaceconnection %} -
    - -
    - {% endif %} Interface Connections
    • From 9985f2cb82af6b37e70f5d06a04953201a33f3ab Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 24 Oct 2018 14:24:02 -0400 Subject: [PATCH 018/191] Added CableListView --- netbox/dcim/tables.py | 38 ++++++++++++++++- netbox/dcim/urls.py | 16 ++++---- netbox/dcim/views.py | 59 +++++++++++++++++---------- netbox/templates/dcim/cable_list.html | 17 ++++++++ netbox/templates/inc/nav_menu.html | 5 ++- 5 files changed, 105 insertions(+), 30 deletions(-) create mode 100644 netbox/templates/dcim/cable_list.html diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index d72497ecd..df7b6d89b 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -4,7 +4,7 @@ from django_tables2.utils import Accessor from tenancy.tables import COL_TENANT from utilities.tables import BaseTable, BooleanColumn, ToggleColumn from .models import ( - ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, + Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate, InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis, @@ -616,6 +616,42 @@ class DeviceBayTable(BaseTable): fields = ('name',) +# +# Cables +# + +class CableTable(BaseTable): + device_a = tables.LinkColumn( + viewname='dcim:device', + accessor=Accessor('endpoint_a.device'), + args=[Accessor('endpoint_a.device.pk')], + verbose_name='Device A' + ) + termination_a = tables.Column( + accessor=Accessor('endpoint_a.name'), + verbose_name='Component' + ) + device_b = tables.LinkColumn( + viewname='dcim:device', + accessor=Accessor('endpoint_b.device'), + args=[Accessor('endpoint_b.device.pk')], + verbose_name='Device B' + ) + termination_b = tables.Column( + accessor=Accessor('endpoint_b.name'), + verbose_name='Component' + ) + # django-tables2 adds CSS `class="label"` which causes rendering issues + _label = tables.Column( + accessor=Accessor('label'), + verbose_name='Label' + ) + + class Meta(BaseTable.Meta): + model = Cable + fields = ('device_a', 'termination_a', 'device_b', 'termination_b', 'status', '_label', 'color') + + # # Device connections # diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index a7f52b80c..0a71c698f 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -162,7 +162,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/console-ports/add/$', views.ConsolePortCreateView.as_view(), name='consoleport_add'), url(r'^devices/(?P\d+)/console-ports/delete/$', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'), # url(r'^console-ports/(?P\d+)/connect/$', views.ConsolePortConnectView.as_view(), name='consoleport_connect'), - url(r'^console-ports/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='consoleport_connect', kwargs={'endpoint_a_type': ConsolePort}), + url(r'^console-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='consoleport_connect', kwargs={'endpoint_a_type': ConsolePort}), url(r'^console-ports/(?P\d+)/disconnect/$', views.ConsolePortDisconnectView.as_view(), name='consoleport_disconnect'), url(r'^console-ports/(?P\d+)/edit/$', views.ConsolePortEditView.as_view(), name='consoleport_edit'), url(r'^console-ports/(?P\d+)/delete/$', views.ConsolePortDeleteView.as_view(), name='consoleport_delete'), @@ -173,7 +173,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/console-server-ports/disconnect/$', views.ConsoleServerPortBulkDisconnectView.as_view(), name='consoleserverport_bulk_disconnect'), url(r'^devices/(?P\d+)/console-server-ports/delete/$', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'), # url(r'^console-server-ports/(?P\d+)/connect/$', views.ConsoleServerPortConnectView.as_view(), name='consoleserverport_connect'), - url(r'^console-server-ports/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='consoleserverport_connect', kwargs={'endpoint_a_type': ConsoleServerPort}), + url(r'^console-server-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'endpoint_a_type': ConsoleServerPort}), url(r'^console-server-ports/(?P\d+)/disconnect/$', views.ConsoleServerPortDisconnectView.as_view(), name='consoleserverport_disconnect'), url(r'^console-server-ports/(?P\d+)/edit/$', views.ConsoleServerPortEditView.as_view(), name='consoleserverport_edit'), url(r'^console-server-ports/(?P\d+)/delete/$', views.ConsoleServerPortDeleteView.as_view(), name='consoleserverport_delete'), @@ -184,7 +184,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/power-ports/add/$', views.PowerPortCreateView.as_view(), name='powerport_add'), url(r'^devices/(?P\d+)/power-ports/delete/$', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'), # url(r'^power-ports/(?P\d+)/connect/$', views.PowerPortConnectView.as_view(), name='powerport_connect'), - url(r'^power-ports/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='powerport_connect', kwargs={'endpoint_a_type': PowerPort}), + url(r'^power-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='powerport_connect', kwargs={'endpoint_a_type': PowerPort}), url(r'^power-ports/(?P\d+)/disconnect/$', views.PowerPortDisconnectView.as_view(), name='powerport_disconnect'), url(r'^power-ports/(?P\d+)/edit/$', views.PowerPortEditView.as_view(), name='powerport_edit'), url(r'^power-ports/(?P\d+)/delete/$', views.PowerPortDeleteView.as_view(), name='powerport_delete'), @@ -195,7 +195,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/power-outlets/disconnect/$', views.PowerOutletBulkDisconnectView.as_view(), name='poweroutlet_bulk_disconnect'), url(r'^devices/(?P\d+)/power-outlets/delete/$', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'), # url(r'^power-outlets/(?P\d+)/connect/$', views.PowerOutletConnectView.as_view(), name='poweroutlet_connect'), - url(r'^power-outlets/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='poweroutlet_connect', kwargs={'endpoint_a_type': PowerOutlet}), + url(r'^power-outlets/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'endpoint_a_type': PowerOutlet}), url(r'^power-outlets/(?P\d+)/disconnect/$', views.PowerOutletDisconnectView.as_view(), name='poweroutlet_disconnect'), url(r'^power-outlets/(?P\d+)/edit/$', views.PowerOutletEditView.as_view(), name='poweroutlet_edit'), url(r'^power-outlets/(?P\d+)/delete/$', views.PowerOutletDeleteView.as_view(), name='poweroutlet_delete'), @@ -207,9 +207,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/interfaces/edit/$', views.InterfaceBulkEditView.as_view(), name='interface_bulk_edit'), url(r'^devices/(?P\d+)/interfaces/disconnect/$', views.InterfaceBulkDisconnectView.as_view(), name='interface_bulk_disconnect'), url(r'^devices/(?P\d+)/interfaces/delete/$', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'), - # url(r'^devices/(?P\d+)/interface-connections/add/$', views.InterfaceConnectionAddView.as_view(), name='interfaceconnection_add'), - url(r'^interfaces/(?P\d+)/connect/$', views.CableConnectView.as_view(), name='interface_connect', kwargs={'endpoint_a_type': Interface}), - # url(r'^interface-connections/(?P\d+)/delete/$', views.InterfaceConnectionDeleteView.as_view(), name='interfaceconnection_delete'), + url(r'^interfaces/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='interface_connect', kwargs={'endpoint_a_type': Interface}), url(r'^interfaces/(?P\d+)/$', views.InterfaceView.as_view(), name='interface'), url(r'^interfaces/(?P\d+)/edit/$', views.InterfaceEditView.as_view(), name='interface_edit'), url(r'^interfaces/(?P\d+)/assign-vlans/$', views.InterfaceAssignVLANsView.as_view(), name='interface_assign_vlans'), @@ -252,6 +250,10 @@ urlpatterns = [ url(r'^inventory-items/(?P\d+)/delete/$', views.InventoryItemDeleteView.as_view(), name='inventoryitem_delete'), url(r'^devices/(?P\d+)/inventory-items/add/$', views.InventoryItemEditView.as_view(), name='inventoryitem_add'), + # Cables + url(r'^cables/$', views.CableListView.as_view(), name='cable_list'), + url(r'^cables/(?P\d+)/delete/$', views.CableDeleteView.as_view(), name='cable_delete'), + # Console/power/interface connections url(r'^console-connections/$', views.ConsoleConnectionsListView.as_view(), name='console_connections_list'), # url(r'^console-connections/import/$', views.ConsoleConnectionsBulkImportView.as_view(), name='console_connections_import'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 991ec2ac0..3246ca281 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1,18 +1,14 @@ from operator import attrgetter -from django.apps import apps from django.contrib import messages from django.contrib.auth.mixins import PermissionRequiredMixin -from django.core.exceptions import ObjectDoesNotExist from django.core.paginator import EmptyPage, PageNotAnInteger from django.db import transaction -from django.db.models import Count, F, Q +from django.db.models import Count, F from django.forms import modelformset_factory -from django.http import Http404, HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse from django.utils.html import escape -from django.utils.http import urlencode from django.utils.safestring import mark_safe from django.views.generic import View from natsort import natsorted @@ -2013,6 +2009,43 @@ class DeviceBulkAddDeviceBayView(PermissionRequiredMixin, BulkComponentCreateVie default_return_url = 'dcim:device_list' +# +# Cables +# + +class CableListView(ObjectListView): + queryset = Cable.objects.prefetch_related( + 'endpoint_a__device', 'endpoint_b__device' + ) + # filter = filters.CableFilter + # filter_form = forms.CableFilterForm + table = tables.CableTable + template_name = 'dcim/cable_list.html' + + +class CableCreateView(PermissionRequiredMixin, ObjectEditView): + permission_required = 'dcim.add_cable' + model = Cable + model_form = forms.CableForm + template_name = 'dcim/cable_connect.html' + + def alter_obj(self, obj, request, url_args, url_kwargs): + + # Retrieve endpoint A based on the given type and PK + endpoint_a_type = url_kwargs.get('endpoint_a_type') + endpoint_a_id = url_kwargs.get('endpoint_a_id') + obj.endpoint_a = endpoint_a_type.objects.get(pk=endpoint_a_id) + + return obj + + +class CableDeleteView(PermissionRequiredMixin, ObjectDeleteView): + permission_required = 'dcim.delete_cable' + model = Cable + default_return_url = 'dcim:cable_list' + + + # # Connections # @@ -2058,22 +2091,6 @@ class InterfaceConnectionsListView(ObjectListView): template_name = 'dcim/interface_connections_list.html' -class CableConnectView(PermissionRequiredMixin, ObjectEditView): - permission_required = 'dcim.add_cable' - model = Cable - model_form = forms.CableForm - template_name = 'dcim/cable_connect.html' - - def alter_obj(self, obj, request, url_args, url_kwargs): - - # Retrieve endpoint A based on the given type and PK - endpoint_a_type = url_kwargs.get('endpoint_a_type') - endpoint_a_id = url_kwargs.get('endpoint_a_id') - obj.endpoint_a = endpoint_a_type.objects.get(pk=endpoint_a_id) - - return obj - - # # Inventory items # diff --git a/netbox/templates/dcim/cable_list.html b/netbox/templates/dcim/cable_list.html new file mode 100644 index 000000000..b942986e3 --- /dev/null +++ b/netbox/templates/dcim/cable_list.html @@ -0,0 +1,17 @@ +{% extends '_base.html' %} +{% load buttons %} + +{% block content %} +
    + {% export_button content_type %} +
    +

    {% block title %}Cables{% endblock %}

    +
    +
    + {% include 'responsive_table.html' %} +
    +
    + {% include 'inc/search_panel.html' %} +
    +
    +{% endblock %} diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html index 08ecb926d..ef6329564 100644 --- a/netbox/templates/inc/nav_menu.html +++ b/netbox/templates/inc/nav_menu.html @@ -113,7 +113,7 @@ -
  • +
    • Devices
      • @@ -179,6 +179,9 @@
    • Connections
      • +
    • + Cables +
    • Console Connections
      • From 54c917beff351be7f17045ccf277d9a8cfd4ee6d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 24 Oct 2018 14:38:44 -0400 Subject: [PATCH 019/191] Renamed Cable endpoints to terminations --- netbox/dcim/constants.py | 6 +-- netbox/dcim/forms.py | 42 +++++++++---------- netbox/dcim/migrations/0066_cables.py | 40 +++++++++--------- netbox/dcim/models.py | 30 ++++++------- netbox/dcim/signals.py | 20 ++++----- netbox/dcim/tables.py | 12 +++--- netbox/dcim/urls.py | 10 ++--- netbox/dcim/views.py | 8 ++-- netbox/templates/dcim/cable_connect.html | 22 +++++----- netbox/templates/dcim/inc/consoleport.html | 2 +- .../templates/dcim/inc/consoleserverport.html | 2 +- netbox/templates/dcim/inc/interface.html | 2 +- netbox/templates/dcim/inc/poweroutlet.html | 2 +- netbox/templates/dcim/inc/powerport.html | 2 +- 14 files changed, 100 insertions(+), 100 deletions(-) diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index 7b11028d4..07078525c 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -284,7 +284,7 @@ CONNECTION_STATUS_CHOICES = [ ] # Cable endpoint types -CABLE_ENDPOINT_TYPES = [ +CABLE_TERMINATION_TYPES = [ 'consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport', ] @@ -297,7 +297,7 @@ CABLE_TYPE_CHOICES = ( (CABLE_TYPE_FIBER, 'Fiber'), ) -CABLE_ENDPOINT_TYPE_CHOICES = { +CABLE_TERMINATION_TYPE_CHOICES = { # (API endpoint, human-friendly name) 'consoleport': ('console-ports', 'Console port'), 'consoleserverport': ('console-server-ports', 'Console server port'), @@ -308,7 +308,7 @@ CABLE_ENDPOINT_TYPE_CHOICES = { 'rearpanelport': ('rear-panel-ports', 'Rear panel port'), } -COMPATIBLE_ENDPOINT_TYPES = { +COMPATIBLE_TERMINATION_TYPES = { 'consoleport': ['consoleserverport', 'frontpanelport', 'rearpanelport'], 'consoleserverport': ['consoleport', 'frontpanelport', 'rearpanelport'], 'powerport': ['poweroutlet'], diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index fd31bb1bf..e0e65aa3a 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -2137,38 +2137,38 @@ class RearPanelPortBulkRenameForm(BulkRenameForm): # class CableForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): - endpoint_b_site = forms.ModelChoiceField( + termination_b_site = forms.ModelChoiceField( queryset=Site.objects.all(), label='Site', required=False, widget=forms.Select( - attrs={'filter-for': 'endpoint_b_rack'} + attrs={'filter-for': 'termination_b_rack'} ) ) - endpoint_b_rack = ChainedModelChoiceField( + termination_b_rack = ChainedModelChoiceField( queryset=Rack.objects.all(), chains=( - ('site', 'endpoint_b_site'), + ('site', 'termination_b_site'), ), label='Rack', required=False, widget=APISelect( - api_url='/api/dcim/racks/?site_id={{endpoint_b_site}}', - attrs={'filter-for': 'endpoint_b_device', 'nullable': 'true'} + api_url='/api/dcim/racks/?site_id={{termination_b_site}}', + attrs={'filter-for': 'termination_b_device', 'nullable': 'true'} ) ) - endpoint_b_device = ChainedModelChoiceField( + termination_b_device = ChainedModelChoiceField( queryset=Device.objects.all(), chains=( - ('site', 'endpoint_b_site'), - ('rack', 'endpoint_b_rack'), + ('site', 'termination_b_site'), + ('rack', 'termination_b_rack'), ), label='Device', required=False, widget=APISelect( - api_url='/api/dcim/devices/?site_id={{endpoint_b_site}}&rack_id={{endpoint_b_rack}}', + api_url='/api/dcim/devices/?site_id={termination_b_site}}&rack_id={{termination_b_rack}}', display_field='display_name', - attrs={'filter-for': 'endpoint_b_id'} + attrs={'filter-for': 'termination_b_id'} ) ) livesearch = forms.CharField( @@ -2177,20 +2177,20 @@ class CableForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): widget=Livesearch( query_key='q', query_url='dcim-api:device-list', - field_to_update='endpoint_b_device' + field_to_update='termination_b_device' ) ) - endpoint_b_type = forms.ModelChoiceField( + termination_b_type = forms.ModelChoiceField( queryset=ContentType.objects.all(), label='Type', widget=ContentTypeSelect( - attrs={'filter-for': 'endpoint_b_id'} + attrs={'filter-for': 'termination_b_id'} ) ) - endpoint_b_id = forms.IntegerField( + termination_b_id = forms.IntegerField( label='Name', widget=APISelect( - api_url='/api/dcim/{{endpoint_b_type}}s/?device_id={{endpoint_b_device}}', + api_url='/api/dcim/{{termination_b_type}}s/?device_id={{termination_b_device}}', disabled_indicator='is_connected' ) ) @@ -2198,17 +2198,17 @@ class CableForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): class Meta: model = Cable fields = [ - 'endpoint_b_site', 'endpoint_b_rack', 'endpoint_b_device', 'livesearch', 'endpoint_b_type', - 'endpoint_b_id', 'status', 'label', + 'termination_b_site', 'termination_b_rack', 'termination_b_device', 'livesearch', 'termination_b_type', + 'termination_b_id', 'status', 'label', ] def __init__(self, *args, **kwargs): super(CableForm, self).__init__(*args, **kwargs) # Define available types for endpoint B based on the type of endpoint A - endpoint_a_type = self.instance.endpoint_a._meta.model_name - self.fields['endpoint_b_type'].queryset = ContentType.objects.filter( - model__in=COMPATIBLE_ENDPOINT_TYPES.get(endpoint_a_type) + termination_a_type = self.instance.termination_a._meta.model_name + self.fields['termination_b_type'].queryset = ContentType.objects.filter( + model__in=COMPATIBLE_TERMINATION_TYPES.get(termination_a_type) ) diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py index ce16c4a93..7865be358 100644 --- a/netbox/dcim/migrations/0066_cables.py +++ b/netbox/dcim/migrations/0066_cables.py @@ -21,14 +21,14 @@ def console_connections_to_cables(apps, schema_editor): for consoleport in ConsolePort.objects.filter(connected_endpoint__isnull=False): c = Cable() # We have to assign GFK fields manually because we're inside a migration. - c.endpoint_a_type = consoleport_type - c.endpoint_a_id = consoleport.id - c.endpoint_b_type = consoleserverport_type - c.endpoint_b_id = consoleport.connected_endpoint_id + c.termination_a_type = consoleport_type + c.termination_a_id = consoleport.id + c.termination_b_type = consoleserverport_type + c.termination_b_id = consoleport.connected_endpoint_id c.connection_status = consoleport.connection_status c.save() - cable_count = Cable.objects.filter(endpoint_a_type=consoleport_type).count() + cable_count = Cable.objects.filter(termination_a_type=consoleport_type).count() print("{} cables created".format(cable_count)) @@ -50,14 +50,14 @@ def power_connections_to_cables(apps, schema_editor): for powerport in PowerPort.objects.filter(connected_endpoint__isnull=False): c = Cable() # We have to assign GFK fields manually because we're inside a migration. - c.endpoint_a_type = powerport_type - c.endpoint_a_id = powerport.id - c.endpoint_b_type = poweroutlet_type - c.endpoint_b_id = powerport.connected_endpoint_id + c.termination_a_type = powerport_type + c.termination_a_id = powerport.id + c.termination_b_type = poweroutlet_type + c.termination_b_id = powerport.connected_endpoint_id c.connection_status = powerport.connection_status c.save() - cable_count = Cable.objects.filter(endpoint_a_type=powerport_type).count() + cable_count = Cable.objects.filter(termination_a_type=powerport_type).count() print("{} cables created".format(cable_count)) @@ -78,10 +78,10 @@ def interface_connections_to_cables(apps, schema_editor): for conn in InterfaceConnection.objects.all(): c = Cable() # We have to assign GFK fields manually because we're inside a migration. - c.endpoint_a_type = interface_type - c.endpoint_a_id = conn.interface_a_id - c.endpoint_b_type = interface_type - c.endpoint_b_id = conn.interface_b_id + c.termination_a_type = interface_type + c.termination_a_id = conn.interface_a_id + c.termination_b_type = interface_type + c.termination_b_id = conn.interface_b_id c.connection_status = conn.connection_status c.save() @@ -96,7 +96,7 @@ def interface_connections_to_cables(apps, schema_editor): connection_status=conn.connection_status ) - cable_count = Cable.objects.filter(endpoint_a_type=interface_type).count() + cable_count = Cable.objects.filter(termination_a_type=interface_type).count() print("{} cables created".format(cable_count)) @@ -117,19 +117,19 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), ('created', models.DateField(auto_now_add=True, null=True)), ('last_updated', models.DateTimeField(auto_now=True, null=True)), - ('endpoint_a_id', models.PositiveIntegerField()), - ('endpoint_b_id', models.PositiveIntegerField()), + ('termination_a_id', models.PositiveIntegerField()), + ('termination_b_id', models.PositiveIntegerField()), ('type', models.PositiveSmallIntegerField(blank=True, null=True)), ('status', models.BooleanField(default=True)), ('label', models.CharField(blank=True, max_length=100)), ('color', utilities.fields.ColorField(blank=True, max_length=6)), - ('endpoint_a_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), - ('endpoint_b_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), + ('termination_a_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), + ('termination_b_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), ], ), migrations.AlterUniqueTogether( name='cable', - unique_together={('endpoint_b_type', 'endpoint_b_id'), ('endpoint_a_type', 'endpoint_a_id')}, + unique_together={('termination_b_type', 'termination_b_id'), ('termination_a_type', 'termination_a_id')}, ), # Alter console port models diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index d69718013..8da7c102b 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2327,27 +2327,27 @@ class Cable(ChangeLoggedModel): """ A physical connection between two endpoints. """ - endpoint_a_type = models.ForeignKey( + termination_a_type = models.ForeignKey( to=ContentType, - limit_choices_to={'model__in': CABLE_ENDPOINT_TYPES}, + limit_choices_to={'model__in': CABLE_TERMINATION_TYPES}, on_delete=models.PROTECT, related_name='+' ) - endpoint_a_id = models.PositiveIntegerField() - endpoint_a = GenericForeignKey( - ct_field='endpoint_a_type', - fk_field='endpoint_a_id' + termination_a_id = models.PositiveIntegerField() + termination_a = GenericForeignKey( + ct_field='termination_a_type', + fk_field='termination_a_id' ) - endpoint_b_type = models.ForeignKey( + termination_b_type = models.ForeignKey( to=ContentType, - limit_choices_to={'model__in': CABLE_ENDPOINT_TYPES}, + limit_choices_to={'model__in': CABLE_TERMINATION_TYPES}, on_delete=models.PROTECT, related_name='+' ) - endpoint_b_id = models.PositiveIntegerField() - endpoint_b = GenericForeignKey( - ct_field='endpoint_b_type', - fk_field='endpoint_b_id' + termination_b_id = models.PositiveIntegerField() + termination_b = GenericForeignKey( + ct_field='termination_b_type', + fk_field='termination_b_id' ) type = models.PositiveSmallIntegerField( choices=CABLE_TYPE_CHOICES, @@ -2368,8 +2368,8 @@ class Cable(ChangeLoggedModel): class Meta: unique_together = ( - ('endpoint_a_type', 'endpoint_a_id'), - ('endpoint_b_type', 'endpoint_b_id'), + ('termination_a_type', 'termination_a_id'), + ('termination_b_type', 'termination_b_id'), ) # TODO: This should follow all cables in a path @@ -2377,4 +2377,4 @@ class Cable(ChangeLoggedModel): """ Return the endpoints connected by this cable path. """ - return (self.endpoint_a, self.endpoint_b) + return (self.termination_a, self.termination_b) diff --git a/netbox/dcim/signals.py b/netbox/dcim/signals.py index 68dce2938..2320ba2d5 100644 --- a/netbox/dcim/signals.py +++ b/netbox/dcim/signals.py @@ -26,11 +26,11 @@ def update_connected_endpoints(instance, **kwargs): """ When a Cable is saved, update its connected endpoints. """ - endpoint_a, endpoint_b = instance.get_path_endpoints() - endpoint_a.connected_endpoint = endpoint_b - endpoint_a.save() - endpoint_b.connected_endpoint = endpoint_a - endpoint_b.save() + termination_a, termination_b = instance.get_path_endpoints() + termination_a.connected_endpoint = termination_b + termination_a.save() + termination_b.connected_endpoint = termination_a + termination_b.save() @receiver(post_delete, sender=Cable) @@ -38,8 +38,8 @@ def nullify_connected_endpoints(instance, **kwargs): """ When a Cable is deleted, nullify its connected endpoints. """ - endpoint_a, endpoint_b = instance.get_path_endpoints() - endpoint_a.connected_endpoint = None - endpoint_a.save() - endpoint_b.connected_endpoint = None - endpoint_b.save() + termination_a, termination_b = instance.get_path_endpoints() + termination_a.connected_endpoint = None + termination_a.save() + termination_b.connected_endpoint = None + termination_b.save() diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index df7b6d89b..c8566e008 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -623,22 +623,22 @@ class DeviceBayTable(BaseTable): class CableTable(BaseTable): device_a = tables.LinkColumn( viewname='dcim:device', - accessor=Accessor('endpoint_a.device'), - args=[Accessor('endpoint_a.device.pk')], + accessor=Accessor('termination_a.device'), + args=[Accessor('termination_a.device.pk')], verbose_name='Device A' ) termination_a = tables.Column( - accessor=Accessor('endpoint_a.name'), + accessor=Accessor('termination_a.name'), verbose_name='Component' ) device_b = tables.LinkColumn( viewname='dcim:device', - accessor=Accessor('endpoint_b.device'), - args=[Accessor('endpoint_b.device.pk')], + accessor=Accessor('termination_b.device'), + args=[Accessor('termination_b.device.pk')], verbose_name='Device B' ) termination_b = tables.Column( - accessor=Accessor('endpoint_b.name'), + accessor=Accessor('termination_b.name'), verbose_name='Component' ) # django-tables2 adds CSS `class="label"` which causes rendering issues diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 0a71c698f..2c6152e5b 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -162,7 +162,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/console-ports/add/$', views.ConsolePortCreateView.as_view(), name='consoleport_add'), url(r'^devices/(?P\d+)/console-ports/delete/$', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'), # url(r'^console-ports/(?P\d+)/connect/$', views.ConsolePortConnectView.as_view(), name='consoleport_connect'), - url(r'^console-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='consoleport_connect', kwargs={'endpoint_a_type': ConsolePort}), + url(r'^console-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='consoleport_connect', kwargs={'termination_a_type': ConsolePort}), url(r'^console-ports/(?P\d+)/disconnect/$', views.ConsolePortDisconnectView.as_view(), name='consoleport_disconnect'), url(r'^console-ports/(?P\d+)/edit/$', views.ConsolePortEditView.as_view(), name='consoleport_edit'), url(r'^console-ports/(?P\d+)/delete/$', views.ConsolePortDeleteView.as_view(), name='consoleport_delete'), @@ -173,7 +173,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/console-server-ports/disconnect/$', views.ConsoleServerPortBulkDisconnectView.as_view(), name='consoleserverport_bulk_disconnect'), url(r'^devices/(?P\d+)/console-server-ports/delete/$', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'), # url(r'^console-server-ports/(?P\d+)/connect/$', views.ConsoleServerPortConnectView.as_view(), name='consoleserverport_connect'), - url(r'^console-server-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'endpoint_a_type': ConsoleServerPort}), + url(r'^console-server-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'termination_a_type': ConsoleServerPort}), url(r'^console-server-ports/(?P\d+)/disconnect/$', views.ConsoleServerPortDisconnectView.as_view(), name='consoleserverport_disconnect'), url(r'^console-server-ports/(?P\d+)/edit/$', views.ConsoleServerPortEditView.as_view(), name='consoleserverport_edit'), url(r'^console-server-ports/(?P\d+)/delete/$', views.ConsoleServerPortDeleteView.as_view(), name='consoleserverport_delete'), @@ -184,7 +184,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/power-ports/add/$', views.PowerPortCreateView.as_view(), name='powerport_add'), url(r'^devices/(?P\d+)/power-ports/delete/$', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'), # url(r'^power-ports/(?P\d+)/connect/$', views.PowerPortConnectView.as_view(), name='powerport_connect'), - url(r'^power-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='powerport_connect', kwargs={'endpoint_a_type': PowerPort}), + url(r'^power-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='powerport_connect', kwargs={'termination_a_type': PowerPort}), url(r'^power-ports/(?P\d+)/disconnect/$', views.PowerPortDisconnectView.as_view(), name='powerport_disconnect'), url(r'^power-ports/(?P\d+)/edit/$', views.PowerPortEditView.as_view(), name='powerport_edit'), url(r'^power-ports/(?P\d+)/delete/$', views.PowerPortDeleteView.as_view(), name='powerport_delete'), @@ -195,7 +195,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/power-outlets/disconnect/$', views.PowerOutletBulkDisconnectView.as_view(), name='poweroutlet_bulk_disconnect'), url(r'^devices/(?P\d+)/power-outlets/delete/$', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'), # url(r'^power-outlets/(?P\d+)/connect/$', views.PowerOutletConnectView.as_view(), name='poweroutlet_connect'), - url(r'^power-outlets/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'endpoint_a_type': PowerOutlet}), + url(r'^power-outlets/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'termination_a_type': PowerOutlet}), url(r'^power-outlets/(?P\d+)/disconnect/$', views.PowerOutletDisconnectView.as_view(), name='poweroutlet_disconnect'), url(r'^power-outlets/(?P\d+)/edit/$', views.PowerOutletEditView.as_view(), name='poweroutlet_edit'), url(r'^power-outlets/(?P\d+)/delete/$', views.PowerOutletDeleteView.as_view(), name='poweroutlet_delete'), @@ -207,7 +207,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/interfaces/edit/$', views.InterfaceBulkEditView.as_view(), name='interface_bulk_edit'), url(r'^devices/(?P\d+)/interfaces/disconnect/$', views.InterfaceBulkDisconnectView.as_view(), name='interface_bulk_disconnect'), url(r'^devices/(?P\d+)/interfaces/delete/$', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'), - url(r'^interfaces/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='interface_connect', kwargs={'endpoint_a_type': Interface}), + url(r'^interfaces/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='interface_connect', kwargs={'termination_a_type': Interface}), url(r'^interfaces/(?P\d+)/$', views.InterfaceView.as_view(), name='interface'), url(r'^interfaces/(?P\d+)/edit/$', views.InterfaceEditView.as_view(), name='interface_edit'), url(r'^interfaces/(?P\d+)/assign-vlans/$', views.InterfaceAssignVLANsView.as_view(), name='interface_assign_vlans'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 3246ca281..d16a59f5d 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2015,7 +2015,7 @@ class DeviceBulkAddDeviceBayView(PermissionRequiredMixin, BulkComponentCreateVie class CableListView(ObjectListView): queryset = Cable.objects.prefetch_related( - 'endpoint_a__device', 'endpoint_b__device' + 'termination_a__device', 'termination_b__device' ) # filter = filters.CableFilter # filter_form = forms.CableFilterForm @@ -2032,9 +2032,9 @@ class CableCreateView(PermissionRequiredMixin, ObjectEditView): def alter_obj(self, obj, request, url_args, url_kwargs): # Retrieve endpoint A based on the given type and PK - endpoint_a_type = url_kwargs.get('endpoint_a_type') - endpoint_a_id = url_kwargs.get('endpoint_a_id') - obj.endpoint_a = endpoint_a_type.objects.get(pk=endpoint_a_id) + termination_a_type = url_kwargs.get('termination_a_type') + termination_a_id = url_kwargs.get('termination_a_id') + obj.termination_a = termination_a_type.objects.get(pk=termination_a_id) return obj diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html index 66327170e..f067bd8d5 100644 --- a/netbox/templates/dcim/cable_connect.html +++ b/netbox/templates/dcim/cable_connect.html @@ -20,8 +20,8 @@ {% endif %} - {% with endpoint_a=form.instance.endpoint_a %} -

      {% block title %}Connect {{ endpoint_a.device }} {{ endpoint_a }}{% endblock %}

      + {% with termination_a=form.instance.termination_a %} +

      {% block title %}Connect {{ termination_a.device }} {{ termination_a }}{% endblock %}

      @@ -32,25 +32,25 @@
      -

      {{ endpoint_a.device.site }}

      +

      {{ termination_a.device.site }}

      -

      {{ endpoint_a.device.rack|default:"None" }}

      +

      {{ termination_a.device.rack|default:"None" }}

      -

      {{ endpoint_a.device }}

      +

      {{ termination_a.device }}

      -

      {{ endpoint_a }}

      +

      {{ termination_a }}

      @@ -74,13 +74,13 @@ {% render_field form.livesearch %}
      - {% render_field form.endpoint_b_site %} - {% render_field form.endpoint_b_rack %} - {% render_field form.endpoint_b_device %} + {% render_field form.termination_b_site %} + {% render_field form.termination_b_rack %} + {% render_field form.termination_b_device %}
      - {% render_field form.endpoint_b_type %} - {% render_field form.endpoint_b_id %} + {% render_field form.termination_b_type %} + {% render_field form.termination_b_id %} diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html index 70511408b..e8c7c5b35 100644 --- a/netbox/templates/dcim/inc/consoleport.html +++ b/netbox/templates/dcim/inc/consoleport.html @@ -30,7 +30,7 @@ {% else %} - + {% endif %} diff --git a/netbox/templates/dcim/inc/consoleserverport.html b/netbox/templates/dcim/inc/consoleserverport.html index e23ffe5e9..700e940dd 100644 --- a/netbox/templates/dcim/inc/consoleserverport.html +++ b/netbox/templates/dcim/inc/consoleserverport.html @@ -35,7 +35,7 @@ {% else %} - + {% endif %} diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 723f14760..d9ebc14b0 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -106,7 +106,7 @@ {% else %} - + {% endif %} diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index 313f458e9..5081c1f6e 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -35,7 +35,7 @@ {% else %} - + {% endif %} diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index 47989ddee..0d46c4ba9 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -30,7 +30,7 @@ {% else %} - + {% endif %} From cca44d44f7e19bdb8fd320a8e7554870d9d175bf Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 24 Oct 2018 14:59:46 -0400 Subject: [PATCH 020/191] Added cable filter form --- netbox/dcim/filters.py | 9 ++++++++- netbox/dcim/forms.py | 25 +++++++++++++++++++++---- netbox/dcim/tables.py | 16 ++++++++++------ netbox/dcim/views.py | 4 ++-- 4 files changed, 41 insertions(+), 13 deletions(-) diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 93d46bf01..d619e4f83 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -13,7 +13,7 @@ from .constants import ( WIRELESS_IFACE_TYPES, ) from .models import ( - ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, + Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate, InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis, @@ -785,6 +785,13 @@ class VirtualChassisFilter(django_filters.FilterSet): return queryset.filter(qs_filter) +class CableFilter(django_filters.FilterSet): + + class Meta: + model = Cable + fields = ['type', 'status', 'color'] + + class ConsoleConnectionFilter(django_filters.FilterSet): site = django_filters.CharFilter( method='filter_site', diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index e0e65aa3a..7b12db2e2 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -17,10 +17,11 @@ from tenancy.forms import TenancyForm from tenancy.models import Tenant from utilities.forms import ( AnnotatedMultipleChoiceField, APISelect, add_blank_choice, ArrayFieldSelectMultiple, BootstrapMixin, BulkEditForm, - BulkEditNullBooleanSelect, ChainedFieldsMixin, ChainedModelChoiceField, CommentField, ComponentForm, - ConfirmationForm, CSVChoiceField, ExpandableNameField, FilterChoiceField, FilterTreeNodeMultipleChoiceField, - FlexibleModelChoiceField, JSONField, Livesearch, SelectWithDisabled, SelectWithPK, SmallTextarea, SlugField, - ContentTypeSelect + BulkEditNullBooleanSelect, ChainedFieldsMixin, ChainedModelChoiceField, ColorSelect, CommentField, ComponentForm, + ConfirmationForm, ContentTypeSelect, CSVChoiceField, ExpandableNameField, FilterChoiceField, + FilterTreeNodeMultipleChoiceField, FlexibleModelChoiceField, JSONField, Livesearch, SelectWithPK, SmallTextarea, + SlugField, COLOR_CHOICES, + ) from virtualization.models import Cluster from .constants import * @@ -2212,6 +2213,22 @@ class CableForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): ) +class CableFilterForm(BootstrapMixin, forms.Form): + model = Cable + q = forms.CharField(required=False, label='Search') + type = AnnotatedMultipleChoiceField( + choices=CABLE_TYPE_CHOICES, + annotate=Cable.objects.all(), + annotate_field='type', + required=False + ) + color = forms.ChoiceField( + choices=add_blank_choice(COLOR_CHOICES), + widget=ColorSelect(), + required=False + ) + + # # Device bays # diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index c8566e008..3c8df2b06 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -621,35 +621,39 @@ class DeviceBayTable(BaseTable): # class CableTable(BaseTable): + # django-tables2 adds CSS `class="label"` which causes rendering issues + _label = tables.Column( + accessor=Accessor('label'), + verbose_name='Label' + ) device_a = tables.LinkColumn( viewname='dcim:device', accessor=Accessor('termination_a.device'), args=[Accessor('termination_a.device.pk')], + orderable=False, verbose_name='Device A' ) termination_a = tables.Column( accessor=Accessor('termination_a.name'), + orderable=False, verbose_name='Component' ) device_b = tables.LinkColumn( viewname='dcim:device', accessor=Accessor('termination_b.device'), args=[Accessor('termination_b.device.pk')], + orderable=False, verbose_name='Device B' ) termination_b = tables.Column( accessor=Accessor('termination_b.name'), + orderable=False, verbose_name='Component' ) - # django-tables2 adds CSS `class="label"` which causes rendering issues - _label = tables.Column( - accessor=Accessor('label'), - verbose_name='Label' - ) class Meta(BaseTable.Meta): model = Cable - fields = ('device_a', 'termination_a', 'device_b', 'termination_b', 'status', '_label', 'color') + fields = ('_label', 'device_a', 'termination_a', 'device_b', 'termination_b', 'status', 'type', 'color') # diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index d16a59f5d..4ca87fc8f 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2017,8 +2017,8 @@ class CableListView(ObjectListView): queryset = Cable.objects.prefetch_related( 'termination_a__device', 'termination_b__device' ) - # filter = filters.CableFilter - # filter_form = forms.CableFilterForm + filter = filters.CableFilter + filter_form = forms.CableFilterForm table = tables.CableTable template_name = 'dcim/cable_list.html' From 47c523a40bc0c12e5d072ee712ffd1ec91064341 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 24 Oct 2018 15:07:11 -0400 Subject: [PATCH 021/191] Fixed interface connection rendering --- netbox/dcim/views.py | 2 +- netbox/templates/dcim/inc/interface.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 4ca87fc8f..98dd04c16 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1662,7 +1662,7 @@ class InterfaceView(View): interface = get_object_or_404(Interface, pk=pk) # Get connected interface - connected_interface = interface.connected_interface + connected_interface = interface.connected_endpoint if connected_interface is None and hasattr(interface, 'circuit_termination'): peer_termination = interface.circuit_termination.get_peer_termination() if peer_termination is not None: diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index d9ebc14b0..287410617 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -1,4 +1,4 @@ - + {# Checkbox #} {% if perms.dcim.change_interface or perms.dcim.delete_interface %} @@ -38,8 +38,8 @@ Virtual interface {% elif iface.is_wireless %} Wireless interface - {% elif iface.connection %} - {% with iface.connected_interface as connected_iface %} + {% elif iface.connected_endpoint %} + {% with connected_iface=iface.connected_endpoint %} {{ connected_iface.device }} From 35f80f5085e8ac66cc478a29426549d66a825d3e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 24 Oct 2018 16:17:01 -0400 Subject: [PATCH 022/191] First stab at cable path tracing and automatic endpoint connections --- netbox/dcim/models.py | 46 ++++++++++++++++++++++-- netbox/dcim/signals.py | 9 ++--- netbox/templates/dcim/inc/interface.html | 2 +- netbox/utilities/views.py | 7 ++++ 4 files changed, 56 insertions(+), 8 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 8da7c102b..2b426b285 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2372,9 +2372,49 @@ class Cable(ChangeLoggedModel): ('termination_b_type', 'termination_b_id'), ) - # TODO: This should follow all cables in a path def get_path_endpoints(self): """ - Return the endpoints connected by this cable path. + Traverse both ends of a cable path and return its connected endpoints. Note that one or both endpoints may be + None. """ - return (self.termination_a, self.termination_b) + def trace_cable(termination, position=None): + + # Given a front port, follow the cable connected to the corresponding rear port/position + if isinstance(termination, FrontPanelPort): + rear_port = termination.rear_port + port_type = ContentType.objects.get_for_model(rear_port) + next_cable = Cable.objects.filter( + Q(termination_a_type=port_type, termination_a_id=rear_port.pk) | + Q(termination_b_type=port_type, termination_b_id=rear_port.pk) + ).first() + if next_cable is None: + return None + if next_cable.termination_a == termination.rear_port: + return trace_cable(next_cable.termination_b, termination.rear_port_position) + else: + return trace_cable(next_cable.termination_a, termination.rear_port_position) + + # Given a rear port/position, follow the cable connected to the corresponding front port + if isinstance(termination, RearPanelPort): + if position is None: + raise Exception("Must specify a position when tracing a path from a rear panel port") + front_port = FrontPanelPort.objects.get( + rear_port=termination, + rear_port_position=position, + ) + port_type = ContentType.objects.get_for_model(front_port) + next_cable = Cable.objects.filter( + Q(termination_a_type=port_type, termination_a_id=front_port.pk) | + Q(termination_b_type=port_type, termination_b_id=front_port.pk) + ).first() + if next_cable is None: + return None + if next_cable.termination_a == front_port: + return trace_cable(next_cable.termination_b) + else: + return trace_cable(next_cable.termination_a) + + # Termination is not a panel port, so we've reached the end of the path + return termination + + return trace_cable(self.termination_a), trace_cable(self.termination_b) diff --git a/netbox/dcim/signals.py b/netbox/dcim/signals.py index 2320ba2d5..1d1094d66 100644 --- a/netbox/dcim/signals.py +++ b/netbox/dcim/signals.py @@ -27,10 +27,11 @@ def update_connected_endpoints(instance, **kwargs): When a Cable is saved, update its connected endpoints. """ termination_a, termination_b = instance.get_path_endpoints() - termination_a.connected_endpoint = termination_b - termination_a.save() - termination_b.connected_endpoint = termination_a - termination_b.save() + if termination_a is not None and termination_b is not None: + termination_a.connected_endpoint = termination_b + termination_a.save() + termination_b.connected_endpoint = termination_a + termination_b.save() @receiver(post_delete, sender=Cable) diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 287410617..72a56f367 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -106,7 +106,7 @@ {% else %} - + {% endif %} diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index 0e36f3220..dcc0905f9 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -212,6 +212,13 @@ class ObjectEditView(GetReturnURLMixin, View): obj_created = not form.instance.pk obj = form.save() + print("Connecting {} {} to {} {}".format( + obj.termination_a.device, + obj.termination_a, + obj.termination_b.device, + obj.termination_b + )) + msg = '{} {}'.format( 'Created' if obj_created else 'Modified', self.model._meta.verbose_name From e79a156e1f96e6b207d4e8693e814550f6945140 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 25 Oct 2018 10:43:34 -0400 Subject: [PATCH 023/191] Improved cable tracing --- netbox/dcim/models.py | 58 +++++++++++++++++++++--------------------- netbox/dcim/signals.py | 13 +++++++--- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 2b426b285..de7426d41 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2377,44 +2377,44 @@ class Cable(ChangeLoggedModel): Traverse both ends of a cable path and return its connected endpoints. Note that one or both endpoints may be None. """ - def trace_cable(termination, position=None): + def trace_cable(termination, position=1): # Given a front port, follow the cable connected to the corresponding rear port/position if isinstance(termination, FrontPanelPort): - rear_port = termination.rear_port - port_type = ContentType.objects.get_for_model(rear_port) - next_cable = Cable.objects.filter( - Q(termination_a_type=port_type, termination_a_id=rear_port.pk) | - Q(termination_b_type=port_type, termination_b_id=rear_port.pk) - ).first() - if next_cable is None: - return None - if next_cable.termination_a == termination.rear_port: - return trace_cable(next_cable.termination_b, termination.rear_port_position) - else: - return trace_cable(next_cable.termination_a, termination.rear_port_position) + peer_port = termination.rear_port + position = termination.rear_port_position # Given a rear port/position, follow the cable connected to the corresponding front port - if isinstance(termination, RearPanelPort): - if position is None: - raise Exception("Must specify a position when tracing a path from a rear panel port") - front_port = FrontPanelPort.objects.get( + elif isinstance(termination, RearPanelPort): + if position not in range(1, termination.positions + 1): + raise Exception("Invalid position for {} ({} positions): {})".format( + termination, termination.positions, position + )) + peer_port = FrontPanelPort.objects.get( rear_port=termination, rear_port_position=position, ) - port_type = ContentType.objects.get_for_model(front_port) - next_cable = Cable.objects.filter( - Q(termination_a_type=port_type, termination_a_id=front_port.pk) | - Q(termination_b_type=port_type, termination_b_id=front_port.pk) - ).first() - if next_cable is None: - return None - if next_cable.termination_a == front_port: - return trace_cable(next_cable.termination_b) - else: - return trace_cable(next_cable.termination_a) + position=1 # Termination is not a panel port, so we've reached the end of the path - return termination + else: + return termination + + # Find the cable (if any) attached to the peer port + port_type = ContentType.objects.get_for_model(peer_port) + next_cable = Cable.objects.filter( + Q(termination_a_type=port_type, termination_a_id=peer_port.pk) | + Q(termination_b_type=port_type, termination_b_id=peer_port.pk) + ).first() + + # If no cable exists, return None + if next_cable is None: + return None + + # Return the far side termination of the cable + if next_cable.termination_a == peer_port: + return trace_cable(next_cable.termination_b, position) + else: + return trace_cable(next_cable.termination_a, position) return trace_cable(self.termination_a), trace_cable(self.termination_b) diff --git a/netbox/dcim/signals.py b/netbox/dcim/signals.py index 1d1094d66..e47865ac5 100644 --- a/netbox/dcim/signals.py +++ b/netbox/dcim/signals.py @@ -29,8 +29,10 @@ def update_connected_endpoints(instance, **kwargs): termination_a, termination_b = instance.get_path_endpoints() if termination_a is not None and termination_b is not None: termination_a.connected_endpoint = termination_b + termination_a.connection_status = True termination_a.save() termination_b.connected_endpoint = termination_a + termination_a.connection_status = True termination_b.save() @@ -40,7 +42,10 @@ def nullify_connected_endpoints(instance, **kwargs): When a Cable is deleted, nullify its connected endpoints. """ termination_a, termination_b = instance.get_path_endpoints() - termination_a.connected_endpoint = None - termination_a.save() - termination_b.connected_endpoint = None - termination_b.save() + if termination_a is not None and termination_b is not None: + termination_a.connected_endpoint = None + termination_a.connection_status = None + termination_a.save() + termination_b.connected_endpoint = None + termination_b.connection_status = None + termination_b.save() From b19e2037af7b2435756af2f00217a62dfba2b06b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 25 Oct 2018 12:08:13 -0400 Subject: [PATCH 024/191] Dropped 'Panel' from FrontPanelPort/RearPanelPort names --- netbox/dcim/api/serializers.py | 64 ++++---- netbox/dcim/api/urls.py | 8 +- netbox/dcim/api/views.py | 36 ++--- netbox/dcim/constants.py | 52 +++--- netbox/dcim/filters.py | 20 +-- netbox/dcim/forms.py | 62 +++---- ...anel_ports.py => 0065_front_rear_ports.py} | 38 ++--- netbox/dcim/migrations/0066_cables.py | 6 +- netbox/dcim/models.py | 66 ++++---- netbox/dcim/tables.py | 20 +-- netbox/dcim/urls.py | 40 ++--- netbox/dcim/views.py | 152 +++++++++--------- netbox/templates/dcim/device.html | 40 ++--- netbox/templates/dcim/devicetype.html | 8 +- netbox/templates/dcim/inc/frontpanelport.html | 25 --- netbox/templates/dcim/inc/frontport.html | 25 +++ netbox/templates/dcim/inc/rearpanelport.html | 24 --- netbox/templates/dcim/inc/rearport.html | 24 +++ 18 files changed, 355 insertions(+), 355 deletions(-) rename netbox/dcim/migrations/{0065_patch_panel_ports.py => 0065_front_rear_ports.py} (80%) delete mode 100644 netbox/templates/dcim/inc/frontpanelport.html create mode 100644 netbox/templates/dcim/inc/frontport.html delete mode 100644 netbox/templates/dcim/inc/rearpanelport.html create mode 100644 netbox/templates/dcim/inc/rearport.html diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 6e113d394..4f458fbc5 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -6,9 +6,9 @@ from circuits.models import Circuit, CircuitTermination from dcim.constants import * from dcim.models import ( ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceType, DeviceRole, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate, + DeviceBayTemplate, DeviceType, DeviceRole, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis, + RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, ) from extras.api.customfields import CustomFieldModelSerializer from ipam.models import IPAddress, VLAN @@ -302,45 +302,45 @@ class InterfaceTemplateSerializer(ValidatedModelSerializer): # -# Rear panel port templates +# Rear port templates # -class RearPanelPortTemplateSerializer(ValidatedModelSerializer): +class RearPortTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() - type = ChoiceField(choices=PANELPORT_TYPE_CHOICES) + type = ChoiceField(choices=PORT_TYPE_CHOICES) class Meta: - model = RearPanelPortTemplate + model = RearPortTemplate fields = ['id', 'device_type', 'name', 'type', 'positions'] -class NestedRearPanelPortTemplateSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearpanelporttemplate-detail') +class NestedRearPortTemplateSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearporttemplate-detail') class Meta: - model = RearPanelPortTemplate + model = RearPortTemplate fields = ['id', 'url', 'name'] # -# Front panel port templates +# Front port templates # -class FrontPanelPortTemplateSerializer(ValidatedModelSerializer): +class FrontPortTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() - type = ChoiceField(choices=PANELPORT_TYPE_CHOICES) - rear_port = NestedRearPanelPortTemplateSerializer() + type = ChoiceField(choices=PORT_TYPE_CHOICES) + rear_port = NestedRearPortTemplateSerializer() class Meta: - model = FrontPanelPortTemplate + model = FrontPortTemplate fields = ['id', 'device_type', 'name', 'type', 'rear_port', 'rear_port_position'] -class NestedFrontPanelPortTemplateSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontpanelporttemplate-detail') +class NestedFrontPortTemplateSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontporttemplate-detail') class Meta: - model = FrontPanelPortTemplate + model = FrontPortTemplate fields = ['id', 'url', 'name'] @@ -703,47 +703,47 @@ class InterfaceSerializer(TaggitSerializer, IsConnectedMixin, ValidatedModelSeri # -# Rear panel ports +# Rear ports # -class RearPanelPortSerializer(ValidatedModelSerializer): +class RearPortSerializer(ValidatedModelSerializer): device = NestedDeviceSerializer() - type = ChoiceField(choices=PANELPORT_TYPE_CHOICES) + type = ChoiceField(choices=PORT_TYPE_CHOICES) tags = TagListSerializerField(required=False) class Meta: - model = RearPanelPort + model = RearPort fields = ['id', 'device', 'name', 'type', 'positions', 'tags'] -class NestedRearPanelPortSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearpanelport-detail') +class NestedRearPortSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail') class Meta: - model = RearPanelPort + model = RearPort fields = ['id', 'url', 'name'] # -# Front panel ports +# Front ports # -class FrontPanelPortSerializer(ValidatedModelSerializer): +class FrontPortSerializer(ValidatedModelSerializer): device = NestedDeviceSerializer() - type = ChoiceField(choices=PANELPORT_TYPE_CHOICES) - rear_port = NestedRearPanelPortSerializer() + type = ChoiceField(choices=PORT_TYPE_CHOICES) + rear_port = NestedRearPortSerializer() tags = TagListSerializerField(required=False) class Meta: - model = FrontPanelPort + model = FrontPort fields = ['id', 'device', 'name', 'type', 'rear_port', 'rear_port_position', 'tags'] -class NestedFrontPanelPortSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontpanelport-detail') +class NestedFrontPortSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontport-detail') class Meta: - model = FrontPanelPort + model = FrontPort fields = ['id', 'url', 'name'] diff --git a/netbox/dcim/api/urls.py b/netbox/dcim/api/urls.py index 4ddbaf9a8..9a6f00c18 100644 --- a/netbox/dcim/api/urls.py +++ b/netbox/dcim/api/urls.py @@ -37,8 +37,8 @@ router.register(r'console-server-port-templates', views.ConsoleServerPortTemplat router.register(r'power-port-templates', views.PowerPortTemplateViewSet) router.register(r'power-outlet-templates', views.PowerOutletTemplateViewSet) router.register(r'interface-templates', views.InterfaceTemplateViewSet) -router.register(r'front-panel-port-templates', views.FrontPanelPortTemplateViewSet) -router.register(r'rear-panel-port-templates', views.RearPanelPortTemplateViewSet) +router.register(r'front-port-templates', views.FrontPortTemplateViewSet) +router.register(r'rear-port-templates', views.RearPortTemplateViewSet) router.register(r'device-bay-templates', views.DeviceBayTemplateViewSet) # Devices @@ -52,8 +52,8 @@ router.register(r'console-server-ports', views.ConsoleServerPortViewSet) router.register(r'power-ports', views.PowerPortViewSet) router.register(r'power-outlets', views.PowerOutletViewSet) router.register(r'interfaces', views.InterfaceViewSet) -router.register(r'front-panel-ports', views.FrontPanelPortViewSet) -router.register(r'rear-panel-ports', views.RearPanelPortViewSet) +router.register(r'front-ports', views.FrontPortViewSet) +router.register(r'rear-ports', views.RearPortViewSet) router.register(r'device-bays', views.DeviceBayViewSet) router.register(r'inventory-items', views.InventoryItemViewSet) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 6128d3411..9586bbcf6 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -15,9 +15,9 @@ from rest_framework.viewsets import GenericViewSet, ViewSet from dcim import filters from dcim.models import ( ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate, + DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis, + RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, ) from extras.api.serializers import RenderedGraphSerializer from extras.api.views import CustomFieldModelViewSet @@ -191,16 +191,16 @@ class InterfaceTemplateViewSet(ModelViewSet): filter_class = filters.InterfaceTemplateFilter -class FrontPanelPortTemplateViewSet(ModelViewSet): - queryset = FrontPanelPortTemplate.objects.select_related('device_type__manufacturer') - serializer_class = serializers.FrontPanelPortTemplateSerializer - filter_class = filters.FrontPanelPortTemplateFilter +class FrontPortTemplateViewSet(ModelViewSet): + queryset = FrontPortTemplate.objects.select_related('device_type__manufacturer') + serializer_class = serializers.FrontPortTemplateSerializer + filter_class = filters.FrontPortTemplateFilter -class RearPanelPortTemplateViewSet(ModelViewSet): - queryset = RearPanelPortTemplate.objects.select_related('device_type__manufacturer') - serializer_class = serializers.RearPanelPortTemplateSerializer - filter_class = filters.RearPanelPortTemplateFilter +class RearPortTemplateViewSet(ModelViewSet): + queryset = RearPortTemplate.objects.select_related('device_type__manufacturer') + serializer_class = serializers.RearPortTemplateSerializer + filter_class = filters.RearPortTemplateFilter class DeviceBayTemplateViewSet(ModelViewSet): @@ -369,16 +369,16 @@ class InterfaceViewSet(ModelViewSet): return Response(serializer.data) -class FrontPanelPortViewSet(ModelViewSet): - queryset = FrontPanelPort.objects.select_related('device__device_type__manufacturer', 'rear_port') - serializer_class = serializers.FrontPanelPortSerializer - filter_class = filters.FrontPanelPortFilter +class FrontPortViewSet(ModelViewSet): + queryset = FrontPort.objects.select_related('device__device_type__manufacturer', 'rear_port') + serializer_class = serializers.FrontPortSerializer + filter_class = filters.FrontPortFilter -class RearPanelPortViewSet(ModelViewSet): - queryset = RearPanelPort.objects.select_related('device__device_type__manufacturer') - serializer_class = serializers.RearPanelPortSerializer - filter_class = filters.RearPanelPortFilter +class RearPortViewSet(ModelViewSet): + queryset = RearPort.objects.select_related('device__device_type__manufacturer') + serializer_class = serializers.RearPortSerializer + filter_class = filters.RearPortFilter class DeviceBayViewSet(ModelViewSet): diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index 07078525c..fed089486 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -209,32 +209,32 @@ IFACE_MODE_CHOICES = [ [IFACE_MODE_TAGGED_ALL, 'Tagged All'], ] -# Patch panel port types -PANELPORT_TYPE_8P8C = 1000 -PANELPORT_TYPE_ST = 2000 -PANELPORT_TYPE_SC_SIMPLEX = 2100 -PANELPORT_TYPE_SC_DUPLEX = 2110 -PANELPORT_TYPE_FC = 2200 -PANELPORT_TYPE_LC = 2300 -PANELPORT_TYPE_MTRJ = 2400 -PANELPORT_TYPE_MPO = 2500 -PANELPORT_TYPE_CHOICES = [ +# Pass-through port types +PORT_TYPE_8P8C = 1000 +PORT_TYPE_ST = 2000 +PORT_TYPE_SC_SIMPLEX = 2100 +PORT_TYPE_SC_DUPLEX = 2110 +PORT_TYPE_FC = 2200 +PORT_TYPE_LC = 2300 +PORT_TYPE_MTRJ = 2400 +PORT_TYPE_MPO = 2500 +PORT_TYPE_CHOICES = [ [ 'Copper', [ - [PANELPORT_TYPE_8P8C, '8P8C'], + [PORT_TYPE_8P8C, '8P8C'], ], ], [ 'Fiber Optic', [ - [PANELPORT_TYPE_ST, 'ST'], - [PANELPORT_TYPE_SC_SIMPLEX, 'SC (Simplex)'], - [PANELPORT_TYPE_SC_DUPLEX, 'SC (Duplex)'], - [PANELPORT_TYPE_FC, 'FC'], - [PANELPORT_TYPE_LC, 'LC'], - [PANELPORT_TYPE_MTRJ, 'MTRJ'], - [PANELPORT_TYPE_MPO, 'MPO'], + [PORT_TYPE_ST, 'ST'], + [PORT_TYPE_SC_SIMPLEX, 'SC (Simplex)'], + [PORT_TYPE_SC_DUPLEX, 'SC (Duplex)'], + [PORT_TYPE_FC, 'FC'], + [PORT_TYPE_LC, 'LC'], + [PORT_TYPE_MTRJ, 'MTRJ'], + [PORT_TYPE_MPO, 'MPO'], ] ] ] @@ -285,7 +285,7 @@ CONNECTION_STATUS_CHOICES = [ # Cable endpoint types CABLE_TERMINATION_TYPES = [ - 'consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport', + 'consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport', ] # Cable types @@ -304,16 +304,16 @@ CABLE_TERMINATION_TYPE_CHOICES = { 'powerport': ('power-ports', 'Power port'), 'poweroutlet': ('power-outlets', 'Power outlet'), 'interface': ('interfaces', 'Interface'), - 'frontpanelport': ('front-panel-ports', 'Front panel port'), - 'rearpanelport': ('rear-panel-ports', 'Rear panel port'), + 'frontport': ('front-ports', 'Front panel port'), + 'rearport': ('rear-ports', 'Rear panel port'), } COMPATIBLE_TERMINATION_TYPES = { - 'consoleport': ['consoleserverport', 'frontpanelport', 'rearpanelport'], - 'consoleserverport': ['consoleport', 'frontpanelport', 'rearpanelport'], + 'consoleport': ['consoleserverport', 'frontport', 'rearport'], + 'consoleserverport': ['consoleport', 'frontport', 'rearport'], 'powerport': ['poweroutlet'], 'poweroutlet': ['powerport'], - 'interface': ['interface', 'frontpanelport', 'rearpanelport'], - 'frontpanelport': ['consoleport', 'consoleserverport', 'interface', 'frontpanelport', 'rearpanelport'], - 'rearpanelport': ['consoleport', 'consoleserverport', 'interface', 'frontpanelport', 'rearpanelport'], + 'interface': ['interface', 'frontport', 'rearport'], + 'frontport': ['consoleport', 'consoleserverport', 'interface', 'frontport', 'rearport'], + 'rearport': ['consoleport', 'consoleserverport', 'interface', 'frontport', 'rearport'], } diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index d619e4f83..71f136d15 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -14,9 +14,9 @@ from .constants import ( ) from .models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate, + DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis, + RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, ) @@ -368,17 +368,17 @@ class InterfaceTemplateFilter(DeviceTypeComponentFilterSet): fields = ['name', 'form_factor', 'mgmt_only'] -class FrontPanelPortTemplateFilter(DeviceTypeComponentFilterSet): +class FrontPortTemplateFilter(DeviceTypeComponentFilterSet): class Meta: - model = FrontPanelPortTemplate + model = FrontPortTemplate fields = ['name', 'type'] -class RearPanelPortTemplateFilter(DeviceTypeComponentFilterSet): +class RearPortTemplateFilter(DeviceTypeComponentFilterSet): class Meta: - model = RearPanelPortTemplate + model = RearPortTemplate fields = ['name', 'type'] @@ -681,17 +681,17 @@ class InterfaceFilter(django_filters.FilterSet): return queryset.none() -class FrontPanelPortFilter(DeviceComponentFilterSet): +class FrontPortFilter(DeviceComponentFilterSet): class Meta: - model = FrontPanelPort + model = FrontPort fields = ['name', 'type'] -class RearPanelPortFilter(DeviceComponentFilterSet): +class RearPortFilter(DeviceComponentFilterSet): class Meta: - model = RearPanelPort + model = RearPort fields = ['name', 'type'] diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 7b12db2e2..b0d5f95f2 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -27,9 +27,9 @@ from virtualization.models import Cluster from .constants import * from .models import ( Cable, DeviceBay, DeviceBayTemplate, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, - Device, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate, Manufacturer, + Device, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, - RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis, + RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, ) DEVICE_BY_PK_RE = r'{\d+\}' @@ -702,22 +702,22 @@ class InterfaceTemplateBulkEditForm(BootstrapMixin, BulkEditForm): nullable_fields = [] -class FrontPanelPortTemplateForm(BootstrapMixin, forms.ModelForm): +class FrontPortTemplateForm(BootstrapMixin, forms.ModelForm): class Meta: - model = FrontPanelPortTemplate + model = FrontPortTemplate fields = ['device_type', 'name', 'type', 'rear_port', 'rear_port_position'] widgets = { 'device_type': forms.HiddenInput(), } -class FrontPanelPortTemplateCreateForm(ComponentForm): +class FrontPortTemplateCreateForm(ComponentForm): name_pattern = ExpandableNameField( label='Name' ) type = forms.ChoiceField( - choices=PANELPORT_TYPE_CHOICES + choices=PORT_TYPE_CHOICES ) rear_port_set = forms.MultipleChoiceField( choices=[], @@ -727,17 +727,17 @@ class FrontPanelPortTemplateCreateForm(ComponentForm): def __init__(self, *args, **kwargs): - super(FrontPanelPortTemplateCreateForm, self).__init__(*args, **kwargs) + super(FrontPortTemplateCreateForm, self).__init__(*args, **kwargs) # Determine which rear port positions are occupied. These will be excluded from the list of available mappings. occupied_port_positions = [ (front_port.rear_port_id, front_port.rear_port_position) - for front_port in self.parent.front_panel_port_templates.all() + for front_port in self.parent.front_port_templates.all() ] # Populate rear port choices choices = [] - rear_ports = natsorted(RearPanelPortTemplate.objects.filter(device_type=self.parent), key=attrgetter('name')) + rear_ports = natsorted(RearPortTemplate.objects.filter(device_type=self.parent), key=attrgetter('name')) for rear_port in rear_ports: for i in range(1, rear_port.positions + 1): if (rear_port.pk, i) not in occupied_port_positions: @@ -768,22 +768,22 @@ class FrontPanelPortTemplateCreateForm(ComponentForm): } -class RearPanelPortTemplateForm(BootstrapMixin, forms.ModelForm): +class RearPortTemplateForm(BootstrapMixin, forms.ModelForm): class Meta: - model = RearPanelPortTemplate + model = RearPortTemplate fields = ['device_type', 'name', 'type', 'positions'] widgets = { 'device_type': forms.HiddenInput(), } -class RearPanelPortTemplateCreateForm(ComponentForm): +class RearPortTemplateCreateForm(ComponentForm): name_pattern = ExpandableNameField( label='Name' ) type = forms.ChoiceField( - choices=PANELPORT_TYPE_CHOICES + choices=PORT_TYPE_CHOICES ) positions = forms.IntegerField( min_value=1, @@ -2018,27 +2018,27 @@ class InterfaceBulkDisconnectForm(ConfirmationForm): # -# Front panel ports +# Front pass-through ports # -class FrontPanelPortForm(BootstrapMixin, forms.ModelForm): +class FrontPortForm(BootstrapMixin, forms.ModelForm): tags = TagField(required=False) class Meta: - model = FrontPanelPort + model = FrontPort fields = ['device', 'name', 'type', 'rear_port', 'rear_port_position', 'tags'] widgets = { 'device': forms.HiddenInput(), } -# TODO: Merge with FrontPanelPortTemplateCreateForm to remove duplicate logic -class FrontPanelPortCreateForm(ComponentForm): +# TODO: Merge with FrontPortTemplateCreateForm to remove duplicate logic +class FrontPortCreateForm(ComponentForm): name_pattern = ExpandableNameField( label='Name' ) type = forms.ChoiceField( - choices=PANELPORT_TYPE_CHOICES + choices=PORT_TYPE_CHOICES ) rear_port_set = forms.MultipleChoiceField( choices=[], @@ -2048,17 +2048,17 @@ class FrontPanelPortCreateForm(ComponentForm): def __init__(self, *args, **kwargs): - super(FrontPanelPortCreateForm, self).__init__(*args, **kwargs) + super(FrontPortCreateForm, self).__init__(*args, **kwargs) # Determine which rear port positions are occupied. These will be excluded from the list of available mappings. occupied_port_positions = [ (front_port.rear_port_id, front_port.rear_port_position) - for front_port in self.parent.front_panel_port_templates.all() + for front_port in self.parent.front_port_templates.all() ] # Populate rear port choices choices = [] - rear_ports = natsorted(RearPanelPort.objects.filter(device=self.parent), key=attrgetter('name')) + rear_ports = natsorted(RearPort.objects.filter(device=self.parent), key=attrgetter('name')) for rear_port in rear_ports: for i in range(1, rear_port.positions + 1): if (rear_port.pk, i) not in occupied_port_positions: @@ -2089,34 +2089,34 @@ class FrontPanelPortCreateForm(ComponentForm): } -class FrontPanelPortBulkRenameForm(BulkRenameForm): +class FrontPortBulkRenameForm(BulkRenameForm): pk = forms.ModelMultipleChoiceField( - queryset=FrontPanelPort.objects.all(), + queryset=FrontPort.objects.all(), widget=forms.MultipleHiddenInput ) # -# Rear panel ports +# Rear pass-through ports # -class RearPanelPortForm(BootstrapMixin, forms.ModelForm): +class RearPortForm(BootstrapMixin, forms.ModelForm): tags = TagField(required=False) class Meta: - model = RearPanelPort + model = RearPort fields = ['device', 'name', 'type', 'positions', 'tags'] widgets = { 'device': forms.HiddenInput(), } -class RearPanelPortCreateForm(ComponentForm): +class RearPortCreateForm(ComponentForm): name_pattern = ExpandableNameField( label='Name' ) type = forms.ChoiceField( - choices=PANELPORT_TYPE_CHOICES + choices=PORT_TYPE_CHOICES ) positions = forms.IntegerField( min_value=1, @@ -2126,9 +2126,9 @@ class RearPanelPortCreateForm(ComponentForm): ) -class RearPanelPortBulkRenameForm(BulkRenameForm): +class RearPortBulkRenameForm(BulkRenameForm): pk = forms.ModelMultipleChoiceField( - queryset=RearPanelPort.objects.all(), + queryset=RearPort.objects.all(), widget=forms.MultipleHiddenInput ) diff --git a/netbox/dcim/migrations/0065_patch_panel_ports.py b/netbox/dcim/migrations/0065_front_rear_ports.py similarity index 80% rename from netbox/dcim/migrations/0065_patch_panel_ports.py rename to netbox/dcim/migrations/0065_front_rear_ports.py index 48b77e561..6cc4340f2 100644 --- a/netbox/dcim/migrations/0065_patch_panel_ports.py +++ b/netbox/dcim/migrations/0065_front_rear_ports.py @@ -15,20 +15,20 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name='FrontPanelPort', + name='FrontPort', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), ('type', models.PositiveSmallIntegerField()), ('rear_port_position', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(64)])), - ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_panel_ports', to='dcim.Device')), + ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_ports', to='dcim.Device')), ], options={ 'ordering': ['device', 'name'], }, ), migrations.CreateModel( - name='FrontPanelPortTemplate', + name='FrontPortTemplate', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), @@ -40,13 +40,13 @@ class Migration(migrations.Migration): }, ), migrations.CreateModel( - name='RearPanelPort', + name='RearPort', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), ('type', models.PositiveSmallIntegerField()), ('positions', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(64)])), - ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rear_panel_ports', to='dcim.Device')), + ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rear_ports', to='dcim.Device')), ('tags', taggit.managers.TaggableManager(through='taggit.TaggedItem', to='taggit.Tag')), ], options={ @@ -54,7 +54,7 @@ class Migration(migrations.Migration): }, ), migrations.CreateModel( - name='RearPanelPortTemplate', + name='RearPortTemplate', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), @@ -71,44 +71,44 @@ class Migration(migrations.Migration): field=models.BooleanField(default=False), ), migrations.AddField( - model_name='rearpanelporttemplate', + model_name='rearporttemplate', name='device_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rear_panel_port_templates', to='dcim.DeviceType'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rear_port_templates', to='dcim.DeviceType'), ), migrations.AddField( - model_name='frontpanelporttemplate', + model_name='frontporttemplate', name='device_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_panel_port_templates', to='dcim.DeviceType'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_port_templates', to='dcim.DeviceType'), ), migrations.AddField( - model_name='frontpanelporttemplate', + model_name='frontporttemplate', name='rear_port', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_panel_port_templates', to='dcim.RearPanelPortTemplate'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_port_templates', to='dcim.RearPortTemplate'), ), migrations.AddField( - model_name='frontpanelport', + model_name='frontport', name='rear_port', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_panel_ports', to='dcim.RearPanelPort'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_ports', to='dcim.RearPort'), ), migrations.AddField( - model_name='frontpanelport', + model_name='frontport', name='tags', field=taggit.managers.TaggableManager(through='taggit.TaggedItem', to='taggit.Tag'), ), migrations.AlterUniqueTogether( - name='rearpanelporttemplate', + name='rearporttemplate', unique_together={('device_type', 'name')}, ), migrations.AlterUniqueTogether( - name='rearpanelport', + name='rearport', unique_together={('device', 'name')}, ), migrations.AlterUniqueTogether( - name='frontpanelporttemplate', + name='frontporttemplate', unique_together={('rear_port', 'rear_port_position'), ('device_type', 'name')}, ), migrations.AlterUniqueTogether( - name='frontpanelport', + name='frontport', unique_together={('device', 'name'), ('rear_port', 'rear_port_position')}, ), ] diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py index 7865be358..773dc4d3a 100644 --- a/netbox/dcim/migrations/0066_cables.py +++ b/netbox/dcim/migrations/0066_cables.py @@ -105,7 +105,7 @@ class Migration(migrations.Migration): dependencies = [ ('contenttypes', '0002_remove_content_type_name'), - ('dcim', '0065_patch_panel_ports'), + ('dcim', '0065_front_rear_ports'), ] operations = [ @@ -123,8 +123,8 @@ class Migration(migrations.Migration): ('status', models.BooleanField(default=True)), ('label', models.CharField(blank=True, max_length=100)), ('color', utilities.fields.ColorField(blank=True, max_length=6)), - ('termination_a_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), - ('termination_b_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontpanelport', 'rearpanelport']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), + ('termination_a_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), + ('termination_b_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), ], ), migrations.AlterUniqueTogether( diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index de7426d41..2e042caf5 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -869,7 +869,7 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): }) if not self.is_patch_panel and ( - self.front_panel_port_templates.exists() or self.rear_panel_port_templates.exists() + self.front_port_templates.exists() or self.rear_port_templates.exists() ): raise ValidationError({ 'is_patch_panel': "Must delete all patch panel port templates associated with this device before " @@ -1015,25 +1015,25 @@ class InterfaceTemplate(ComponentTemplateModel): return self.name -class FrontPanelPortTemplate(ComponentTemplateModel): +class FrontPortTemplate(ComponentTemplateModel): """ - A template for a front patch panel port on a new Device. + Template for a pass-through port on the front of a new Device. """ device_type = models.ForeignKey( to='dcim.DeviceType', on_delete=models.CASCADE, - related_name='front_panel_port_templates' + related_name='front_port_templates' ) name = models.CharField( max_length=64 ) type = models.PositiveSmallIntegerField( - choices=PANELPORT_TYPE_CHOICES + choices=PORT_TYPE_CHOICES ) rear_port = models.ForeignKey( - to='dcim.RearPanelPortTemplate', + to='dcim.RearPortTemplate', on_delete=models.CASCADE, - related_name='front_panel_port_templates' + related_name='front_port_templates' ) rear_port_position = models.PositiveSmallIntegerField( default=1, @@ -1067,20 +1067,20 @@ class FrontPanelPortTemplate(ComponentTemplateModel): ) -class RearPanelPortTemplate(ComponentTemplateModel): +class RearPortTemplate(ComponentTemplateModel): """ - A template for a rear patch panel port on a new Device. + Template for a pass-through port on the rear of a new Device. """ device_type = models.ForeignKey( to='dcim.DeviceType', on_delete=models.CASCADE, - related_name='rear_panel_port_templates' + related_name='rear_port_templates' ) name = models.CharField( max_length=64 ) type = models.PositiveSmallIntegerField( - choices=PANELPORT_TYPE_CHOICES + choices=PORT_TYPE_CHOICES ) positions = models.PositiveSmallIntegerField( default=1, @@ -1512,22 +1512,22 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): [Interface(device=self, name=template.name, form_factor=template.form_factor, mgmt_only=template.mgmt_only) for template in self.device_type.interface_templates.all()] ) - RearPanelPort.objects.bulk_create([ - RearPanelPort( + RearPort.objects.bulk_create([ + RearPort( device=self, name=template.name, type=template.type, positions=template.positions - ) for template in self.device_type.rear_panel_port_templates.all() + ) for template in self.device_type.rear_port_templates.all() ]) - FrontPanelPort.objects.bulk_create([ - FrontPanelPort( + FrontPort.objects.bulk_create([ + FrontPort( device=self, name=template.name, type=template.type, - rear_port=RearPanelPort.objects.get(device=self, name=template.rear_port.name), + rear_port=RearPort.objects.get(device=self, name=template.rear_port.name), rear_port_position=template.rear_port_position, - ) for template in self.device_type.front_panel_port_templates.all() + ) for template in self.device_type.front_port_templates.all() ]) DeviceBay.objects.bulk_create( [DeviceBay(device=self, name=template.name) for template in @@ -2046,28 +2046,28 @@ class Interface(ComponentModel): # -# Patch panel ports +# Pass-through ports # -class FrontPanelPort(ComponentModel): +class FrontPort(ComponentModel): """ - A port on the front of a patch panel. + A pass-through port on the front of a Device. """ device = models.ForeignKey( to='dcim.Device', on_delete=models.CASCADE, - related_name='front_panel_ports' + related_name='front_ports' ) name = models.CharField( max_length=64 ) type = models.PositiveSmallIntegerField( - choices=PANELPORT_TYPE_CHOICES + choices=PORT_TYPE_CHOICES ) rear_port = models.ForeignKey( - to='dcim.RearPanelPort', + to='dcim.RearPort', on_delete=models.CASCADE, - related_name='front_panel_ports' + related_name='front_ports' ) rear_port_position = models.PositiveSmallIntegerField( default=1, @@ -2103,20 +2103,20 @@ class FrontPanelPort(ComponentModel): ) -class RearPanelPort(ComponentModel): +class RearPort(ComponentModel): """ - A port on the rear of a patch panel. + A pass-through port on the rear of a Device. """ device = models.ForeignKey( to='dcim.Device', on_delete=models.CASCADE, - related_name='rear_panel_ports' + related_name='rear_ports' ) name = models.CharField( max_length=64 ) type = models.PositiveSmallIntegerField( - choices=PANELPORT_TYPE_CHOICES + choices=PORT_TYPE_CHOICES ) positions = models.PositiveSmallIntegerField( default=1, @@ -2380,23 +2380,23 @@ class Cable(ChangeLoggedModel): def trace_cable(termination, position=1): # Given a front port, follow the cable connected to the corresponding rear port/position - if isinstance(termination, FrontPanelPort): + if isinstance(termination, FrontPort): peer_port = termination.rear_port position = termination.rear_port_position # Given a rear port/position, follow the cable connected to the corresponding front port - elif isinstance(termination, RearPanelPort): + elif isinstance(termination, RearPort): if position not in range(1, termination.positions + 1): raise Exception("Invalid position for {} ({} positions): {})".format( termination, termination.positions, position )) - peer_port = FrontPanelPort.objects.get( + peer_port = FrontPort.objects.get( rear_port=termination, rear_port_position=position, ) position=1 - # Termination is not a panel port, so we've reached the end of the path + # Termination is not a pass-through port, so we've reached the end of the path else: return termination diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 3c8df2b06..92c74e8d3 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -5,9 +5,9 @@ from tenancy.tables import COL_TENANT from utilities.tables import BaseTable, BooleanColumn, ToggleColumn from .models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate, + DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis, + RackGroup, RackReservation, RearPort, RearPortTemplate, Region, Site, VirtualChassis, ) REGION_LINK = """ @@ -416,20 +416,20 @@ class InterfaceTemplateTable(BaseTable): empty_text = "None" -class FrontPanelPortTemplateTable(BaseTable): +class FrontPortTemplateTable(BaseTable): pk = ToggleColumn() class Meta(BaseTable.Meta): - model = FrontPanelPortTemplate + model = FrontPortTemplate fields = ('pk', 'name', 'type', 'rear_port', 'rear_port_position') empty_text = "None" -class RearPanelPortTemplateTable(BaseTable): +class RearPortTemplateTable(BaseTable): pk = ToggleColumn() class Meta(BaseTable.Meta): - model = RearPanelPortTemplate + model = RearPortTemplate fields = ('pk', 'name', 'type', 'positions') empty_text = "None" @@ -593,18 +593,18 @@ class InterfaceTable(BaseTable): fields = ('name', 'form_factor', 'lag', 'enabled', 'mgmt_only', 'description') -class FrontPanelPortTable(BaseTable): +class FrontPortTable(BaseTable): class Meta(BaseTable.Meta): - model = FrontPanelPort + model = FrontPort fields = ('name', 'type', 'rear_port', 'rear_port_position') empty_text = "None" -class RearPanelPortTable(BaseTable): +class RearPortTable(BaseTable): class Meta(BaseTable.Meta): - model = RearPanelPort + model = RearPort fields = ('name', 'type', 'positions') empty_text = "None" diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 2c6152e5b..e7b69593a 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -109,13 +109,13 @@ urlpatterns = [ url(r'^device-types/(?P\d+)/interfaces/edit/$', views.InterfaceTemplateBulkEditView.as_view(), name='devicetype_bulkedit_interface'), url(r'^device-types/(?P\d+)/interfaces/delete/$', views.InterfaceTemplateBulkDeleteView.as_view(), name='devicetype_delete_interface'), - # Front panel port templates - url(r'^device-types/(?P\d+)/front-panel-ports/add/$', views.FrontPanelPortTemplateCreateView.as_view(), name='devicetype_add_frontpanelport'), - url(r'^device-types/(?P\d+)/front-panel-ports/delete/$', views.FrontPanelPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_frontpanelport'), + # Front port templates + url(r'^device-types/(?P\d+)/front-ports/add/$', views.FrontPortTemplateCreateView.as_view(), name='devicetype_add_frontport'), + url(r'^device-types/(?P\d+)/front-ports/delete/$', views.FrontPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_frontport'), - # Front panel port templates - url(r'^device-types/(?P\d+)/rear-panel-ports/add/$', views.RearPanelPortTemplateCreateView.as_view(), name='devicetype_add_rearpanelport'), - url(r'^device-types/(?P\d+)/rear-panel-ports/delete/$', views.RearPanelPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_rearpanelport'), + # Rear port templates + url(r'^device-types/(?P\d+)/rear-ports/add/$', views.RearPortTemplateCreateView.as_view(), name='devicetype_add_rearport'), + url(r'^device-types/(?P\d+)/rear-ports/delete/$', views.RearPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_rearport'), # Device bay templates url(r'^device-types/(?P\d+)/device-bays/add/$', views.DeviceBayTemplateCreateView.as_view(), name='devicetype_add_devicebay'), @@ -215,21 +215,21 @@ urlpatterns = [ url(r'^interfaces/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='interface_changelog', kwargs={'model': Interface}), url(r'^interfaces/rename/$', views.InterfaceBulkRenameView.as_view(), name='interface_bulk_rename'), - # Front panel ports - # url(r'^devices/front-panel-ports/add/$', views.DeviceBulkAddFrontPanelPortView.as_view(), name='device_bulk_add_frontpanelport'), - url(r'^devices/(?P\d+)/front-panel-ports/add/$', views.FrontPanelPortCreateView.as_view(), name='frontpanelport_add'), - url(r'^devices/(?P\d+)/front-panel-ports/delete/$', views.FrontPanelPortBulkDeleteView.as_view(), name='frontpanelport_bulk_delete'), - url(r'^front-panel-ports/(?P\d+)/edit/$', views.FrontPanelPortEditView.as_view(), name='frontpanelport_edit'), - url(r'^front-panel-ports/(?P\d+)/delete/$', views.FrontPanelPortDeleteView.as_view(), name='frontpanelport_delete'), - url(r'^front-panel-ports/rename/$', views.FrontPanelPortBulkRenameView.as_view(), name='frontpanelport_bulk_rename'), + # Front ports + # url(r'^devices/front-ports/add/$', views.DeviceBulkAddFrontPortView.as_view(), name='device_bulk_add_frontport'), + url(r'^devices/(?P\d+)/front-ports/add/$', views.FrontPortCreateView.as_view(), name='frontport_add'), + url(r'^devices/(?P\d+)/front-ports/delete/$', views.FrontPortBulkDeleteView.as_view(), name='frontport_bulk_delete'), + url(r'^front-ports/(?P\d+)/edit/$', views.FrontPortEditView.as_view(), name='frontport_edit'), + url(r'^front-ports/(?P\d+)/delete/$', views.FrontPortDeleteView.as_view(), name='frontport_delete'), + url(r'^front-ports/rename/$', views.FrontPortBulkRenameView.as_view(), name='frontport_bulk_rename'), - # Rear panel ports - # url(r'^devices/rear-panel-ports/add/$', views.DeviceBulkAddRearPanelPortView.as_view(), name='device_bulk_add_rearpanelport'), - url(r'^devices/(?P\d+)/rear-panel-ports/add/$', views.RearPanelPortCreateView.as_view(), name='rearpanelport_add'), - url(r'^devices/(?P\d+)/rear-panel-ports/delete/$', views.RearPanelPortBulkDeleteView.as_view(), name='rearpanelport_bulk_delete'), - url(r'^rear-panel-ports/(?P\d+)/edit/$', views.RearPanelPortEditView.as_view(), name='rearpanelport_edit'), - url(r'^rear-panel-ports/(?P\d+)/delete/$', views.RearPanelPortDeleteView.as_view(), name='rearpanelport_delete'), - url(r'^rear-panel-ports/rename/$', views.RearPanelPortBulkRenameView.as_view(), name='rearpanelport_bulk_rename'), + # Rear ports + # url(r'^devices/rear-ports/add/$', views.DeviceBulkAddRearPortView.as_view(), name='device_bulk_add_rearport'), + url(r'^devices/(?P\d+)/rear-ports/add/$', views.RearPortCreateView.as_view(), name='rearport_add'), + url(r'^devices/(?P\d+)/rear-ports/delete/$', views.RearPortBulkDeleteView.as_view(), name='rearport_bulk_delete'), + url(r'^rear-ports/(?P\d+)/edit/$', views.RearPortEditView.as_view(), name='rearport_edit'), + url(r'^rear-ports/(?P\d+)/delete/$', views.RearPortDeleteView.as_view(), name='rearport_delete'), + url(r'^rear-ports/rename/$', views.RearPortBulkRenameView.as_view(), name='rearport_bulk_rename'), # Device bays url(r'^devices/device-bays/add/$', views.DeviceBulkAddDeviceBayView.as_view(), name='device_bulk_add_devicebay'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 98dd04c16..25f62f612 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -29,9 +29,9 @@ from . import filters, forms, tables from .constants import CONNECTION_STATUS_CONNECTED from .models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, FrontPanelPort, FrontPanelPortTemplate, Interface, InterfaceTemplate, + DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RackRole, RearPanelPort, RearPanelPortTemplate, Region, Site, VirtualChassis, + RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, ) @@ -557,12 +557,12 @@ class DeviceTypeView(View): ).filter(device_type=devicetype)), orderable=False ) - front_panel_port_table = tables.FrontPanelPortTemplateTable( - natsorted(FrontPanelPortTemplate.objects.filter(device_type=devicetype), key=attrgetter('name')), + front_port_table = tables.FrontPortTemplateTable( + natsorted(FrontPortTemplate.objects.filter(device_type=devicetype), key=attrgetter('name')), orderable=False ) - rear_panel_port_table = tables.RearPanelPortTemplateTable( - natsorted(RearPanelPortTemplate.objects.filter(device_type=devicetype), key=attrgetter('name')), + rear_port_table = tables.RearPortTemplateTable( + natsorted(RearPortTemplate.objects.filter(device_type=devicetype), key=attrgetter('name')), orderable=False ) devicebay_table = tables.DeviceBayTemplateTable( @@ -575,8 +575,8 @@ class DeviceTypeView(View): powerport_table.columns.show('pk') poweroutlet_table.columns.show('pk') interface_table.columns.show('pk') - front_panel_port_table.columns.show('pk') - rear_panel_port_table.columns.show('pk') + front_port_table.columns.show('pk') + rear_port_table.columns.show('pk') devicebay_table.columns.show('pk') return render(request, 'dcim/devicetype.html', { @@ -586,8 +586,8 @@ class DeviceTypeView(View): 'powerport_table': powerport_table, 'poweroutlet_table': poweroutlet_table, 'interface_table': interface_table, - 'front_panel_port_table': front_panel_port_table, - 'rear_panel_port_table': rear_panel_port_table, + 'front_port_table': front_port_table, + 'rear_port_table': rear_port_table, 'devicebay_table': devicebay_table, }) @@ -731,38 +731,38 @@ class InterfaceTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): table = tables.InterfaceTemplateTable -class FrontPanelPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView): - permission_required = 'dcim.add_frontpanelporttemplate' +class FrontPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView): + permission_required = 'dcim.add_frontporttemplate' parent_model = DeviceType parent_field = 'device_type' - model = FrontPanelPortTemplate - form = forms.FrontPanelPortTemplateCreateForm - model_form = forms.FrontPanelPortTemplateForm + model = FrontPortTemplate + form = forms.FrontPortTemplateCreateForm + model_form = forms.FrontPortTemplateForm template_name = 'dcim/device_component_add.html' -class FrontPanelPortTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): - permission_required = 'dcim.delete_frontpanelporttemplate' - queryset = FrontPanelPortTemplate.objects.all() +class FrontPortTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_frontporttemplate' + queryset = FrontPortTemplate.objects.all() parent_model = DeviceType - table = tables.FrontPanelPortTemplateTable + table = tables.FrontPortTemplateTable -class RearPanelPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView): - permission_required = 'dcim.add_rearpanelporttemplate' +class RearPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView): + permission_required = 'dcim.add_rearporttemplate' parent_model = DeviceType parent_field = 'device_type' - model = RearPanelPortTemplate - form = forms.RearPanelPortTemplateCreateForm - model_form = forms.RearPanelPortTemplateForm + model = RearPortTemplate + form = forms.RearPortTemplateCreateForm + model_form = forms.RearPortTemplateForm template_name = 'dcim/device_component_add.html' -class RearPanelPortTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): - permission_required = 'dcim.delete_rearpanelporttemplate' - queryset = RearPanelPortTemplate.objects.all() +class RearPortTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_rearporttemplate' + queryset = RearPortTemplate.objects.all() parent_model = DeviceType - table = tables.RearPanelPortTemplateTable + table = tables.RearPortTemplateTable class DeviceBayTemplateCreateView(PermissionRequiredMixin, ComponentCreateView): @@ -903,11 +903,11 @@ class DeviceView(View): 'connected_endpoint__device', 'circuit_termination__circuit' ).prefetch_related('ip_addresses') - # Front panel ports - front_panel_ports = device.front_panel_ports.select_related('rear_port') + # Front ports + front_ports = device.front_ports.select_related('rear_port') - # Rear panel ports - rear_panel_ports = device.rear_panel_ports.all() + # Rear ports + rear_ports = device.rear_ports.all() # Device bays device_bays = natsorted( @@ -941,8 +941,8 @@ class DeviceView(View): 'poweroutlets': poweroutlets, 'interfaces': interfaces, 'device_bays': device_bays, - 'front_panel_ports': front_panel_ports, - 'rear_panel_ports': rear_panel_ports, + 'front_ports': front_ports, + 'rear_ports': rear_ports, 'services': services, 'secrets': secrets, 'vc_members': vc_members, @@ -1757,79 +1757,79 @@ class InterfaceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # -# Front panel ports +# Front ports # -class FrontPanelPortCreateView(PermissionRequiredMixin, ComponentCreateView): - permission_required = 'dcim.add_frontpanelport' +class FrontPortCreateView(PermissionRequiredMixin, ComponentCreateView): + permission_required = 'dcim.add_frontport' parent_model = Device parent_field = 'device' - model = FrontPanelPort - form = forms.FrontPanelPortCreateForm - model_form = forms.FrontPanelPortForm + model = FrontPort + form = forms.FrontPortCreateForm + model_form = forms.FrontPortForm template_name = 'dcim/device_component_add.html' -class FrontPanelPortEditView(PermissionRequiredMixin, ObjectEditView): - permission_required = 'dcim.change_frontpanelport' - model = FrontPanelPort - model_form = forms.FrontPanelPortForm +class FrontPortEditView(PermissionRequiredMixin, ObjectEditView): + permission_required = 'dcim.change_frontport' + model = FrontPort + model_form = forms.FrontPortForm -class FrontPanelPortDeleteView(PermissionRequiredMixin, ObjectDeleteView): - permission_required = 'dcim.delete_frontpanelport' - model = FrontPanelPort +class FrontPortDeleteView(PermissionRequiredMixin, ObjectDeleteView): + permission_required = 'dcim.delete_frontport' + model = FrontPort -class FrontPanelPortBulkRenameView(PermissionRequiredMixin, BulkRenameView): - permission_required = 'dcim.change_frontpanelport' - queryset = FrontPanelPort.objects.all() - form = forms.FrontPanelPortBulkRenameForm +class FrontPortBulkRenameView(PermissionRequiredMixin, BulkRenameView): + permission_required = 'dcim.change_frontport' + queryset = FrontPort.objects.all() + form = forms.FrontPortBulkRenameForm -class FrontPanelPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): - permission_required = 'dcim.delete_frontpanelport' - queryset = FrontPanelPort.objects.all() +class FrontPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_frontport' + queryset = FrontPort.objects.all() parent_model = Device - table = tables.FrontPanelPortTable + table = tables.FrontPortTable # -# Rear panel ports +# Rear ports # -class RearPanelPortCreateView(PermissionRequiredMixin, ComponentCreateView): - permission_required = 'dcim.add_rearpanelport' +class RearPortCreateView(PermissionRequiredMixin, ComponentCreateView): + permission_required = 'dcim.add_rearport' parent_model = Device parent_field = 'device' - model = RearPanelPort - form = forms.RearPanelPortCreateForm - model_form = forms.RearPanelPortForm + model = RearPort + form = forms.RearPortCreateForm + model_form = forms.RearPortForm template_name = 'dcim/device_component_add.html' -class RearPanelPortEditView(PermissionRequiredMixin, ObjectEditView): - permission_required = 'dcim.change_rearpanelport' - model = RearPanelPort - model_form = forms.RearPanelPortForm +class RearPortEditView(PermissionRequiredMixin, ObjectEditView): + permission_required = 'dcim.change_rearport' + model = RearPort + model_form = forms.RearPortForm -class RearPanelPortDeleteView(PermissionRequiredMixin, ObjectDeleteView): - permission_required = 'dcim.delete_rearpanelport' - model = RearPanelPort +class RearPortDeleteView(PermissionRequiredMixin, ObjectDeleteView): + permission_required = 'dcim.delete_rearport' + model = RearPort -class RearPanelPortBulkRenameView(PermissionRequiredMixin, BulkRenameView): - permission_required = 'dcim.change_rearpanelport' - queryset = RearPanelPort.objects.all() - form = forms.RearPanelPortBulkRenameForm +class RearPortBulkRenameView(PermissionRequiredMixin, BulkRenameView): + permission_required = 'dcim.change_rearport' + queryset = RearPort.objects.all() + form = forms.RearPortBulkRenameForm -class RearPanelPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): - permission_required = 'dcim.delete_rearpanelport' - queryset = RearPanelPort.objects.all() +class RearPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_rearport' + queryset = RearPort.objects.all() parent_model = Device - table = tables.RearPanelPortTable + table = tables.RearPortTable # diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 165a86595..7959f6cd8 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -689,7 +689,7 @@ {% endif %} {% endif %} - {% if front_panel_ports or device.device_type.is_patch_panel %} + {% if front_ports or device.device_type.is_patch_panel %}
      {% csrf_token %}
      @@ -699,7 +699,7 @@ - {% if perms.dcim.change_frontpanelport or perms.dcim.delete_frontpanelport %} + {% if perms.dcim.change_frontport or perms.dcim.delete_frontport %} {% endif %} @@ -710,8 +710,8 @@ - {% for frontpanelport in front_panel_ports %} - {% include 'dcim/inc/frontpanelport.html' %} + {% for frontport in front_ports %} + {% include 'dcim/inc/frontport.html' %} {% empty %} @@ -720,19 +720,19 @@
      Name
      — No front panel ports defined —
      - {% if front_panel_ports and perms.dcim.change_frontpanelport %} - {% endif %} - {% if front_panel_ports and perms.dcim.delete_frontpanelport %} - {% endif %} - {% if perms.dcim.add_frontpanelport %} + {% if perms.dcim.add_frontport %}
      - + Add front panel ports
      @@ -742,7 +742,7 @@
      {% endif %} - {% if rear_panel_ports or device.device_type.is_patch_panel %} + {% if rear_ports or device.device_type.is_patch_panel %}
      {% csrf_token %}
      @@ -752,7 +752,7 @@ - {% if perms.dcim.change_rearpanelport or perms.dcim.delete_rearpanelport %} + {% if perms.dcim.change_rearport or perms.dcim.delete_rearport %} {% endif %} @@ -762,8 +762,8 @@ - {% for rearpanelport in rear_panel_ports %} - {% include 'dcim/inc/rearpanelport.html' %} + {% for rearport in rear_ports %} + {% include 'dcim/inc/rearport.html' %} {% empty %} @@ -772,19 +772,19 @@
      Name
      — No rear panel ports defined —
      - {% if rear_panel_ports and perms.dcim.change_rearpanelport %} - {% endif %} - {% if rear_panel_ports and perms.dcim.delete_rearpanelport %} - {% endif %} - {% if perms.dcim.add_rearpanelport %} + {% if perms.dcim.add_rearport %}
      - + Add rear panel ports
      diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 9d7f94b24..30c112642 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -201,11 +201,11 @@ {% if devicetype.is_pdu or poweroutlet_table.rows %} {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' add_url='dcim:devicetype_add_poweroutlet' delete_url='dcim:devicetype_delete_poweroutlet' %} {% endif %} - {% if devicetype.is_patch_panel or front_panel_port_table.rows %} - {% include 'dcim/inc/devicetype_component_table.html' with table=front_panel_port_table title='Front Panel Ports' add_url='dcim:devicetype_add_frontpanelport' delete_url='dcim:devicetype_delete_frontpanelport' %} + {% if devicetype.is_patch_panel or front_port_table.rows %} + {% include 'dcim/inc/devicetype_component_table.html' with table=front_port_table title='Front Panel Ports' add_url='dcim:devicetype_add_frontport' delete_url='dcim:devicetype_delete_frontport' %} {% endif %} - {% if devicetype.is_patch_panel or rear_panel_port_table.rows %} - {% include 'dcim/inc/devicetype_component_table.html' with table=rear_panel_port_table title='Rear Panel Ports' add_url='dcim:devicetype_add_rearpanelport' delete_url='dcim:devicetype_delete_rearpanelport' %} + {% if devicetype.is_patch_panel or rear_port_table.rows %} + {% include 'dcim/inc/devicetype_component_table.html' with table=rear_port_table title='Rear Panel Ports' add_url='dcim:devicetype_add_rearport' delete_url='dcim:devicetype_delete_rearport' %} {% endif %}
      diff --git a/netbox/templates/dcim/inc/frontpanelport.html b/netbox/templates/dcim/inc/frontpanelport.html deleted file mode 100644 index bef4c24c7..000000000 --- a/netbox/templates/dcim/inc/frontpanelport.html +++ /dev/null @@ -1,25 +0,0 @@ - - {% if perms.dcim.change_frontpanelport or perms.dcim.delete_frontpanelport %} - - - - {% endif %} - - {{ frontpanelport }} - - {{ frontpanelport.get_type_display }} - {{ frontpanelport.rear_port }} - {{ frontpanelport.rear_port_position }} - - {% if perms.dcim.change_frontpanelport %} - - - - {% endif %} - {% if perms.dcim.delete_frontpanelport %} - - - - {% endif %} - - diff --git a/netbox/templates/dcim/inc/frontport.html b/netbox/templates/dcim/inc/frontport.html new file mode 100644 index 000000000..afa7e8764 --- /dev/null +++ b/netbox/templates/dcim/inc/frontport.html @@ -0,0 +1,25 @@ + + {% if perms.dcim.change_frontport or perms.dcim.delete_frontport %} + + + + {% endif %} + + {{ frontport }} + + {{ frontport.get_type_display }} + {{ frontport.rear_port }} + {{ frontport.rear_port_position }} + + {% if perms.dcim.change_frontport %} + + + + {% endif %} + {% if perms.dcim.delete_frontport %} + + + + {% endif %} + + diff --git a/netbox/templates/dcim/inc/rearpanelport.html b/netbox/templates/dcim/inc/rearpanelport.html deleted file mode 100644 index a781de727..000000000 --- a/netbox/templates/dcim/inc/rearpanelport.html +++ /dev/null @@ -1,24 +0,0 @@ - - {% if perms.dcim.change_rearpanelport or perms.dcim.delete_rearpanelport %} - - - - {% endif %} - - {{ rearpanelport }} - - {{ rearpanelport.get_type_display }} - {{ rearpanelport.positions }} - - {% if perms.dcim.change_rearpanelport %} - - - - {% endif %} - {% if perms.dcim.delete_rearpanelport %} - - - - {% endif %} - - diff --git a/netbox/templates/dcim/inc/rearport.html b/netbox/templates/dcim/inc/rearport.html new file mode 100644 index 000000000..e4610e4a5 --- /dev/null +++ b/netbox/templates/dcim/inc/rearport.html @@ -0,0 +1,24 @@ + + {% if perms.dcim.change_rearport or perms.dcim.delete_rearport %} + + + + {% endif %} + + {{ rearport }} + + {{ rearport.get_type_display }} + {{ rearport.positions }} + + {% if perms.dcim.change_rearport %} + + + + {% endif %} + {% if perms.dcim.delete_rearport %} + + + + {% endif %} + + From 266429101b5bc30c3733205b377e935905dbd93f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 25 Oct 2018 12:44:28 -0400 Subject: [PATCH 025/191] Removed 'is_patch_panel' from DeviceType --- netbox/dcim/api/serializers.py | 2 +- netbox/dcim/forms.py | 8 +---- .../dcim/migrations/0065_front_rear_ports.py | 5 ---- netbox/dcim/models.py | 18 ++---------- netbox/dcim/tables.py | 3 +- netbox/templates/dcim/device.html | 8 ++--- netbox/templates/dcim/devicetype.html | 29 +++++++------------ netbox/templates/dcim/devicetype_edit.html | 1 - 8 files changed, 19 insertions(+), 55 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 4f458fbc5..452ebb15d 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -226,7 +226,7 @@ class DeviceTypeSerializer(TaggitSerializer, CustomFieldModelSerializer): model = DeviceType fields = [ 'id', 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'interface_ordering', - 'is_console_server', 'is_pdu', 'is_network_device', 'is_patch_panel', 'subdevice_role', 'comments', 'tags', + 'is_console_server', 'is_pdu', 'is_network_device', 'subdevice_role', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'instance_count', ] diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index b0d5f95f2..e74551c2e 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -532,7 +532,7 @@ class DeviceTypeForm(BootstrapMixin, CustomFieldForm): model = DeviceType fields = [ 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'is_console_server', 'is_pdu', - 'is_network_device', 'is_patch_panel', 'subdevice_role', 'interface_ordering', 'comments', 'tags', + 'is_network_device', 'subdevice_role', 'interface_ordering', 'comments', 'tags', ] labels = { 'interface_ordering': 'Order interfaces by', @@ -582,9 +582,6 @@ class DeviceTypeBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkE is_network_device = forms.NullBooleanField( required=False, widget=BulkEditNullBooleanSelect, label='Is a network device' ) - is_patch_panel = forms.NullBooleanField( - required=False, widget=BulkEditNullBooleanSelect, label='Is a patch panel' - ) class Meta: nullable_fields = [] @@ -605,9 +602,6 @@ class DeviceTypeFilterForm(BootstrapMixin, CustomFieldFilterForm): is_network_device = forms.BooleanField( required=False, label='Is a network device', widget=forms.CheckboxInput(attrs={'value': 'True'}) ) - is_patch_panel = forms.BooleanField( - required=False, label='Is a patch panel', widget=forms.CheckboxInput(attrs={'value': 'True'}) - ) subdevice_role = forms.NullBooleanField( required=False, label='Subdevice role', widget=forms.Select(choices=( ('', '---------'), diff --git a/netbox/dcim/migrations/0065_front_rear_ports.py b/netbox/dcim/migrations/0065_front_rear_ports.py index 6cc4340f2..e3f2f290a 100644 --- a/netbox/dcim/migrations/0065_front_rear_ports.py +++ b/netbox/dcim/migrations/0065_front_rear_ports.py @@ -65,11 +65,6 @@ class Migration(migrations.Migration): 'ordering': ['device_type', 'name'], }, ), - migrations.AddField( - model_name='devicetype', - name='is_patch_panel', - field=models.BooleanField(default=False), - ), migrations.AddField( model_name='rearporttemplate', name='device_type', diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 2e042caf5..75ab9dbe8 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -770,11 +770,6 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): verbose_name='Is a network device', help_text='This type of device has network interfaces' ) - is_patch_panel = models.BooleanField( - default=False, - verbose_name='Is a patch panel', - help_text='This type of device has patch panel ports' - ) subdevice_role = models.NullBooleanField( default=None, verbose_name='Parent/child status', @@ -794,8 +789,8 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): tags = TaggableManager() csv_headers = [ - 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'is_console_server', - 'is_pdu', 'is_network_device', 'is_patch_panel', 'subdevice_role', 'interface_ordering', 'comments', + 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'is_console_server', 'is_pdu', + 'is_network_device', 'subdevice_role', 'interface_ordering', 'comments', ] class Meta: @@ -828,7 +823,6 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): self.is_console_server, self.is_pdu, self.is_network_device, - self.is_patch_panel, self.get_subdevice_role_display() if self.subdevice_role else None, self.get_interface_ordering_display(), self.comments, @@ -868,14 +862,6 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): "device before declassifying it as a network device." }) - if not self.is_patch_panel and ( - self.front_port_templates.exists() or self.rear_port_templates.exists() - ): - raise ValidationError({ - 'is_patch_panel': "Must delete all patch panel port templates associated with this device before " - "declassifying it as a network device." - }) - if self.subdevice_role != SUBDEVICE_ROLE_PARENT and self.device_bay_templates.count(): raise ValidationError({ 'subdevice_role': "Must delete all device bay templates associated with this device before " diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 92c74e8d3..0a79560f8 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -348,7 +348,6 @@ class DeviceTypeTable(BaseTable): is_console_server = BooleanColumn(verbose_name='CS') is_pdu = BooleanColumn(verbose_name='PDU') is_network_device = BooleanColumn(verbose_name='Net') - is_patch_panel = BooleanColumn(verbose_name='PP') subdevice_role = tables.TemplateColumn( template_code=SUBDEVICE_ROLE_TEMPLATE, verbose_name='Subdevice Role' @@ -362,7 +361,7 @@ class DeviceTypeTable(BaseTable): model = DeviceType fields = ( 'pk', 'model', 'manufacturer', 'part_number', 'u_height', 'is_full_depth', 'is_console_server', 'is_pdu', - 'is_network_device', 'is_patch_panel', 'subdevice_role', 'instance_count', + 'is_network_device', 'subdevice_role', 'instance_count', ) diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 7959f6cd8..7a81266cc 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -689,12 +689,12 @@ {% endif %} {% endif %} - {% if front_ports or device.device_type.is_patch_panel %} + {% if front_ports %}
      {% csrf_token %}
      - Front Panel Ports + Front Ports
      @@ -742,12 +742,12 @@ {% endif %} - {% if rear_ports or device.device_type.is_patch_panel %} + {% if rear_ports %} {% csrf_token %}
      - Rear Panel Ports + Rear Ports
      diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 30c112642..b02a97da1 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -135,19 +135,6 @@ This device {% if devicetype.is_network_device %}has{% else %}does not have{% endif %} network interfaces - - - - + @@ -758,6 +759,7 @@ + diff --git a/netbox/templates/dcim/inc/frontport.html b/netbox/templates/dcim/inc/frontport.html index afa7e8764..38fd29b34 100644 --- a/netbox/templates/dcim/inc/frontport.html +++ b/netbox/templates/dcim/inc/frontport.html @@ -10,6 +10,15 @@ + {% with cable=frontport.get_connected_cable %} + + {% endwith %} + {% with cable=rearport.get_connected_cable %} + + {% endwith %} + + + +
      - {% if devicetype.is_patch_panel %} - - {% else %} - - {% endif %} - - Patch Panel
      - This device {% if devicetype.is_patch_panel %}has{% else %}does not have{% endif %} patch panel ports -
      {% if devicetype.subdevice_role == True %} @@ -201,12 +188,16 @@ {% if devicetype.is_pdu or poweroutlet_table.rows %} {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' add_url='dcim:devicetype_add_poweroutlet' delete_url='dcim:devicetype_delete_poweroutlet' %} {% endif %} - {% if devicetype.is_patch_panel or front_port_table.rows %} - {% include 'dcim/inc/devicetype_component_table.html' with table=front_port_table title='Front Panel Ports' add_url='dcim:devicetype_add_frontport' delete_url='dcim:devicetype_delete_frontport' %} - {% endif %} - {% if devicetype.is_patch_panel or rear_port_table.rows %} - {% include 'dcim/inc/devicetype_component_table.html' with table=rear_port_table title='Rear Panel Ports' add_url='dcim:devicetype_add_rearport' delete_url='dcim:devicetype_delete_rearport' %} - {% endif %} +{% if devicetype.front_port_templates.exists or devicetype.rear_port_templates.exists %} +
      +
      + {% include 'dcim/inc/devicetype_component_table.html' with table=front_port_table title='Front Ports' add_url='dcim:devicetype_add_frontport' delete_url='dcim:devicetype_delete_frontport' %} +
      +
      + {% include 'dcim/inc/devicetype_component_table.html' with table=rear_port_table title='Rear Ports' add_url='dcim:devicetype_add_rearport' delete_url='dcim:devicetype_delete_rearport' %} +
      +
      +{% endif %} {% endblock %} diff --git a/netbox/templates/dcim/devicetype_edit.html b/netbox/templates/dcim/devicetype_edit.html index 14b8103e3..d0ed2c204 100644 --- a/netbox/templates/dcim/devicetype_edit.html +++ b/netbox/templates/dcim/devicetype_edit.html @@ -20,7 +20,6 @@ {% render_field form.is_console_server %} {% render_field form.is_pdu %} {% render_field form.is_network_device %} - {% render_field form.is_patch_panel %} {% render_field form.subdevice_role %} From f134a6ec63020b27b2baa4eb2d7c77049cb145c0 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 25 Oct 2018 15:21:16 -0400 Subject: [PATCH 026/191] Introduced CableTermination abstract model to ptovide Cable access from termination points --- netbox/dcim/models.py | 51 +++++++++++++++--------- netbox/dcim/querysets.py | 16 +++++++- netbox/templates/dcim/device.html | 2 + netbox/templates/dcim/inc/frontport.html | 9 +++++ netbox/templates/dcim/inc/rearport.html | 9 +++++ 5 files changed, 68 insertions(+), 19 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 75ab9dbe8..26bfc5a32 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -16,7 +16,6 @@ from taggit.managers import TaggableManager from timezone_field import TimeZoneField from circuits.models import Circuit -from extras.constants import OBJECTCHANGE_ACTION_DELETE, OBJECTCHANGE_ACTION_UPDATE from extras.models import ConfigContextModel, CustomFieldModel, ObjectChange from utilities.fields import ColorField, NullableCharField from utilities.managers import NaturalOrderByManager @@ -24,7 +23,7 @@ from utilities.models import ChangeLoggedModel from utilities.utils import serialize_object from .constants import * from .fields import ASNField, MACAddressField -from .querysets import InterfaceQuerySet +from .querysets import CableQuerySet, InterfaceQuerySet class ComponentTemplateModel(models.Model): @@ -66,6 +65,22 @@ class ComponentModel(models.Model): ).save() +class CableTermination(models.Model): + + class Meta: + abstract = True + + def get_connected_cable(self): + """ + Return the connected cable if one exists; else None. Assign the far end of the connection on the Cable instance. + """ + cable = Cable.objects.get_for_termination(self) + if cable is None: + return None + cable.far_end = cable.termination_b if cable.termination_a == self else cable.termination_a + return cable + + # # Regions # @@ -1603,7 +1618,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): # Console ports # -class ConsolePort(ComponentModel): +class ConsolePort(CableTermination, ComponentModel): """ A physical console port within a Device. ConsolePorts connect to ConsoleServerPorts. """ @@ -1665,7 +1680,7 @@ class ConsoleServerPortManager(models.Manager): }).order_by('device', 'name_padded') -class ConsoleServerPort(ComponentModel): +class ConsoleServerPort(CableTermination, ComponentModel): """ A physical port within a Device (typically a designated console server) which provides access to ConsolePorts. """ @@ -1706,7 +1721,7 @@ class ConsoleServerPort(ComponentModel): # Power ports # -class PowerPort(ComponentModel): +class PowerPort(CableTermination, ComponentModel): """ A physical power supply (intake) port within a Device. PowerPorts connect to PowerOutlets. """ @@ -1768,7 +1783,7 @@ class PowerOutletManager(models.Manager): }).order_by('device', 'name_padded') -class PowerOutlet(ComponentModel): +class PowerOutlet(CableTermination, ComponentModel): """ A physical power outlet (output) within a Device which provides power to a PowerPort. """ @@ -1809,7 +1824,7 @@ class PowerOutlet(ComponentModel): # Interfaces # -class Interface(ComponentModel): +class Interface(CableTermination, ComponentModel): """ A network interface within a Device or VirtualMachine. A physical Interface can connect to exactly one other Interface. @@ -2035,7 +2050,7 @@ class Interface(ComponentModel): # Pass-through ports # -class FrontPort(ComponentModel): +class FrontPort(CableTermination, ComponentModel): """ A pass-through port on the front of a Device. """ @@ -2089,7 +2104,7 @@ class FrontPort(ComponentModel): ) -class RearPort(ComponentModel): +class RearPort(CableTermination, ComponentModel): """ A pass-through port on the rear of a Device. """ @@ -2352,12 +2367,19 @@ class Cable(ChangeLoggedModel): blank=True ) + objects = CableQuerySet.as_manager() + class Meta: unique_together = ( ('termination_a_type', 'termination_a_id'), ('termination_b_type', 'termination_b_id'), ) + def __str__(self): + if self.label: + return '{} (#{})'.format(self.label, self.pk) + return '#{}'.format(self.pk) + def get_path_endpoints(self): """ Traverse both ends of a cable path and return its connected endpoints. Note that one or both endpoints may be @@ -2387,20 +2409,13 @@ class Cable(ChangeLoggedModel): return termination # Find the cable (if any) attached to the peer port - port_type = ContentType.objects.get_for_model(peer_port) - next_cable = Cable.objects.filter( - Q(termination_a_type=port_type, termination_a_id=peer_port.pk) | - Q(termination_b_type=port_type, termination_b_id=peer_port.pk) - ).first() + next_cable, far_end = peer_port.get_connection() # If no cable exists, return None if next_cable is None: return None # Return the far side termination of the cable - if next_cable.termination_a == peer_port: - return trace_cable(next_cable.termination_b, position) - else: - return trace_cable(next_cable.termination_a, position) + return trace_cable(far_end, position) return trace_cable(self.termination_a), trace_cable(self.termination_b) diff --git a/netbox/dcim/querysets.py b/netbox/dcim/querysets.py index 9b735dfa6..375699bd7 100644 --- a/netbox/dcim/querysets.py +++ b/netbox/dcim/querysets.py @@ -1,4 +1,5 @@ -from django.db.models import QuerySet +from django.contrib.contenttypes.models import ContentType +from django.db.models import Q, QuerySet from django.db.models.expressions import RawSQL from .constants import IFACE_ORDERING_NAME, IFACE_ORDERING_POSITION, NONCONNECTABLE_IFACE_TYPES @@ -68,3 +69,16 @@ class InterfaceQuerySet(QuerySet): wireless). """ return self.exclude(form_factor__in=NONCONNECTABLE_IFACE_TYPES) + + +class CableQuerySet(QuerySet): + + def get_for_termination(self, termination): + """ + Return the Cable (or None) connected to a given termination point. + """ + content_type = ContentType.objects.get_for_model(termination) + return self.filter( + Q(termination_a_type=content_type, termination_a_id=termination.pk) | + Q(termination_b_type=content_type, termination_b_id=termination.pk) + ).first() diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 7a81266cc..261b7e1f2 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -706,6 +706,7 @@       		Type Rear Port PositionConnected Cable
      Name Type PositionsConnected Cable
      {{ frontport.get_type_display }} {{ frontport.rear_port }} {{ frontport.rear_port_position }} + {% if cable %} + {{ cable }} to {{ cable.far_end.device }} {{ cable.far_end }} + {% else %} + Not connected + {% endif %} + {% if perms.dcim.change_frontport %} diff --git a/netbox/templates/dcim/inc/rearport.html b/netbox/templates/dcim/inc/rearport.html index e4610e4a5..aa130b883 100644 --- a/netbox/templates/dcim/inc/rearport.html +++ b/netbox/templates/dcim/inc/rearport.html @@ -9,6 +9,15 @@ {{ rearport.get_type_display }} {{ rearport.positions }} + {% if cable %} + {{ cable }} to {{ cable.far_end.device }} {{ cable.far_end }} + {% else %} + Not connected + {% endif %} + {% if perms.dcim.change_rearport %} From 2d90fc608e6f91d461cf25c6f61cc20e61b19740 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 25 Oct 2018 15:51:12 -0400 Subject: [PATCH 027/191] Introduced CableView and CableEditView --- netbox/dcim/forms.py | 11 ++- netbox/dcim/models.py | 3 + netbox/dcim/tables.py | 9 +-- netbox/dcim/urls.py | 2 + netbox/dcim/views.py | 20 +++++- netbox/templates/dcim/cable.html | 72 +++++++++++++++++++ .../templates/dcim/inc/cable_termination.html | 12 ++++ 7 files changed, 122 insertions(+), 7 deletions(-) create mode 100644 netbox/templates/dcim/cable.html create mode 100644 netbox/templates/dcim/inc/cable_termination.html diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index e74551c2e..883d72498 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -2131,7 +2131,7 @@ class RearPortBulkRenameForm(BulkRenameForm): # Cables # -class CableForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): +class CableCreateForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): termination_b_site = forms.ModelChoiceField( queryset=Site.objects.all(), label='Site', @@ -2198,7 +2198,7 @@ class CableForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): ] def __init__(self, *args, **kwargs): - super(CableForm, self).__init__(*args, **kwargs) + super(CableCreateForm, self).__init__(*args, **kwargs) # Define available types for endpoint B based on the type of endpoint A termination_a_type = self.instance.termination_a._meta.model_name @@ -2207,6 +2207,13 @@ class CableForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): ) +class CableForm(BootstrapMixin, forms.ModelForm): + + class Meta: + model = Cable + fields = ('type', 'status', 'label', 'color') + + class CableFilterForm(BootstrapMixin, forms.Form): model = Cable q = forms.CharField(required=False, label='Search') diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 26bfc5a32..881a3b2d7 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2380,6 +2380,9 @@ class Cable(ChangeLoggedModel): return '{} (#{})'.format(self.label, self.pk) return '#{}'.format(self.pk) + def get_absolute_url(self): + return reverse('dcim:cable', args=[self.pk]) + def get_path_endpoints(self): """ Traverse both ends of a cable path and return its connected endpoints. Note that one or both endpoints may be diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 0a79560f8..7a27ecc64 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -621,9 +621,10 @@ class DeviceBayTable(BaseTable): class CableTable(BaseTable): # django-tables2 adds CSS `class="label"` which causes rendering issues - _label = tables.Column( - accessor=Accessor('label'), - verbose_name='Label' + pk = tables.LinkColumn( + viewname='dcim:cable', + args=[Accessor('pk')], + verbose_name='PK' ) device_a = tables.LinkColumn( viewname='dcim:device', @@ -652,7 +653,7 @@ class CableTable(BaseTable): class Meta(BaseTable.Meta): model = Cable - fields = ('_label', 'device_a', 'termination_a', 'device_b', 'termination_b', 'status', 'type', 'color') + fields = ('pk', 'device_a', 'termination_a', 'device_b', 'termination_b', 'status', 'type', 'color') # diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index e7b69593a..9a669d4f1 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -252,6 +252,8 @@ urlpatterns = [ # Cables url(r'^cables/$', views.CableListView.as_view(), name='cable_list'), + url(r'^cables/(?P\d+)/$', views.CableView.as_view(), name='cable'), + url(r'^cables/(?P\d+)/edit/$', views.CableEditView.as_view(), name='cable_edit'), url(r'^cables/(?P\d+)/delete/$', views.CableDeleteView.as_view(), name='cable_delete'), # Console/power/interface connections diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 25f62f612..e4454ee75 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2023,10 +2023,21 @@ class CableListView(ObjectListView): template_name = 'dcim/cable_list.html' +class CableView(View): + + def get(self, request, pk): + + cable = get_object_or_404(Cable, pk=pk) + + return render(request, 'dcim/cable.html', { + 'cable': cable, + }) + + class CableCreateView(PermissionRequiredMixin, ObjectEditView): permission_required = 'dcim.add_cable' model = Cable - model_form = forms.CableForm + model_form = forms.CableCreateForm template_name = 'dcim/cable_connect.html' def alter_obj(self, obj, request, url_args, url_kwargs): @@ -2039,6 +2050,13 @@ class CableCreateView(PermissionRequiredMixin, ObjectEditView): return obj +class CableEditView(PermissionRequiredMixin, ObjectEditView): + permission_required = 'dcim.change_cable' + model = Cable + model_form = forms.CableForm + default_return_url = 'dcim:cable_list' + + class CableDeleteView(PermissionRequiredMixin, ObjectDeleteView): permission_required = 'dcim.delete_cable' model = Cable diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html new file mode 100644 index 000000000..72bea3ebc --- /dev/null +++ b/netbox/templates/dcim/cable.html @@ -0,0 +1,72 @@ +{% extends '_base.html' %} +{% load helpers %} + +{% block header %} +
      +
      +
        +
      1. Cables
        2. +
      2. {{ cable }}
        3. +
      +
      +
      +
      + {% if perms.dcim.change_cable %} + + Edit this cable + + {% endif %} + {% if perms.dcim.delete_cable %} + + Delete this cable + + {% endif %} +
      +

      {% block title %}Cable {{ cable }}{% endblock %}

      +{% endblock %} + +{% block content %} +
      +
      +
      +
      + Cable +
      + + + + + + + + + + + + + + + + + +
      Type{{ cable.get_type_display }}
      Status{{ cable.get_status_display }}
      Label{% if cable.label %}{{ cable.label }}{% else %}N/A{% endif %}
      Color + +
      +
      +
      +
      +
      +
      + Termination A +
      + {% include 'dcim/inc/cable_termination.html' with termination=cable.termination_a %} +
      +
      +
      + Termination B +
      + {% include 'dcim/inc/cable_termination.html' with termination=cable.termination_b %} +
      +
      +
      +{% endblock %} diff --git a/netbox/templates/dcim/inc/cable_termination.html b/netbox/templates/dcim/inc/cable_termination.html new file mode 100644 index 000000000..8089c6636 --- /dev/null +++ b/netbox/templates/dcim/inc/cable_termination.html @@ -0,0 +1,12 @@ + + + + + + + + + +
      Device + {{ termination.device }} +
      Component{{ termination_a }}
      From 6bea8cc5468a7e4244b9ba3fb65e633fdff08c0f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 26 Oct 2018 10:28:25 -0400 Subject: [PATCH 028/191] Added length and length_unit fields to Cable --- netbox/dcim/constants.py | 11 +++++++ netbox/dcim/filters.py | 11 ++++++- netbox/dcim/forms.py | 2 +- netbox/dcim/migrations/0066_cables.py | 3 ++ netbox/dcim/models.py | 30 +++++++++++++++++-- netbox/dcim/tables.py | 14 ++++++++- netbox/templates/dcim/cable.html | 12 +++++++- .../templates/dcim/inc/cable_termination.html | 2 +- netbox/utilities/utils.py | 20 +++++++++++++ 9 files changed, 97 insertions(+), 8 deletions(-) diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index fed089486..b5ceb5e3d 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -317,3 +317,14 @@ COMPATIBLE_TERMINATION_TYPES = { 'frontport': ['consoleport', 'consoleserverport', 'interface', 'frontport', 'rearport'], 'rearport': ['consoleport', 'consoleserverport', 'interface', 'frontport', 'rearport'], } + +LENGTH_UNIT_METER = 'm' +LENGTH_UNIT_CENTIMETER = 'cm' +LENGTH_UNIT_FOOT = 'ft' +LENGTH_UNIT_INCH = 'in' +LENGTH_UNIT_CHOICES = ( + (LENGTH_UNIT_METER, 'Meters'), + (LENGTH_UNIT_CENTIMETER, 'Centimeters'), + (LENGTH_UNIT_FOOT, 'Feet'), + (LENGTH_UNIT_INCH, 'Inches'), +) \ No newline at end of file diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 71f136d15..f0ce0cfea 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -786,10 +786,19 @@ class VirtualChassisFilter(django_filters.FilterSet): class CableFilter(django_filters.FilterSet): + q = django_filters.CharFilter( + method='search', + label='Search', + ) class Meta: model = Cable - fields = ['type', 'status', 'color'] + fields = ['type', 'status', 'color', 'length', 'length_unit'] + + def search(self, queryset, name, value): + if not value.strip(): + return queryset + return queryset.filter(label__icontains=value) class ConsoleConnectionFilter(django_filters.FilterSet): diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 883d72498..a09ee7161 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -2211,7 +2211,7 @@ class CableForm(BootstrapMixin, forms.ModelForm): class Meta: model = Cable - fields = ('type', 'status', 'label', 'color') + fields = ('type', 'status', 'label', 'color', 'length', 'length_unit') class CableFilterForm(BootstrapMixin, forms.Form): diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py index 773dc4d3a..e095c3dda 100644 --- a/netbox/dcim/migrations/0066_cables.py +++ b/netbox/dcim/migrations/0066_cables.py @@ -123,6 +123,9 @@ class Migration(migrations.Migration): ('status', models.BooleanField(default=True)), ('label', models.CharField(blank=True, max_length=100)), ('color', utilities.fields.ColorField(blank=True, max_length=6)), + ('length', models.PositiveSmallIntegerField(blank=True, null=True)), + ('length_unit', models.CharField(blank=True, max_length=2)), + ('_abs_length', models.DecimalField(blank=True, decimal_places=4, max_digits=10, null=True)), ('termination_a_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), ('termination_b_type', models.ForeignKey(limit_choices_to={'model__in': ['consoleport', 'consoleserverport', 'interface', 'poweroutlet', 'powerport', 'frontport', 'rearport']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType')), ], diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 881a3b2d7..e3032a295 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -20,7 +20,7 @@ from extras.models import ConfigContextModel, CustomFieldModel, ObjectChange from utilities.fields import ColorField, NullableCharField from utilities.managers import NaturalOrderByManager from utilities.models import ChangeLoggedModel -from utilities.utils import serialize_object +from utilities.utils import serialize_object, to_meters from .constants import * from .fields import ASNField, MACAddressField from .querysets import CableQuerySet, InterfaceQuerySet @@ -2366,6 +2366,22 @@ class Cable(ChangeLoggedModel): color = ColorField( blank=True ) + length = models.PositiveSmallIntegerField( + blank=True, + null=True + ) + length_unit = models.CharField( + choices=LENGTH_UNIT_CHOICES, + max_length=2, + blank=True + ) + # Stores the normalized length (in meters) for database ordering + _abs_length = models.DecimalField( + max_digits=10, + decimal_places=4, + blank=True, + null=True + ) objects = CableQuerySet.as_manager() @@ -2383,6 +2399,14 @@ class Cable(ChangeLoggedModel): def get_absolute_url(self): return reverse('dcim:cable', args=[self.pk]) + def save(self, *args, **kwargs): + + # Store the given length (if any) in meters for use in database ordering + if self.length and self.length_unit: + self._abs_length = to_meters(self.length, self.length_unit) + + super(Cable, self).save(*args, **kwargs) + def get_path_endpoints(self): """ Traverse both ends of a cable path and return its connected endpoints. Note that one or both endpoints may be @@ -2412,13 +2436,13 @@ class Cable(ChangeLoggedModel): return termination # Find the cable (if any) attached to the peer port - next_cable, far_end = peer_port.get_connection() + next_cable = peer_port.get_connected_cable() # If no cable exists, return None if next_cable is None: return None # Return the far side termination of the cable - return trace_cable(far_end, position) + return trace_cable(next_cable.far_end, position) return trace_cable(self.termination_a), trace_cable(self.termination_b) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 7a27ecc64..09c210f30 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -170,6 +170,10 @@ VIRTUALCHASSIS_ACTIONS = """ {% endif %} """ +CABLE_LENGTH = """ +{% if record.length %}{{ record.length }}{{ record.length_unit }}{% else %}—{% endif %} +""" + # # Regions @@ -626,6 +630,10 @@ class CableTable(BaseTable): args=[Accessor('pk')], verbose_name='PK' ) + label_ = tables.Column( + accessor=Accessor('label'), + verbose_name='Label' + ) device_a = tables.LinkColumn( viewname='dcim:device', accessor=Accessor('termination_a.device'), @@ -650,10 +658,14 @@ class CableTable(BaseTable): orderable=False, verbose_name='Component' ) + length = tables.TemplateColumn( + template_code=CABLE_LENGTH, + order_by='_abs_length' + ) class Meta(BaseTable.Meta): model = Cable - fields = ('pk', 'device_a', 'termination_a', 'device_b', 'termination_b', 'status', 'type', 'color') + fields = ('pk', 'label_', 'device_a', 'termination_a', 'device_b', 'termination_b', 'status', 'type', 'color') # diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html index 72bea3ebc..7f38b1ffe 100644 --- a/netbox/templates/dcim/cable.html +++ b/netbox/templates/dcim/cable.html @@ -48,7 +48,17 @@
      Color - + {{ cable.color }}A +
      Length + {% if cable.length %} + {{ cable.length }} {{ cable.get_length_unit_display }} + {% else %} + N/A + {% endif %}
      diff --git a/netbox/templates/dcim/inc/cable_termination.html b/netbox/templates/dcim/inc/cable_termination.html index 8089c6636..cc2ec60f5 100644 --- a/netbox/templates/dcim/inc/cable_termination.html +++ b/netbox/templates/dcim/inc/cable_termination.html @@ -7,6 +7,6 @@ Component - {{ termination_a }} + {{ termination }} diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py index be756275e..4aa1b5b3c 100644 --- a/netbox/utilities/utils.py +++ b/netbox/utilities/utils.py @@ -5,6 +5,8 @@ import six from django.core.serializers import serialize from django.http import HttpResponse +from dcim.constants import LENGTH_UNIT_CENTIMETER, LENGTH_UNIT_FOOT, LENGTH_UNIT_INCH, LENGTH_UNIT_METER + def csv_format(data): """ @@ -107,3 +109,21 @@ def serialize_object(obj, extra=None): data.update(extra) return data + + +def to_meters(length, unit): + """ + Convert the given length to meters. + """ + length = int(length) + if length < 0: + raise ValueError("Length must be a positive integer") + if unit == LENGTH_UNIT_METER: + return length + if unit == LENGTH_UNIT_CENTIMETER: + return length / 100 + if unit == LENGTH_UNIT_FOOT: + return length * 0.3048 + if unit == LENGTH_UNIT_INCH: + return length * 0.3048 * 12 + raise ValueError("Unknown unit {}. Must be 'm', 'cm', 'ft', or 'in'.".format(unit)) From 957de0cd98ff8ed5f6a8554821e36419b844f45f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 26 Oct 2018 11:29:03 -0400 Subject: [PATCH 029/191] Added cable connections to component lists --- netbox/dcim/views.py | 4 +- netbox/templates/dcim/device.html | 3 + .../templates/dcim/inc/cable_termination.html | 2 +- netbox/templates/dcim/inc/consoleport.html | 15 +++++ .../templates/dcim/inc/consoleserverport.html | 20 ++++++ netbox/templates/dcim/inc/frontport.html | 66 +++++++++++-------- netbox/templates/dcim/inc/interface.html | 12 ++++ netbox/templates/dcim/inc/poweroutlet.html | 17 +++++ netbox/templates/dcim/inc/powerport.html | 15 +++++ netbox/templates/dcim/inc/rearport.html | 64 ++++++++++-------- 10 files changed, 162 insertions(+), 56 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index e4454ee75..d3d455899 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -886,7 +886,7 @@ class DeviceView(View): ) # Console server ports - consoleserverports = ConsoleServerPort.objects.filter(device=device).select_related('connected_endpoint') + consoleserverports = ConsoleServerPort.objects.filter(device=device).select_related('connected_endpoint__device') # Power ports power_ports = natsorted( @@ -894,7 +894,7 @@ class DeviceView(View): ) # Power outlets - poweroutlets = PowerOutlet.objects.filter(device=device).select_related('connected_endpoint') + poweroutlets = PowerOutlet.objects.filter(device=device).select_related('connected_endpoint__device') # Interfaces interfaces = device.vc_interfaces.order_naturally( diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 261b7e1f2..bbcbfaab1 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -527,6 +527,7 @@ Description Mode Connection + Cable @@ -590,6 +591,7 @@ {% endif %} Name Connection + Cable @@ -648,6 +650,7 @@ {% endif %} Name Connection + Cable diff --git a/netbox/templates/dcim/inc/cable_termination.html b/netbox/templates/dcim/inc/cable_termination.html index cc2ec60f5..8ff74b855 100644 --- a/netbox/templates/dcim/inc/cable_termination.html +++ b/netbox/templates/dcim/inc/cable_termination.html @@ -2,7 +2,7 @@ Device - {{ termination.device }} + {{ termination.device }} diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html index e8c7c5b35..e948e1784 100644 --- a/netbox/templates/dcim/inc/consoleport.html +++ b/netbox/templates/dcim/inc/consoleport.html @@ -1,7 +1,11 @@ + + {# Name #} {{ cp }} + + {# Connection #} {% if cp.connected_endpoint %} {{ cp.connected_endpoint.device }} @@ -14,6 +18,17 @@ Not connected {% endif %} + + {# Cable #} + + {% with cable=cp.get_connected_cable %} + {% if cable %} + via {{ cable }} + {% endif %} + {% endwith %} + + + {# Actions #} {% if perms.dcim.change_consoleport %} {% if cp.connected_endpoint %} diff --git a/netbox/templates/dcim/inc/consoleserverport.html b/netbox/templates/dcim/inc/consoleserverport.html index 700e940dd..001590686 100644 --- a/netbox/templates/dcim/inc/consoleserverport.html +++ b/netbox/templates/dcim/inc/consoleserverport.html @@ -1,12 +1,18 @@ + + {# Checkbox #} {% if perms.dcim.change_consoleserverport or perms.dcim.delete_consoleserverport %} {% endif %} + + {# Name #} {{ csp }} + + {# Connection #} {% if csp.connected_endpoint %} {{ csp.connected_endpoint.device }} @@ -19,6 +25,20 @@ Not connected {% endif %} + + {# Cable #} + + {% with cable=csp.get_connected_cable %} + {% if cable %} + {{ cable }} + {% if cable.far_end != csp.connected_endpoint %} + to {{ cable.far_end.device }} {{ cable.far_end }} + {% endif %} + {% endif %} + {% endwith %} + + + {# Actions #} {% if perms.dcim.change_consoleserverport %} {% if csp.connected_endpoint %} diff --git a/netbox/templates/dcim/inc/frontport.html b/netbox/templates/dcim/inc/frontport.html index 38fd29b34..8086d57ee 100644 --- a/netbox/templates/dcim/inc/frontport.html +++ b/netbox/templates/dcim/inc/frontport.html @@ -1,34 +1,46 @@ - - {% if perms.dcim.change_frontport or perms.dcim.delete_frontport %} - - +{% with cable=frontport.get_connected_cable %} + + + {# Checkbox #} + {% if perms.dcim.change_frontport or perms.dcim.delete_frontport %} + + + + {% endif %} + + {# Name #} + + {{ frontport }} - {% endif %} - - {{ frontport }} - - {{ frontport.get_type_display }} - {{ frontport.rear_port }} - {{ frontport.rear_port_position }} - {% with cable=frontport.get_connected_cable %} + + {# Type #} + {{ frontport.get_type_display }} + + {# Rear port #} + {{ frontport.rear_port }} + {{ frontport.rear_port_position }} + + {# Cable #} {% if cable %} - {{ cable }} to {{ cable.far_end.device }} {{ cable.far_end }} + {{ cable }} to {{ cable.far_end.device }} {{ cable.far_end }} {% else %} Not connected {% endif %} - {% endwith %} - - {% if perms.dcim.change_frontport %} - - - - {% endif %} - {% if perms.dcim.delete_frontport %} - - - - {% endif %} - - + + {# Actions #} + + {% if perms.dcim.change_frontport %} + + + + {% endif %} + {% if perms.dcim.delete_frontport %} + + + + {% endif %} + + +{% endwith %} diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 72a56f367..0dfb44bd6 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -69,6 +69,18 @@ {% endif %} + {# Cable #} + + {% with cable=iface.get_connected_cable %} + {% if cable %} + {{ cable }} + {% if cable.far_end != csp.connected_endpoint %} + to {{ cable.far_end.device }} {{ cable.far_end }} + {% endif %} + {% endif %} + {% endwith %} + + {# Buttons #} {% if show_graphs %} diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index 5081c1f6e..104908fd5 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -1,12 +1,18 @@ + + {# Checkbox #} {% if perms.dcim.change_poweroutlet or perms.dcim.delete_poweroutlet %} {% endif %} + + {# Name #} {{ po }} + + {# Connection #} {% if po.connected_endpoint %} {{ po.connected_endpoint.device }} @@ -19,6 +25,17 @@ Not connected {% endif %} + + {# Cable #} + + {% with cable=po.get_connected_cable %} + {% if cable %} + {{ cable }} + {% endif %} + {% endwith %} + + + {# Actions #} {% if perms.dcim.change_poweroutlet %} {% if po.connected_endpoint %} diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index 0d46c4ba9..cb77ce7de 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -1,7 +1,11 @@ + + {# Name #} {{ pp }} + + {# Connection #} {% if pp.connected_endpoint %} {{ pp.connected_endpoint.device }} @@ -14,6 +18,17 @@ Not connected {% endif %} + + {# Cable #} + + {% with cable=pp.get_connected_cable %} + {% if cable %} + via {{ cable }} + {% endif %} + {% endwith %} + + + {# Actions #} {% if perms.dcim.change_powerport %} {% if pp.connected_endpoint %} diff --git a/netbox/templates/dcim/inc/rearport.html b/netbox/templates/dcim/inc/rearport.html index aa130b883..ab7359939 100644 --- a/netbox/templates/dcim/inc/rearport.html +++ b/netbox/templates/dcim/inc/rearport.html @@ -1,33 +1,45 @@ - - {% if perms.dcim.change_rearport or perms.dcim.delete_rearport %} - - +{% with cable=rearport.get_connected_cable %} + + + {# Checkbox #} + {% if perms.dcim.change_rearport or perms.dcim.delete_rearport %} + + + + {% endif %} + + {# Name #} + + {{ rearport }} - {% endif %} - - {{ rearport }} - - {{ rearport.get_type_display }} - {{ rearport.positions }} - {% with cable=rearport.get_connected_cable %} + + {# Type #} + {{ rearport.get_type_display }} + + {# Positions #} + {{ rearport.positions }} + + {# Cable #} {% if cable %} - {{ cable }} to {{ cable.far_end.device }} {{ cable.far_end }} + {{ cable }} to {{ cable.far_end.device }} {{ cable.far_end }} {% else %} Not connected {% endif %} - {% endwith %} - - {% if perms.dcim.change_rearport %} - - - - {% endif %} - {% if perms.dcim.delete_rearport %} - - - - {% endif %} - - + + {# Actions #} + + {% if perms.dcim.change_rearport %} + + + + {% endif %} + {% if perms.dcim.delete_rearport %} + + + + {% endif %} + + +{% endwith %} From 4ad788276298e69e0dc53f1e218884335a8d7316 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 26 Oct 2018 11:32:04 -0400 Subject: [PATCH 030/191] Clever icon thing --- netbox/templates/dcim/inc/frontport.html | 2 +- netbox/templates/dcim/inc/rearport.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/templates/dcim/inc/frontport.html b/netbox/templates/dcim/inc/frontport.html index 8086d57ee..5d2a7b5d5 100644 --- a/netbox/templates/dcim/inc/frontport.html +++ b/netbox/templates/dcim/inc/frontport.html @@ -10,7 +10,7 @@ {# Name #} - {{ frontport }} + {{ frontport }} {# Type #} diff --git a/netbox/templates/dcim/inc/rearport.html b/netbox/templates/dcim/inc/rearport.html index ab7359939..1c92f0991 100644 --- a/netbox/templates/dcim/inc/rearport.html +++ b/netbox/templates/dcim/inc/rearport.html @@ -10,7 +10,7 @@ {# Name #} - {{ rearport }} + {{ rearport }} {# Type #} From 3518d023dcddc743c91d3494e82dfdb7c1616fb5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 26 Oct 2018 12:25:11 -0400 Subject: [PATCH 031/191] Implemented Cable API endpoint --- netbox/dcim/api/serializers.py | 53 ++++++++++++++++++++++++++++++---- netbox/dcim/api/urls.py | 3 ++ netbox/dcim/api/views.py | 12 +++++++- netbox/utilities/api.py | 2 ++ 4 files changed, 64 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 452ebb15d..c01fd330b 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -5,7 +5,7 @@ from taggit_serializer.serializers import TaggitSerializer, TagListSerializerFie from circuits.models import Circuit, CircuitTermination from dcim.constants import * from dcim.models import ( - ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, + Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceType, DeviceRole, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, @@ -15,8 +15,8 @@ from ipam.models import IPAddress, VLAN from tenancy.api.serializers import NestedTenantSerializer from users.api.serializers import NestedUserSerializer from utilities.api import ( - ChoiceField, SerializedPKRelatedField, TimeZoneField, ValidatedModelSerializer, - WritableNestedSerializer, + ChoiceField, ContentTypeField, SerializedPKRelatedField, TimeZoneField, ValidatedModelSerializer, + WritableNestedSerializer, get_serializer_for_model, ) from virtualization.models import Cluster @@ -717,11 +717,12 @@ class RearPortSerializer(ValidatedModelSerializer): class NestedRearPortSerializer(WritableNestedSerializer): + device = NestedDeviceSerializer(read_only=True) url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail') class Meta: model = RearPort - fields = ['id', 'url', 'name'] + fields = ['id', 'url', 'device', 'name'] # @@ -740,11 +741,12 @@ class FrontPortSerializer(ValidatedModelSerializer): class NestedFrontPortSerializer(WritableNestedSerializer): + device = NestedDeviceSerializer(read_only=True) url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontport-detail') class Meta: model = FrontPort - fields = ['id', 'url', 'name'] + fields = ['id', 'url', 'device', 'name'] # @@ -807,6 +809,47 @@ class InterfaceConnectionSerializer(ValidatedModelSerializer): return NestedInterfaceSerializer(instance=obj, context=context).data +# +# Cables +# + +class CableSerializer(ValidatedModelSerializer): + termination_a_type = ContentTypeField() + termination_b_type = ContentTypeField() + termination_a = serializers.SerializerMethodField(read_only=True) + termination_b = serializers.SerializerMethodField(read_only=True) + status = ChoiceField(choices=CONNECTION_STATUS_CHOICES) + length_unit = ChoiceField(choices=LENGTH_UNIT_CHOICES) + + class Meta: + model = Cable + fields = [ + 'id', 'termination_a_type', 'termination_a_id', 'termination_a', 'termination_b_type', 'termination_b_id', + 'termination_b', 'type', 'status', 'label', 'color', 'length', 'length_unit', + ] + + def _get_termination(self, obj, side): + """ + Serialize a nested representation of a termination. + """ + if side.lower() not in ['a', 'b']: + raise ValueError("Termination side must be either A or B.") + termination = getattr(obj, 'termination_{}'.format(side.lower())) + if termination is None: + return None + serializer = get_serializer_for_model(termination, prefix='Nested') + context = {'request': self.context['request']} + data = serializer(termination, context=context).data + + return data + + def get_termination_a(self, obj): + return self._get_termination(obj, 'a') + + def get_termination_b(self, obj): + return self._get_termination(obj, 'b') + + # # Virtual chassis # diff --git a/netbox/dcim/api/urls.py b/netbox/dcim/api/urls.py index 9a6f00c18..67f648733 100644 --- a/netbox/dcim/api/urls.py +++ b/netbox/dcim/api/urls.py @@ -62,6 +62,9 @@ router.register(r'console-connections', views.ConsoleConnectionViewSet, base_nam router.register(r'power-connections', views.PowerConnectionViewSet, base_name='powerconnections') router.register(r'interface-connections', views.InterfaceConnectionViewSet, base_name='interfaceconnections') +# Cables +router.register(r'cables', views.CableViewSet) + # Virtual chassis router.register(r'virtual-chassis', views.VirtualChassisViewSet) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 9586bbcf6..aa9c3e226 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -14,7 +14,7 @@ from rest_framework.viewsets import GenericViewSet, ViewSet from dcim import filters from dcim.models import ( - ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, + Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, @@ -428,6 +428,16 @@ class InterfaceConnectionViewSet(ModelViewSet): filter_class = filters.InterfaceConnectionFilter +# +# Cables +# + +class CableViewSet(ModelViewSet): + queryset = Cable.objects.prefetch_related('termination_a__device', 'termination_b__device') + serializer_class = serializers.CableSerializer + filter_class = filters.CableFilter + + # # Virtual chassis # diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py index 5b6dcb24e..a474725e5 100644 --- a/netbox/utilities/api.py +++ b/netbox/utilities/api.py @@ -69,6 +69,8 @@ class ChoiceField(Field): super(ChoiceField, self).__init__(**kwargs) def to_representation(self, obj): + if obj is '': + return None return {'value': obj, 'label': self._choices[obj]} def to_internal_value(self, data): From 83dec3b587f8824e14c9544cecc12040f1e28afd Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 26 Oct 2018 13:14:12 -0400 Subject: [PATCH 032/191] Fixed color display --- netbox/dcim/tables.py | 3 ++- netbox/project-static/css/base.css | 4 ++++ netbox/templates/dcim/cable.html | 2 +- netbox/utilities/tables.py | 10 ++++++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 09c210f30..412b1224c 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -2,7 +2,7 @@ import django_tables2 as tables from django_tables2.utils import Accessor from tenancy.tables import COL_TENANT -from utilities.tables import BaseTable, BooleanColumn, ToggleColumn +from utilities.tables import BaseTable, BooleanColumn, ColorColumn, ToggleColumn from .models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, @@ -662,6 +662,7 @@ class CableTable(BaseTable): template_code=CABLE_LENGTH, order_by='_abs_length' ) + color = ColorColumn() class Meta(BaseTable.Meta): model = Cable diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css index 6222a477d..67b820413 100644 --- a/netbox/project-static/css/base.css +++ b/netbox/project-static/css/base.css @@ -416,6 +416,10 @@ table.report th a { } /* Misc */ +.color-block { + display: block; + width: 80px; +} .text-nowrap { white-space: nowrap; } diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html index 7f38b1ffe..95b27c8a3 100644 --- a/netbox/templates/dcim/cable.html +++ b/netbox/templates/dcim/cable.html @@ -48,7 +48,7 @@ Color - {{ cable.color }}A +   diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py index cc67bbeb4..9689a20ea 100644 --- a/netbox/utilities/tables.py +++ b/netbox/utilities/tables.py @@ -46,3 +46,13 @@ class BooleanColumn(tables.Column): else: rendered = '—' return mark_safe(rendered) + + +class ColorColumn(tables.Column): + """ + Display a color (#RRGGBB). + """ + def render(self, value): + return mark_safe( + ' '.format(value) + ) From 94946c5854511293755714a20bd987f8b67cbd8d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 26 Oct 2018 13:21:43 -0400 Subject: [PATCH 033/191] Swapped the order of cable and connection fields --- netbox/dcim/models.py | 4 +--- netbox/templates/dcim/device.html | 6 ++--- netbox/templates/dcim/inc/consoleport.html | 18 +++++++------- .../templates/dcim/inc/consoleserverport.html | 24 +++++++++---------- netbox/templates/dcim/inc/frontport.html | 2 +- netbox/templates/dcim/inc/interface.html | 24 +++++++++---------- netbox/templates/dcim/inc/poweroutlet.html | 18 +++++++------- netbox/templates/dcim/inc/powerport.html | 18 +++++++------- netbox/templates/dcim/inc/rearport.html | 2 +- 9 files changed, 57 insertions(+), 59 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index e3032a295..0f0bb7a1b 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2392,9 +2392,7 @@ class Cable(ChangeLoggedModel): ) def __str__(self): - if self.label: - return '{} (#{})'.format(self.label, self.pk) - return '#{}'.format(self.pk) + return self.label if self.label else '#{}'.format(self.pk) def get_absolute_url(self): return reverse('dcim:cable', args=[self.pk]) diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index bbcbfaab1..e2ae02bff 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -526,8 +526,8 @@ LAG Description Mode - Connection Cable + Connection @@ -590,8 +590,8 @@ {% endif %} Name - Connection Cable + Connection @@ -649,8 +649,8 @@ {% endif %} Name - Connection Cable + Connection diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html index e948e1784..6e115ad0d 100644 --- a/netbox/templates/dcim/inc/consoleport.html +++ b/netbox/templates/dcim/inc/consoleport.html @@ -5,6 +5,15 @@ {{ cp }} + {# Cable #} + + {% with cable=cp.get_connected_cable %} + {% if cable %} + via {{ cable }} + {% endif %} + {% endwith %} + + {# Connection #} {% if cp.connected_endpoint %} @@ -19,15 +28,6 @@ {% endif %} - {# Cable #} - - {% with cable=cp.get_connected_cable %} - {% if cable %} - via {{ cable }} - {% endif %} - {% endwith %} - - {# Actions #} {% if perms.dcim.change_consoleport %} diff --git a/netbox/templates/dcim/inc/consoleserverport.html b/netbox/templates/dcim/inc/consoleserverport.html index 001590686..ab06d0b84 100644 --- a/netbox/templates/dcim/inc/consoleserverport.html +++ b/netbox/templates/dcim/inc/consoleserverport.html @@ -12,6 +12,18 @@ {{ csp }} + {# Cable #} + + {% with cable=csp.get_connected_cable %} + {% if cable %} + {{ cable }} + {% if cable.far_end != csp.connected_endpoint %} + to {{ cable.far_end.device }} {{ cable.far_end }} + {% endif %} + {% endif %} + {% endwith %} + + {# Connection #} {% if csp.connected_endpoint %} @@ -26,18 +38,6 @@ {% endif %} - {# Cable #} - - {% with cable=csp.get_connected_cable %} - {% if cable %} - {{ cable }} - {% if cable.far_end != csp.connected_endpoint %} - to {{ cable.far_end.device }} {{ cable.far_end }} - {% endif %} - {% endif %} - {% endwith %} - - {# Actions #} {% if perms.dcim.change_consoleserverport %} diff --git a/netbox/templates/dcim/inc/frontport.html b/netbox/templates/dcim/inc/frontport.html index 5d2a7b5d5..9297585ee 100644 --- a/netbox/templates/dcim/inc/frontport.html +++ b/netbox/templates/dcim/inc/frontport.html @@ -23,7 +23,7 @@ {# Cable #} {% if cable %} - {{ cable }} to {{ cable.far_end.device }} {{ cable.far_end }} + {{ cable }} to {{ cable.far_end.device }} {{ cable.far_end }} {% else %} Not connected {% endif %} diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 0dfb44bd6..30eced3e0 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -28,6 +28,18 @@ {# 802.1Q mode #} {{ iface.get_mode_display }} + {# Cable #} + + {% with cable=iface.get_connected_cable %} + {% if cable %} + {{ cable }} + {% if cable.far_end != csp.connected_endpoint %} + to {{ cable.far_end.device }} {{ cable.far_end }} + {% endif %} + {% endif %} + {% endwith %} + + {# Connection or type #} {% if iface.is_lag %} @@ -69,18 +81,6 @@ {% endif %} - {# Cable #} - - {% with cable=iface.get_connected_cable %} - {% if cable %} - {{ cable }} - {% if cable.far_end != csp.connected_endpoint %} - to {{ cable.far_end.device }} {{ cable.far_end }} - {% endif %} - {% endif %} - {% endwith %} - - {# Buttons #} {% if show_graphs %} diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index 104908fd5..3cc9ca242 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -12,6 +12,15 @@ {{ po }} + {# Cable #} + + {% with cable=po.get_connected_cable %} + {% if cable %} + {{ cable }} + {% endif %} + {% endwith %} + + {# Connection #} {% if po.connected_endpoint %} @@ -26,15 +35,6 @@ {% endif %} - {# Cable #} - - {% with cable=po.get_connected_cable %} - {% if cable %} - {{ cable }} - {% endif %} - {% endwith %} - - {# Actions #} {% if perms.dcim.change_poweroutlet %} diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index cb77ce7de..44a10b2fd 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -5,6 +5,15 @@ {{ pp }} + {# Cable #} + + {% with cable=pp.get_connected_cable %} + {% if cable %} + via {{ cable }} + {% endif %} + {% endwith %} + + {# Connection #} {% if pp.connected_endpoint %} @@ -19,15 +28,6 @@ {% endif %} - {# Cable #} - - {% with cable=pp.get_connected_cable %} - {% if cable %} - via {{ cable }} - {% endif %} - {% endwith %} - - {# Actions #} {% if perms.dcim.change_powerport %} diff --git a/netbox/templates/dcim/inc/rearport.html b/netbox/templates/dcim/inc/rearport.html index 1c92f0991..9a8128de4 100644 --- a/netbox/templates/dcim/inc/rearport.html +++ b/netbox/templates/dcim/inc/rearport.html @@ -22,7 +22,7 @@ {# Cable #} {% if cable %} - {{ cable }} to {{ cable.far_end.device }} {{ cable.far_end }} + {{ cable }} to {{ cable.far_end.device }} {{ cable.far_end }} {% else %} Not connected {% endif %} From 0c7510c1a8759b06aec69fe0206339c027352982 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 26 Oct 2018 13:27:54 -0400 Subject: [PATCH 034/191] PEP8 cleanup --- netbox/dcim/constants.py | 2 +- netbox/dcim/models.py | 2 +- netbox/dcim/querysets.py | 6 +++--- netbox/dcim/views.py | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index b5ceb5e3d..f10900812 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -327,4 +327,4 @@ LENGTH_UNIT_CHOICES = ( (LENGTH_UNIT_CENTIMETER, 'Centimeters'), (LENGTH_UNIT_FOOT, 'Feet'), (LENGTH_UNIT_INCH, 'Inches'), -) \ No newline at end of file +) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 0f0bb7a1b..bc2dbc88b 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2427,7 +2427,7 @@ class Cable(ChangeLoggedModel): rear_port=termination, rear_port_position=position, ) - position=1 + position = 1 # Termination is not a pass-through port, so we've reached the end of the path else: diff --git a/netbox/dcim/querysets.py b/netbox/dcim/querysets.py index 375699bd7..9e1248e00 100644 --- a/netbox/dcim/querysets.py +++ b/netbox/dcim/querysets.py @@ -79,6 +79,6 @@ class CableQuerySet(QuerySet): """ content_type = ContentType.objects.get_for_model(termination) return self.filter( - Q(termination_a_type=content_type, termination_a_id=termination.pk) | - Q(termination_b_type=content_type, termination_b_id=termination.pk) - ).first() + Q(termination_a_type=content_type, termination_a_id=termination.pk) | + Q(termination_b_type=content_type, termination_b_id=termination.pk) + ).first() diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index d3d455899..57971b5e3 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2063,7 +2063,6 @@ class CableDeleteView(PermissionRequiredMixin, ObjectDeleteView): default_return_url = 'dcim:cable_list' - # # Connections # From 33cdecbc52c76f7005d858a9b716ea609050a9a7 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 26 Oct 2018 14:06:27 -0400 Subject: [PATCH 035/191] Remove errant print() statement --- netbox/utilities/views.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index dcc0905f9..0e36f3220 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -212,13 +212,6 @@ class ObjectEditView(GetReturnURLMixin, View): obj_created = not form.instance.pk obj = form.save() - print("Connecting {} {} to {} {}".format( - obj.termination_a.device, - obj.termination_a, - obj.termination_b.device, - obj.termination_b - )) - msg = '{} {}'.format( 'Created' if obj_created else 'Modified', self.model._meta.verbose_name From 8573c8b8cb3367a58709b3e1e2761c7a1499d6d3 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 26 Oct 2018 14:48:22 -0400 Subject: [PATCH 036/191] Remove is_console_server, is_pdu, and is_network_device from DeviceType --- netbox/dcim/api/serializers.py | 3 +- netbox/dcim/filters.py | 30 ++-- netbox/dcim/fixtures/dcim.json | 30 +--- netbox/dcim/forms.py | 29 +--- .../0067_device_type_remove_qualifiers.py | 25 +++ netbox/dcim/models.py | 70 +------- netbox/dcim/tables.py | 7 +- netbox/dcim/tests/test_api.py | 6 +- netbox/templates/dcim/device.html | 121 ++++++-------- netbox/templates/dcim/devicetype.html | 153 ++++++++---------- netbox/templates/dcim/devicetype_edit.html | 8 - 11 files changed, 174 insertions(+), 308 deletions(-) create mode 100644 netbox/dcim/migrations/0067_device_type_remove_qualifiers.py diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index c01fd330b..114b8283a 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -226,8 +226,7 @@ class DeviceTypeSerializer(TaggitSerializer, CustomFieldModelSerializer): model = DeviceType fields = [ 'id', 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'interface_ordering', - 'is_console_server', 'is_pdu', 'is_network_device', 'subdevice_role', 'comments', 'tags', - 'custom_fields', 'created', 'last_updated', 'instance_count', + 'subdevice_role', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'instance_count', ] diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index f0ce0cfea..20f9cba1c 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -1,6 +1,6 @@ import django_filters from django.contrib.auth.models import User -from django.db.models import Q +from django.db.models import Count, Q from netaddr import EUI from netaddr.core import AddrFormatError @@ -310,8 +310,7 @@ class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet): class Meta: model = DeviceType fields = [ - 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'is_console_server', 'is_pdu', - 'is_network_device', 'subdevice_role', + 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'subdevice_role', ] def search(self, queryset, name, value): @@ -506,18 +505,19 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): name='device_type__is_full_depth', label='Is full depth', ) - is_console_server = django_filters.BooleanFilter( - name='device_type__is_console_server', - label='Is a console server', - ) - is_pdu = django_filters.BooleanFilter( - name='device_type__is_pdu', - label='Is a PDU', - ) - is_network_device = django_filters.BooleanFilter( - name='device_type__is_network_device', - label='Is a network device', - ) + # TODO: Replace these filters + # is_console_server = django_filters.BooleanFilter( + # name='device_type__is_console_server', + # label='Is a console server', + # ) + # is_pdu = django_filters.BooleanFilter( + # name='device_type__is_pdu', + # label='Is a PDU', + # ) + # is_network_device = django_filters.BooleanFilter( + # name='device_type__is_network_device', + # label='Is a network device', + # ) mac_address = django_filters.CharFilter( method='_mac_address', label='MAC address', diff --git a/netbox/dcim/fixtures/dcim.json b/netbox/dcim/fixtures/dcim.json index 9ebe9d4c7..215fbb702 100644 --- a/netbox/dcim/fixtures/dcim.json +++ b/netbox/dcim/fixtures/dcim.json @@ -76,10 +76,7 @@ "model": "MX960", "slug": "mx960", "u_height": 16, - "is_full_depth": true, - "is_console_server": false, - "is_pdu": false, - "is_network_device": true + "is_full_depth": true } }, { @@ -92,10 +89,7 @@ "model": "EX9214", "slug": "ex9214", "u_height": 16, - "is_full_depth": true, - "is_console_server": false, - "is_pdu": false, - "is_network_device": true + "is_full_depth": true } }, { @@ -108,10 +102,7 @@ "model": "QFX5100-24Q", "slug": "qfx5100-24q", "u_height": 1, - "is_full_depth": true, - "is_console_server": false, - "is_pdu": false, - "is_network_device": true + "is_full_depth": true } }, { @@ -124,10 +115,7 @@ "model": "QFX5100-48S", "slug": "qfx5100-48s", "u_height": 1, - "is_full_depth": true, - "is_console_server": false, - "is_pdu": false, - "is_network_device": true + "is_full_depth": true } }, { @@ -140,10 +128,7 @@ "model": "CM4148", "slug": "cm4148", "u_height": 1, - "is_full_depth": true, - "is_console_server": true, - "is_pdu": false, - "is_network_device": false + "is_full_depth": true } }, { @@ -156,10 +141,7 @@ "model": "CWG-24VYM415C9", "slug": "cwg-24vym415c9", "u_height": 0, - "is_full_depth": false, - "is_console_server": false, - "is_pdu": true, - "is_network_device": false + "is_full_depth": false } }, { diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index a09ee7161..8db4ceb4f 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -531,8 +531,8 @@ class DeviceTypeForm(BootstrapMixin, CustomFieldForm): class Meta: model = DeviceType fields = [ - 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'is_console_server', 'is_pdu', - 'is_network_device', 'subdevice_role', 'interface_ordering', 'comments', 'tags', + 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'subdevice_role', + 'interface_ordering', 'comments', 'tags', ] labels = { 'interface_ordering': 'Order interfaces by', @@ -575,13 +575,6 @@ class DeviceTypeBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkE u_height = forms.IntegerField(min_value=1, required=False) is_full_depth = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect, label='Is full depth') interface_ordering = forms.ChoiceField(choices=add_blank_choice(IFACE_ORDERING_CHOICES), required=False) - is_console_server = forms.NullBooleanField( - required=False, widget=BulkEditNullBooleanSelect, label='Is a console server' - ) - is_pdu = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect, label='Is a PDU') - is_network_device = forms.NullBooleanField( - required=False, widget=BulkEditNullBooleanSelect, label='Is a network device' - ) class Meta: nullable_fields = [] @@ -594,14 +587,6 @@ class DeviceTypeFilterForm(BootstrapMixin, CustomFieldFilterForm): queryset=Manufacturer.objects.annotate(filter_count=Count('device_types')), to_field_name='slug' ) - is_console_server = forms.BooleanField( - required=False, label='Is a console server', widget=forms.CheckboxInput(attrs={'value': 'True'})) - is_pdu = forms.BooleanField( - required=False, label='Is a PDU', widget=forms.CheckboxInput(attrs={'value': 'True'}) - ) - is_network_device = forms.BooleanField( - required=False, label='Is a network device', widget=forms.CheckboxInput(attrs={'value': 'True'}) - ) subdevice_role = forms.NullBooleanField( required=False, label='Subdevice role', widget=forms.Select(choices=( ('', '---------'), @@ -1288,7 +1273,7 @@ class ConsolePortCreateForm(ComponentForm): class ConsoleConnectionCSVForm(forms.ModelForm): console_server = FlexibleModelChoiceField( - queryset=Device.objects.filter(device_type__is_console_server=True), + queryset=Device.objects.all(), to_field_name='name', help_text='Console server name or ID', error_messages={ @@ -1387,7 +1372,7 @@ class ConsolePortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelF ) ) console_server = ChainedModelChoiceField( - queryset=Device.objects.filter(device_type__is_console_server=True), + queryset=Device.objects.all(), chains=( ('site', 'site'), ('rack', 'rack'), @@ -1395,7 +1380,7 @@ class ConsolePortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelF label='Console Server', required=False, widget=APISelect( - api_url='/api/dcim/devices/?site_id={{site}}&rack_id={{rack}}&is_console_server=True', + api_url='/api/dcim/devices/?site_id={{site}}&rack_id={{rack}}', display_field='display_name', attrs={'filter-for': 'connected_endpoint'} ) @@ -1557,7 +1542,7 @@ class PowerPortCreateForm(ComponentForm): class PowerConnectionCSVForm(forms.ModelForm): pdu = FlexibleModelChoiceField( - queryset=Device.objects.filter(device_type__is_pdu=True), + queryset=Device.objects.all(), to_field_name='name', help_text='PDU name or ID', error_messages={ @@ -1664,7 +1649,7 @@ class PowerPortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelFor label='PDU', required=False, widget=APISelect( - api_url='/api/dcim/devices/?site_id={{site}}&rack_id={{rack}}&is_pdu=True', + api_url='/api/dcim/devices/?site_id={{site}}&rack_id={{rack}}', display_field='display_name', attrs={'filter-for': 'connected_endpoint'} ) diff --git a/netbox/dcim/migrations/0067_device_type_remove_qualifiers.py b/netbox/dcim/migrations/0067_device_type_remove_qualifiers.py new file mode 100644 index 000000000..883f863fc --- /dev/null +++ b/netbox/dcim/migrations/0067_device_type_remove_qualifiers.py @@ -0,0 +1,25 @@ +# Generated by Django 2.0.8 on 2018-10-26 17:49 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0066_cables'), + ] + + operations = [ + migrations.RemoveField( + model_name='devicetype', + name='is_console_server', + ), + migrations.RemoveField( + model_name='devicetype', + name='is_network_device', + ), + migrations.RemoveField( + model_name='devicetype', + name='is_pdu', + ), + ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index bc2dbc88b..bb5c13fd8 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -770,21 +770,6 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): choices=IFACE_ORDERING_CHOICES, default=IFACE_ORDERING_POSITION ) - is_console_server = models.BooleanField( - default=False, - verbose_name='Is a console server', - help_text='This type of device has console server ports' - ) - is_pdu = models.BooleanField( - default=False, - verbose_name='Is a PDU', - help_text='This type of device has power outlets' - ) - is_network_device = models.BooleanField( - default=True, - verbose_name='Is a network device', - help_text='This type of device has network interfaces' - ) subdevice_role = models.NullBooleanField( default=None, verbose_name='Parent/child status', @@ -804,8 +789,8 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): tags = TaggableManager() csv_headers = [ - 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'is_console_server', 'is_pdu', - 'is_network_device', 'subdevice_role', 'interface_ordering', 'comments', + 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'subdevice_role', + 'interface_ordering', 'comments', ] class Meta: @@ -835,9 +820,6 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): self.part_number, self.u_height, self.is_full_depth, - self.is_console_server, - self.is_pdu, - self.is_network_device, self.get_subdevice_role_display() if self.subdevice_role else None, self.get_interface_ordering_display(), self.comments, @@ -859,24 +841,6 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): "{}U".format(d, d.rack, self.u_height) }) - if not self.is_console_server and self.cs_port_templates.count(): - raise ValidationError({ - 'is_console_server': "Must delete all console server port templates associated with this device before " - "declassifying it as a console server." - }) - - if not self.is_pdu and self.power_outlet_templates.count(): - raise ValidationError({ - 'is_pdu': "Must delete all power outlet templates associated with this device before declassifying it " - "as a PDU." - }) - - if not self.is_network_device and self.interface_templates.filter(mgmt_only=False).count(): - raise ValidationError({ - 'is_network_device': "Must delete all non-management-only interface templates associated with this " - "device before declassifying it as a network device." - }) - if self.subdevice_role != SUBDEVICE_ROLE_PARENT and self.device_bay_templates.count(): raise ValidationError({ 'subdevice_role': "Must delete all device bay templates associated with this device before " @@ -1705,17 +1669,6 @@ class ConsoleServerPort(CableTermination, ComponentModel): def get_absolute_url(self): return self.device.get_absolute_url() - def clean(self): - - # Check that the parent device's DeviceType is a console server - if self.device is None: - raise ValidationError("Console server ports must be assigned to devices.") - device_type = self.device.device_type - if not device_type.is_console_server: - raise ValidationError("The {} {} device type does not support assignment of console server ports.".format( - device_type.manufacturer, device_type - )) - # # Power ports @@ -1808,17 +1761,6 @@ class PowerOutlet(CableTermination, ComponentModel): def get_absolute_url(self): return self.device.get_absolute_url() - def clean(self): - - # Check that the parent device's DeviceType is a PDU - if self.device is None: - raise ValidationError("Power outlets must be assigned to devices.") - device_type = self.device.device_type - if not device_type.is_pdu: - raise ValidationError("The {} {} device type does not support assignment of power outlets.".format( - device_type.manufacturer, device_type - )) - # # Interfaces @@ -1927,14 +1869,6 @@ class Interface(CableTermination, ComponentModel): def clean(self): - # Check that the parent device's DeviceType is a network device - if self.device is not None: - device_type = self.device.device_type - if not device_type.is_network_device: - raise ValidationError("The {} {} device type does not support assignment of network interfaces.".format( - device_type.manufacturer, device_type - )) - # An Interface must belong to a Device *or* to a VirtualMachine if self.device and self.virtual_machine: raise ValidationError("An interface cannot belong to both a device and a virtual machine.") diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 412b1224c..39085cc45 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -349,9 +349,6 @@ class DeviceTypeTable(BaseTable): verbose_name='Device Type' ) is_full_depth = BooleanColumn(verbose_name='Full Depth') - is_console_server = BooleanColumn(verbose_name='CS') - is_pdu = BooleanColumn(verbose_name='PDU') - is_network_device = BooleanColumn(verbose_name='Net') subdevice_role = tables.TemplateColumn( template_code=SUBDEVICE_ROLE_TEMPLATE, verbose_name='Subdevice Role' @@ -364,8 +361,8 @@ class DeviceTypeTable(BaseTable): class Meta(BaseTable.Meta): model = DeviceType fields = ( - 'pk', 'model', 'manufacturer', 'part_number', 'u_height', 'is_full_depth', 'is_console_server', 'is_pdu', - 'is_network_device', 'subdevice_role', 'instance_count', + 'pk', 'model', 'manufacturer', 'part_number', 'u_height', 'is_full_depth', 'subdevice_role', + 'instance_count', ) diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 774725725..389797a09 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -2035,7 +2035,7 @@ class ConsoleServerPortTest(APITestCase): site = Site.objects.create(name='Test Site 1', slug='test-site-1') manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1') devicetype = DeviceType.objects.create( - manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1', is_console_server=True + manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1' ) devicerole = DeviceRole.objects.create( name='Test Device Role 1', slug='test-device-role-1', color='ff0000' @@ -2261,7 +2261,7 @@ class PowerOutletTest(APITestCase): site = Site.objects.create(name='Test Site 1', slug='test-site-1') manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1') devicetype = DeviceType.objects.create( - manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1', is_pdu=True + manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1' ) devicerole = DeviceRole.objects.create( name='Test Device Role 1', slug='test-device-role-1', color='ff0000' @@ -2372,7 +2372,7 @@ class InterfaceTest(APITestCase): site = Site.objects.create(name='Test Site 1', slug='test-site-1') manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1') devicetype = DeviceType.objects.create( - manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1', is_network_device=True + manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1' ) devicerole = DeviceRole.objects.create( name='Test Device Role 1', slug='test-device-role-1', color='ff0000' diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index e2ae02bff..29f187825 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -35,6 +35,21 @@
      {% if perms.dcim.change_device %} +
      + + +
      Edit this device @@ -300,55 +315,35 @@
      -
      -
      - Console / Power -
      - - {% for cp in console_ports %} - {% include 'dcim/inc/consoleport.html' %} - {% empty %} - {% if device.device_type.console_port_templates.exists %} - - - - {% endif %} - {% endfor %} - {% for pp in power_ports %} - {% include 'dcim/inc/powerport.html' %} - {% empty %} - {% if device.device_type.power_port_templates.exists %} - - - - {% endif %} - {% endfor %} -
      - No console ports defined - {% if perms.dcim.add_consoleport %} - - {% endif %} -
      - No power ports defined - {% if perms.dcim.add_powerport %} - - {% endif %} -
      - {% if perms.dcim.add_interface or perms.dcim.add_consoleport or perms.dcim.add_powerport %} -
      - {% if perms.dcim.add_consoleport %} - - Add console port - - {% endif %} - {% if perms.dcim.add_powerport %} - - Add power port - - {% endif %} + {% if console_ports or power_ports %} +
      +
      + Console / Power
      - {% endif %} -
      + + {% for cp in console_ports %} + {% include 'dcim/inc/consoleport.html' %} + {% endfor %} + {% for pp in power_ports %} + {% include 'dcim/inc/powerport.html' %} + {% endfor %} +
      + {% if perms.dcim.add_interface or perms.dcim.add_consoleport or perms.dcim.add_powerport %} +
      + {% if perms.dcim.add_consoleport %} + + Add console port + + {% endif %} + {% if perms.dcim.add_powerport %} + + Add power port + + {% endif %} +
      + {% endif %} +
      + {% endif %} {% if request.user.is_authenticated %}
      @@ -501,7 +496,7 @@ {% endif %} {% endif %} - {% if interfaces or device.device_type.is_network_device %} + {% if interfaces %} {% if perms.dcim.change_interface or perms.dcim.delete_interface %}
      {% csrf_token %} @@ -534,10 +529,6 @@ {% for iface in interfaces %} {% include 'dcim/inc/interface.html' %} - {% empty %} - - — No interfaces defined — - {% endfor %} @@ -574,7 +565,7 @@
      {% endif %} {% endif %} - {% if consoleserverports or device.device_type.is_console_server %} + {% if consoleserverports %} {% if perms.dcim.delete_consoleserverport %}
      {% csrf_token %} @@ -598,10 +589,6 @@ {% for csp in consoleserverports %} {% include 'dcim/inc/consoleserverport.html' %} - {% empty %} - - — No console server ports defined — - {% endfor %} @@ -633,7 +620,7 @@
      {% endif %} {% endif %} - {% if poweroutlets or device.device_type.is_pdu %} + {% if poweroutlets %} {% if perms.dcim.delete_poweroutlet %}
      {% csrf_token %} @@ -657,10 +644,6 @@ {% for po in poweroutlets %} {% include 'dcim/inc/poweroutlet.html' %} - {% empty %} - - — No power outlets defined — - {% endfor %} @@ -716,10 +699,6 @@ {% for frontport in front_ports %} {% include 'dcim/inc/frontport.html' %} - {% empty %} - - — No front panel ports defined — - {% endfor %} @@ -737,7 +716,7 @@ {% if perms.dcim.add_frontport %}
      - Add front panel ports + Add front ports
      @@ -769,10 +748,6 @@ {% for rearport in rear_ports %} {% include 'dcim/inc/rearport.html' %} - {% empty %} - - — No rear panel ports defined — - {% endfor %} @@ -790,7 +765,7 @@ {% if perms.dcim.add_rearport %}
      - Add rear panel ports + Add rear ports
      diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index b02a97da1..873de28c7 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -15,12 +15,27 @@
      {% if perms.dcim.change_devicetype or perms.dcim.delete_devicetype %}
      - {% if perms.dcim.change_devicetype %} + {% if perms.dcim.change_devicetype %} +
      + +
        + {% if perms.dcim.add_consoleporttemplate %}
      • Console Ports
        • {% endif %} + {% if perms.dcim.add_consoleserverporttemplate %}
      • Console Server Ports
        • {% endif %} + {% if perms.dcim.add_powerporttemplate %}
      • Power Ports
        • {% endif %} + {% if perms.dcim.add_poweroutlettemplate %}
      • Power Outlets
        • {% endif %} + {% if perms.dcim.add_interfacetemplate %}
      • Interfaces
        • {% endif %} + {% if perms.dcim.add_frontporttemplate %}
      • Front Ports
        • {% endif %} + {% if perms.dcim.add_rearporttemplate %}
      • Rear Ports
        • {% endif %} + {% if perms.dcim.add_devicebaytemplate %}
      • Device Bays
        • {% endif %} +
      +
      - - Edit this device type + + Edit this device type - {% endif %} + {% endif %} {% if perms.dcim.delete_devicetype %} @@ -43,7 +58,7 @@ {% block content %}
      -
      +
      Chassis @@ -81,6 +96,18 @@ {% endif %} + + Parent/Child + + {% if devicetype.subdevice_role == True %} + + {% elif devicetype.subdevice_role == False %} + + {% else %} + N/A + {% endif %} + + Interface Ordering {{ devicetype.get_interface_ordering_display }} @@ -91,73 +118,8 @@
      -
      -
      - Function -
      - - - - - - - - - - - - - - - - - -
      - {% if devicetype.is_console_server %} - - {% else %} - - {% endif %} - - Console Server
      - This device {% if devicetype.is_console_server %}has{% else %}does not have{% endif %} console server ports -
      - {% if devicetype.is_pdu %} - - {% else %} - - {% endif %} - - PDU
      - This device {% if devicetype.is_pdu %}has{% else %}does not have{% endif %} power outlets -
      - {% if devicetype.is_network_device %} - - {% else %} - - {% endif %} - - Network Device
      - This device {% if devicetype.is_network_device %}has{% else %}does not have{% endif %} network interfaces -
      - {% if devicetype.subdevice_role == True %} - - {% elif devicetype.subdevice_role == False %} - - {% else %} - - {% endif %} - - Parent/Child
      - {% if devicetype.subdevice_role == True %} - This device has device bays for mounting child devices - {% elif devicetype.subdevice_role == False %} - This device can only be mounted in a parent device - {% else %} - This device does not have device bays - {% endif %} -
      -
      +
      +
      {% include 'inc/custom_fields_panel.html' with obj=devicetype %} {% include 'extras/inc/tags_panel.html' with tags=devicetype.tags.all url='dcim:devicetype_list' %}
      @@ -173,23 +135,38 @@
      -
      - {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' add_url='dcim:devicetype_add_consoleport' delete_url='dcim:devicetype_delete_consoleport' %} - {% include 'dcim/inc/devicetype_component_table.html' with table=powerport_table title='Power Ports' add_url='dcim:devicetype_add_powerport' delete_url='dcim:devicetype_delete_powerport' %} - {% if devicetype.is_parent_device or devicebay_table.rows %} - {% include 'dcim/inc/devicetype_component_table.html' with table=devicebay_table title='Device Bays' add_url='dcim:devicetype_add_devicebay' delete_url='dcim:devicetype_delete_devicebay' %} - {% endif %} - {% if devicetype.is_network_device or interface_table.rows %} - {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' add_url='dcim:devicetype_add_interface' edit_url='dcim:devicetype_bulkedit_interface' delete_url='dcim:devicetype_delete_interface' %} - {% endif %} - {% if devicetype.is_console_server or consoleserverport_table.rows %} - {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' add_url='dcim:devicetype_add_consoleserverport' delete_url='dcim:devicetype_delete_consoleserverport' %} - {% endif %} - {% if devicetype.is_pdu or poweroutlet_table.rows %} - {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' add_url='dcim:devicetype_add_poweroutlet' delete_url='dcim:devicetype_delete_poweroutlet' %} - {% endif %} -
      +{% if devicetype.console_port_templates.exists or devicetype.power_port_templates.exists %} +
      +
      + {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' add_url='dcim:devicetype_add_consoleport' delete_url='dcim:devicetype_delete_consoleport' %} +
      +
      + {% include 'dcim/inc/devicetype_component_table.html' with table=powerport_table title='Power Ports' add_url='dcim:devicetype_add_powerport' delete_url='dcim:devicetype_delete_powerport' %} +
      +
      +{% endif %} +{% if devicetype.is_parent_device or devicebay_table.rows %} +
      +
      + {% include 'dcim/inc/devicetype_component_table.html' with table=devicebay_table title='Device Bays' add_url='dcim:devicetype_add_devicebay' delete_url='dcim:devicetype_delete_devicebay' %} +
      +
      +{% endif %} +{% if devicetype.cs_port_templates.exists %} +
      +
      + {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' add_url='dcim:devicetype_add_consoleserverport' delete_url='dcim:devicetype_delete_consoleserverport' %} +
      +
      +{% endif %} +{% if devicetype.power_outlet_templates.exists %} +
      +
      + {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' add_url='dcim:devicetype_add_poweroutlet' delete_url='dcim:devicetype_delete_poweroutlet' %} +
      +
      +{% endif %} {% if devicetype.front_port_templates.exists or devicetype.rear_port_templates.exists %}
      diff --git a/netbox/templates/dcim/devicetype_edit.html b/netbox/templates/dcim/devicetype_edit.html index d0ed2c204..0d54e0698 100644 --- a/netbox/templates/dcim/devicetype_edit.html +++ b/netbox/templates/dcim/devicetype_edit.html @@ -12,14 +12,6 @@ {% render_field form.u_height %} {% render_field form.is_full_depth %} {% render_field form.interface_ordering %} -
      -
      -
      -
      Function
      -
      - {% render_field form.is_console_server %} - {% render_field form.is_pdu %} - {% render_field form.is_network_device %} {% render_field form.subdevice_role %}
      From 8f8df2b8e8494961405a0a53e79fc7635398d7eb Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 26 Oct 2018 15:45:19 -0400 Subject: [PATCH 037/191] Added cable types --- netbox/dcim/constants.py | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index f10900812..6f7d53239 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -289,12 +289,39 @@ CABLE_TERMINATION_TYPES = [ ] # Cable types -# TODO: Add more types -CABLE_TYPE_COPPER = 1000 -CABLE_TYPE_FIBER = 2000 +CABLE_TYPE_CAT3 = 1300 +CABLE_TYPE_CAT5 = 1500 +CABLE_TYPE_CAT5E = 1510 +CABLE_TYPE_CAT6 = 1600 +CABLE_TYPE_CAT6A = 1610 +CABLE_TYPE_CAT7 = 1700 +CABLE_TYPE_MMF_OM1 = 3010 +CABLE_TYPE_MMF_OM2 = 3020 +CABLE_TYPE_MMF_OM3 = 3030 +CABLE_TYPE_MMF_OM4 = 3040 +CABLE_TYPE_SMF = 3500 +CABLE_TYPE_POWER = 5000 CABLE_TYPE_CHOICES = ( - (CABLE_TYPE_COPPER, 'Copper'), - (CABLE_TYPE_FIBER, 'Fiber'), + ( + 'Copper', ( + (CABLE_TYPE_CAT3, 'CAT3'), + (CABLE_TYPE_CAT5, 'CAT5'), + (CABLE_TYPE_CAT5E, 'CAT5e'), + (CABLE_TYPE_CAT6, 'CAT6'), + (CABLE_TYPE_CAT6A, 'CAT6a'), + (CABLE_TYPE_CAT7, 'CAT7'), + ), + ), + ( + 'Fiber', ( + (CABLE_TYPE_MMF_OM1, 'Multimode Fiber (OM1)'), + (CABLE_TYPE_MMF_OM2, 'Multimode Fiber (OM2)'), + (CABLE_TYPE_MMF_OM3, 'Multimode Fiber (OM3)'), + (CABLE_TYPE_MMF_OM4, 'Multimode Fiber (OM4)'), + (CABLE_TYPE_SMF, 'Singlemode Fiber'), + ), + ), + (CABLE_TYPE_POWER, 'Power'), ) CABLE_TERMINATION_TYPE_CHOICES = { From dc67028bd9e6ab3a09d079042ce4da743ca69f1e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Oct 2018 09:12:41 -0400 Subject: [PATCH 038/191] Corrected cable display --- netbox/templates/dcim/inc/consoleport.html | 5 ++++- netbox/templates/dcim/inc/interface.html | 4 ++-- netbox/templates/dcim/inc/poweroutlet.html | 3 +++ netbox/templates/dcim/inc/powerport.html | 5 ++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html index 6e115ad0d..184d596dd 100644 --- a/netbox/templates/dcim/inc/consoleport.html +++ b/netbox/templates/dcim/inc/consoleport.html @@ -9,7 +9,10 @@ {% with cable=cp.get_connected_cable %} {% if cable %} - via       {{ cable }} + Cable {{ cable }} + {% if cable.far_end != cp.connected_endpoint %} + to {{ cable.far_end.device }} {{ cable.far_end }} + {% endif %} {% endif %} {% endwith %} diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 30eced3e0..bbb37f517 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -33,7 +33,7 @@ {% with cable=iface.get_connected_cable %} {% if cable %} {{ cable }} - {% if cable.far_end != csp.connected_endpoint %} + {% if cable.far_end != iface.connected_endpoint %} to {{ cable.far_end.device }} {{ cable.far_end }} {% endif %} {% endif %} @@ -150,7 +150,7 @@ {% endif %} {# IP addresses table #} - + diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index 3cc9ca242..4a949ccd2 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -17,6 +17,9 @@ {% with cable=po.get_connected_cable %} {% if cable %} {{ cable }} + {% if cable.far_end != po.connected_endpoint %} + to {{ cable.far_end.device }} {{ cable.far_end }} + {% endif %} {% endif %} {% endwith %} diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index 44a10b2fd..8bffef2ae 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -9,7 +9,10 @@ From e21b23cd98704bdf6b159cd761b41f9fff240291 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Oct 2018 12:24:16 -0400 Subject: [PATCH 039/191] Introduced 'cable' field on CableTermination to cache connected Cable --- netbox/dcim/migrations/0066_cables.py | 56 ++++++++++++++++++- netbox/dcim/models.py | 12 ++++ netbox/dcim/signals.py | 2 +- netbox/dcim/views.py | 28 ++++++---- netbox/templates/dcim/inc/consoleport.html | 13 ++--- .../templates/dcim/inc/consoleserverport.html | 13 ++--- netbox/templates/dcim/inc/interface.html | 15 ++--- netbox/templates/dcim/inc/poweroutlet.html | 13 ++--- netbox/templates/dcim/inc/powerport.html | 13 ++--- 9 files changed, 110 insertions(+), 55 deletions(-) diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py index e095c3dda..8a391c97a 100644 --- a/netbox/dcim/migrations/0066_cables.py +++ b/netbox/dcim/migrations/0066_cables.py @@ -20,6 +20,7 @@ def console_connections_to_cables(apps, schema_editor): print("\n Adding console connections... ", end='', flush=True) for consoleport in ConsolePort.objects.filter(connected_endpoint__isnull=False): c = Cable() + # We have to assign GFK fields manually because we're inside a migration. c.termination_a_type = consoleport_type c.termination_a_id = consoleport.id @@ -28,6 +29,10 @@ def console_connections_to_cables(apps, schema_editor): c.connection_status = consoleport.connection_status c.save() + # Cache the Cable on its two termination points (replicate Cable.save()) + ConsolePort.objects.filter(pk=consoleport.id).update(cable=c) + ConsoleServerPort.objects.filter(pk=consoleport.connected_endpoint_id).update(cable=c) + cable_count = Cable.objects.filter(termination_a_type=consoleport_type).count() print("{} cables created".format(cable_count)) @@ -49,6 +54,7 @@ def power_connections_to_cables(apps, schema_editor): print(" Adding power connections... ", end='', flush=True) for powerport in PowerPort.objects.filter(connected_endpoint__isnull=False): c = Cable() + # We have to assign GFK fields manually because we're inside a migration. c.termination_a_type = powerport_type c.termination_a_id = powerport.id @@ -57,6 +63,10 @@ def power_connections_to_cables(apps, schema_editor): c.connection_status = powerport.connection_status c.save() + # Cache the Cable on its two termination points (replicate Cable.save()) + PowerPort.objects.filter(pk=powerport.id).update(cable=c) + PowerOutlet.objects.filter(pk=powerport.connected_endpoint_id).update(cable=c) + cable_count = Cable.objects.filter(termination_a_type=powerport_type).count() print("{} cables created".format(cable_count)) @@ -77,11 +87,14 @@ def interface_connections_to_cables(apps, schema_editor): print(" Adding interface connections... ", end='', flush=True) for conn in InterfaceConnection.objects.all(): c = Cable() + # We have to assign GFK fields manually because we're inside a migration. c.termination_a_type = interface_type c.termination_a_id = conn.interface_a_id + c.termination_a = conn.interface_a c.termination_b_type = interface_type c.termination_b_id = conn.interface_b_id + c.termination_b = conn.interface_b c.connection_status = conn.connection_status c.save() @@ -89,11 +102,13 @@ def interface_connections_to_cables(apps, schema_editor): # since these are new fields on Interface Interface.objects.filter(pk=conn.interface_a_id).update( connected_endpoint=conn.interface_b_id, - connection_status=conn.connection_status + connection_status=conn.connection_status, + cable=c ) Interface.objects.filter(pk=conn.interface_b_id).update( connected_endpoint=conn.interface_a_id, - connection_status=conn.connection_status + connection_status=conn.connection_status, + cable=c ) cable_count = Cable.objects.filter(termination_a_type=interface_type).count() @@ -146,11 +161,21 @@ class Migration(migrations.Migration): name='connected_endpoint', field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='connected_endpoint', to='dcim.ConsoleServerPort'), ), + migrations.AddField( + model_name='consoleport', + name='cable', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + ), migrations.AlterField( model_name='consoleserverport', name='device', field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='consoleserverports', to='dcim.Device'), ), + migrations.AddField( + model_name='consoleserverport', + name='cable', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + ), # Alter power port models migrations.RenameField( @@ -163,11 +188,21 @@ class Migration(migrations.Migration): name='connected_endpoint', field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='connected_endpoint', to='dcim.PowerOutlet'), ), + migrations.AddField( + model_name='powerport', + name='cable', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + ), migrations.AlterField( model_name='poweroutlet', name='device', field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='poweroutlets', to='dcim.Device'), ), + migrations.AddField( + model_name='poweroutlet', + name='cable', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + ), # Alter the Interface model migrations.AddField( @@ -180,6 +215,23 @@ class Migration(migrations.Migration): name='connection_status', field=models.NullBooleanField(default=True), ), + migrations.AddField( + model_name='interface', + name='cable', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + ), + + # Alter front/rear port models + migrations.AddField( + model_name='frontport', + name='cable', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + ), + migrations.AddField( + model_name='rearport', + name='cable', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + ), # Copy console/power/interface connections as Cables migrations.RunPython(console_connections_to_cables), diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index bb5c13fd8..d1df21ca9 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -66,6 +66,12 @@ class ComponentModel(models.Model): class CableTermination(models.Model): + cable = models.ForeignKey( + to='dcim.Cable', + on_delete=models.SET_NULL, + blank=True, + null=True + ) class Meta: abstract = True @@ -2339,6 +2345,12 @@ class Cable(ChangeLoggedModel): super(Cable, self).save(*args, **kwargs) + # Cache the Cable on its two termination points + self.termination_a.cable = self + self.termination_a.save() + self.termination_b.cable = self + self.termination_b.save() + def get_path_endpoints(self): """ Traverse both ends of a cable path and return its connected endpoints. Note that one or both endpoints may be diff --git a/netbox/dcim/signals.py b/netbox/dcim/signals.py index e47865ac5..41ca61d09 100644 --- a/netbox/dcim/signals.py +++ b/netbox/dcim/signals.py @@ -32,7 +32,7 @@ def update_connected_endpoints(instance, **kwargs): termination_a.connection_status = True termination_a.save() termination_b.connected_endpoint = termination_a - termination_a.connection_status = True + termination_b.connection_status = True termination_b.save() diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 57971b5e3..42d12335d 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -876,47 +876,53 @@ class DeviceView(View): # VirtualChassis members if device.virtual_chassis is not None: - vc_members = Device.objects.filter(virtual_chassis=device.virtual_chassis).order_by('vc_position') + vc_members = Device.objects.filter( + virtual_chassis=device.virtual_chassis + ).order_by('vc_position') else: vc_members = [] # Console ports console_ports = natsorted( - ConsolePort.objects.filter(device=device).select_related('connected_endpoint__device'), key=attrgetter('name') + device.console_ports.select_related('connected_endpoint__device', 'cable'), + key=attrgetter('name') ) # Console server ports - consoleserverports = ConsoleServerPort.objects.filter(device=device).select_related('connected_endpoint__device') + consoleserverports = device.consoleserverports.select_related('connected_endpoint__device', 'cable') # Power ports power_ports = natsorted( - PowerPort.objects.filter(device=device).select_related('connected_endpoint__device'), key=attrgetter('name') + device.power_ports.select_related('connected_endpoint__device', 'cable'), + key=attrgetter('name') ) # Power outlets - poweroutlets = PowerOutlet.objects.filter(device=device).select_related('connected_endpoint__device') + poweroutlets = device.poweroutlets.select_related('connected_endpoint__device', 'cable') # Interfaces interfaces = device.vc_interfaces.order_naturally( device.device_type.interface_ordering ).select_related( - 'connected_endpoint__device', 'circuit_termination__circuit' - ).prefetch_related('ip_addresses') + 'lag', 'connected_endpoint__device', 'circuit_termination__circuit', 'cable' + ).prefetch_related( + 'cable__termination_a', 'cable__termination_b', 'ip_addresses' + ) # Front ports - front_ports = device.front_ports.select_related('rear_port') + front_ports = device.front_ports.select_related('rear_port', 'cable') # Rear ports - rear_ports = device.rear_ports.all() + rear_ports = device.rear_ports.select_related('cable') # Device bays device_bays = natsorted( - DeviceBay.objects.filter(device=device).select_related('installed_device__device_type__manufacturer'), + device.device_bays.select_related('installed_device__device_type__manufacturer'), key=attrgetter('name') ) # Services - services = Service.objects.filter(device=device) + services = device.services.all() # Secrets secrets = device.secrets.all() diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html index 184d596dd..eecfc6735 100644 --- a/netbox/templates/dcim/inc/consoleport.html +++ b/netbox/templates/dcim/inc/consoleport.html @@ -7,14 +7,11 @@ {# Cable #} {# Connection #} diff --git a/netbox/templates/dcim/inc/consoleserverport.html b/netbox/templates/dcim/inc/consoleserverport.html index ab06d0b84..47345ef22 100644 --- a/netbox/templates/dcim/inc/consoleserverport.html +++ b/netbox/templates/dcim/inc/consoleserverport.html @@ -14,14 +14,11 @@ {# Cable #} {# Connection #} diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index bbb37f517..3c584ba76 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -26,18 +26,15 @@ {# 802.1Q mode #} - + {# Cable #} {# Connection or type #} diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index 4a949ccd2..04b60a785 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -14,14 +14,11 @@ {# Cable #} {# Connection #} diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index 8bffef2ae..3479505e2 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -7,14 +7,11 @@ {# Cable #} {# Connection #} From 05431aa83b5a9d9c1b9215ad9f425ecd5febb202 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Oct 2018 12:33:43 -0400 Subject: [PATCH 040/191] Added 'cable' field to device component serializers --- netbox/dcim/api/serializers.py | 119 +++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 51 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 114b8283a..babd36ebf 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -492,18 +492,68 @@ class DeviceWithConfigContextSerializer(DeviceSerializer): return obj.get_config_context() +# +# Cables +# + +class CableSerializer(ValidatedModelSerializer): + termination_a_type = ContentTypeField() + termination_b_type = ContentTypeField() + termination_a = serializers.SerializerMethodField(read_only=True) + termination_b = serializers.SerializerMethodField(read_only=True) + status = ChoiceField(choices=CONNECTION_STATUS_CHOICES) + length_unit = ChoiceField(choices=LENGTH_UNIT_CHOICES) + + class Meta: + model = Cable + fields = [ + 'id', 'termination_a_type', 'termination_a_id', 'termination_a', 'termination_b_type', 'termination_b_id', + 'termination_b', 'type', 'status', 'label', 'color', 'length', 'length_unit', + ] + + def _get_termination(self, obj, side): + """ + Serialize a nested representation of a termination. + """ + if side.lower() not in ['a', 'b']: + raise ValueError("Termination side must be either A or B.") + termination = getattr(obj, 'termination_{}'.format(side.lower())) + if termination is None: + return None + serializer = get_serializer_for_model(termination, prefix='Nested') + context = {'request': self.context['request']} + data = serializer(termination, context=context).data + + return data + + def get_termination_a(self, obj): + return self._get_termination(obj, 'a') + + def get_termination_b(self, obj): + return self._get_termination(obj, 'b') + + +class NestedCableSerializer(serializers.Serializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail') + + class Meta: + model = Cable + fields = ['id', 'url', 'label'] + + # # Console server ports # class ConsoleServerPortSerializer(TaggitSerializer, ValidatedModelSerializer): device = NestedDeviceSerializer() + cable = NestedCableSerializer() tags = TagListSerializerField(required=False) class Meta: model = ConsoleServerPort - fields = ['id', 'device', 'name', 'connected_endpoint', 'tags'] - read_only_fields = ['connected_endpoint'] + fields = ['id', 'device', 'name', 'connected_endpoint', 'cable', 'tags'] + read_only_fields = ['connected_endpoint', 'cable'] class NestedConsoleServerPortSerializer(WritableNestedSerializer): @@ -526,11 +576,13 @@ class NestedConsoleServerPortSerializer(WritableNestedSerializer): class ConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): device = NestedDeviceSerializer() connected_endpoint = NestedConsoleServerPortSerializer(required=False, allow_null=True) + cable = NestedCableSerializer() tags = TagListSerializerField(required=False) class Meta: model = ConsolePort - fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'tags'] + fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags'] + read_only_fields = ['connected_endpoint', 'cable'] class NestedConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): @@ -552,12 +604,13 @@ class NestedConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): class PowerOutletSerializer(TaggitSerializer, ValidatedModelSerializer): device = NestedDeviceSerializer() + cable = NestedCableSerializer() tags = TagListSerializerField(required=False) class Meta: model = PowerOutlet - fields = ['id', 'device', 'name', 'connected_endpoint', 'tags'] - read_only_fields = ['connected_endpoint'] + fields = ['id', 'device', 'name', 'connected_endpoint', 'cable', 'tags'] + read_only_fields = ['connected_endpoint', 'cable'] class NestedPowerOutletSerializer(WritableNestedSerializer): @@ -580,11 +633,13 @@ class NestedPowerOutletSerializer(WritableNestedSerializer): class PowerPortSerializer(TaggitSerializer, ValidatedModelSerializer): device = NestedDeviceSerializer() connected_endpoint = NestedPowerOutletSerializer(required=False, allow_null=True) + cable = NestedCableSerializer() tags = TagListSerializerField(required=False) class Meta: model = PowerPort - fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'tags'] + fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags'] + read_only_fields = ['connected_endpoint', 'cable'] class NestedPowerPortSerializer(TaggitSerializer, ValidatedModelSerializer): @@ -671,14 +726,15 @@ class InterfaceSerializer(TaggitSerializer, IsConnectedMixin, ValidatedModelSeri required=False, many=True ) + cable = NestedCableSerializer() tags = TagListSerializerField(required=False) class Meta: model = Interface fields = [ 'id', 'device', 'name', 'form_factor', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description', - 'is_connected', 'connected_endpoint', 'circuit_termination', 'mode', 'untagged_vlan', 'tagged_vlans', - 'tags', + 'is_connected', 'connected_endpoint', 'circuit_termination', 'cable', 'mode', 'untagged_vlan', + 'tagged_vlans', 'tags', ] def validate(self, data): @@ -708,11 +764,12 @@ class InterfaceSerializer(TaggitSerializer, IsConnectedMixin, ValidatedModelSeri class RearPortSerializer(ValidatedModelSerializer): device = NestedDeviceSerializer() type = ChoiceField(choices=PORT_TYPE_CHOICES) + cable = NestedCableSerializer() tags = TagListSerializerField(required=False) class Meta: model = RearPort - fields = ['id', 'device', 'name', 'type', 'positions', 'tags'] + fields = ['id', 'device', 'name', 'type', 'positions', 'cable', 'tags'] class NestedRearPortSerializer(WritableNestedSerializer): @@ -732,11 +789,12 @@ class FrontPortSerializer(ValidatedModelSerializer): device = NestedDeviceSerializer() type = ChoiceField(choices=PORT_TYPE_CHOICES) rear_port = NestedRearPortSerializer() + cable = NestedCableSerializer() tags = TagListSerializerField(required=False) class Meta: model = FrontPort - fields = ['id', 'device', 'name', 'type', 'rear_port', 'rear_port_position', 'tags'] + fields = ['id', 'device', 'name', 'type', 'rear_port', 'rear_port_position', 'cable', 'tags'] class NestedFrontPortSerializer(WritableNestedSerializer): @@ -808,47 +866,6 @@ class InterfaceConnectionSerializer(ValidatedModelSerializer): return NestedInterfaceSerializer(instance=obj, context=context).data -# -# Cables -# - -class CableSerializer(ValidatedModelSerializer): - termination_a_type = ContentTypeField() - termination_b_type = ContentTypeField() - termination_a = serializers.SerializerMethodField(read_only=True) - termination_b = serializers.SerializerMethodField(read_only=True) - status = ChoiceField(choices=CONNECTION_STATUS_CHOICES) - length_unit = ChoiceField(choices=LENGTH_UNIT_CHOICES) - - class Meta: - model = Cable - fields = [ - 'id', 'termination_a_type', 'termination_a_id', 'termination_a', 'termination_b_type', 'termination_b_id', - 'termination_b', 'type', 'status', 'label', 'color', 'length', 'length_unit', - ] - - def _get_termination(self, obj, side): - """ - Serialize a nested representation of a termination. - """ - if side.lower() not in ['a', 'b']: - raise ValueError("Termination side must be either A or B.") - termination = getattr(obj, 'termination_{}'.format(side.lower())) - if termination is None: - return None - serializer = get_serializer_for_model(termination, prefix='Nested') - context = {'request': self.context['request']} - data = serializer(termination, context=context).data - - return data - - def get_termination_a(self, obj): - return self._get_termination(obj, 'a') - - def get_termination_b(self, obj): - return self._get_termination(obj, 'b') - - # # Virtual chassis # From 17a71d3e265e30624c0f4e21dd5e1ab7ab306477 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Oct 2018 12:56:17 -0400 Subject: [PATCH 041/191] Optimized front/rear port connection displays --- netbox/templates/dcim/inc/frontport.html | 84 ++++++++++++------------ netbox/templates/dcim/inc/rearport.html | 82 +++++++++++------------ 2 files changed, 81 insertions(+), 85 deletions(-) diff --git a/netbox/templates/dcim/inc/frontport.html b/netbox/templates/dcim/inc/frontport.html index 9297585ee..2b79cf7a7 100644 --- a/netbox/templates/dcim/inc/frontport.html +++ b/netbox/templates/dcim/inc/frontport.html @@ -1,46 +1,44 @@ -{% with cable=frontport.get_connected_cable %} - + - {# Checkbox #} - {% if perms.dcim.change_frontport or perms.dcim.delete_frontport %} - + {# Checkbox #} + {% if perms.dcim.change_frontport or perms.dcim.delete_frontport %} + + {% endif %} + + {# Name #} + + + {# Type #} + + + {# Rear port #} + + + + {# Cable #} + - {# Name #} - - - {# Type #} - - - {# Rear port #} - - - - {# Cable #} - - - {# Actions #} - - -{% endwith %} + {# Actions #} + + diff --git a/netbox/templates/dcim/inc/rearport.html b/netbox/templates/dcim/inc/rearport.html index 9a8128de4..424565b19 100644 --- a/netbox/templates/dcim/inc/rearport.html +++ b/netbox/templates/dcim/inc/rearport.html @@ -1,45 +1,43 @@ -{% with cable=rearport.get_connected_cable %} - + - {# Checkbox #} - {% if perms.dcim.change_rearport or perms.dcim.delete_rearport %} - + {# Checkbox #} + {% if perms.dcim.change_rearport or perms.dcim.delete_rearport %} + + {% endif %} + + {# Name #} + + + {# Type #} + + + {# Positions #} + + + {# Cable #} + - {# Name #} - - - {# Type #} - - - {# Positions #} - - - {# Cable #} - - - {# Actions #} - - -{% endwith %} + {# Actions #} + + From 1ab4344537870d2e89a665852729d48e9f89cbca Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Oct 2018 13:09:23 -0400 Subject: [PATCH 042/191] Fix front/rear port connection styling --- netbox/templates/dcim/inc/frontport.html | 4 ++-- netbox/templates/dcim/inc/rearport.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox/templates/dcim/inc/frontport.html b/netbox/templates/dcim/inc/frontport.html index 2b79cf7a7..8fb7d1136 100644 --- a/netbox/templates/dcim/inc/frontport.html +++ b/netbox/templates/dcim/inc/frontport.html @@ -1,4 +1,4 @@ - + {# Checkbox #} {% if perms.dcim.change_frontport or perms.dcim.delete_frontport %} @@ -9,7 +9,7 @@ {# Name #} {# Type #} diff --git a/netbox/templates/dcim/inc/rearport.html b/netbox/templates/dcim/inc/rearport.html index 424565b19..e180fa154 100644 --- a/netbox/templates/dcim/inc/rearport.html +++ b/netbox/templates/dcim/inc/rearport.html @@ -1,4 +1,4 @@ - + {# Checkbox #} {% if perms.dcim.change_rearport or perms.dcim.delete_rearport %} @@ -9,7 +9,7 @@ {# Name #} {# Type #} From cb1bdccf516373335c4c7e94c373b7fb3518ec5d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Oct 2018 13:14:41 -0400 Subject: [PATCH 043/191] 'cable' should be a read-only field --- netbox/dcim/api/serializers.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index babd36ebf..a85589235 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -547,13 +547,13 @@ class NestedCableSerializer(serializers.Serializer): class ConsoleServerPortSerializer(TaggitSerializer, ValidatedModelSerializer): device = NestedDeviceSerializer() - cable = NestedCableSerializer() + cable = NestedCableSerializer(read_only=True) tags = TagListSerializerField(required=False) class Meta: model = ConsoleServerPort fields = ['id', 'device', 'name', 'connected_endpoint', 'cable', 'tags'] - read_only_fields = ['connected_endpoint', 'cable'] + read_only_fields = ['connected_endpoint'] class NestedConsoleServerPortSerializer(WritableNestedSerializer): @@ -576,13 +576,13 @@ class NestedConsoleServerPortSerializer(WritableNestedSerializer): class ConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): device = NestedDeviceSerializer() connected_endpoint = NestedConsoleServerPortSerializer(required=False, allow_null=True) - cable = NestedCableSerializer() + cable = NestedCableSerializer(read_only=True) tags = TagListSerializerField(required=False) class Meta: model = ConsolePort fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags'] - read_only_fields = ['connected_endpoint', 'cable'] + read_only_fields = ['connected_endpoint'] class NestedConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): @@ -604,13 +604,13 @@ class NestedConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): class PowerOutletSerializer(TaggitSerializer, ValidatedModelSerializer): device = NestedDeviceSerializer() - cable = NestedCableSerializer() + cable = NestedCableSerializer(read_only=True) tags = TagListSerializerField(required=False) class Meta: model = PowerOutlet fields = ['id', 'device', 'name', 'connected_endpoint', 'cable', 'tags'] - read_only_fields = ['connected_endpoint', 'cable'] + read_only_fields = ['connected_endpoint'] class NestedPowerOutletSerializer(WritableNestedSerializer): @@ -633,13 +633,13 @@ class NestedPowerOutletSerializer(WritableNestedSerializer): class PowerPortSerializer(TaggitSerializer, ValidatedModelSerializer): device = NestedDeviceSerializer() connected_endpoint = NestedPowerOutletSerializer(required=False, allow_null=True) - cable = NestedCableSerializer() + cable = NestedCableSerializer(read_only=True) tags = TagListSerializerField(required=False) class Meta: model = PowerPort fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags'] - read_only_fields = ['connected_endpoint', 'cable'] + read_only_fields = ['connected_endpoint'] class NestedPowerPortSerializer(TaggitSerializer, ValidatedModelSerializer): @@ -715,7 +715,7 @@ class InterfaceSerializer(TaggitSerializer, IsConnectedMixin, ValidatedModelSeri device = NestedDeviceSerializer() form_factor = ChoiceField(choices=IFACE_FF_CHOICES, required=False) lag = NestedInterfaceSerializer(required=False, allow_null=True) - connected_endpoint = NestedInterfaceSerializer(required=False, allow_null=True) + connected_endpoint = NestedInterfaceSerializer(read_only=True) is_connected = serializers.SerializerMethodField(read_only=True) circuit_termination = InterfaceCircuitTerminationSerializer(read_only=True) mode = ChoiceField(choices=IFACE_MODE_CHOICES, required=False, allow_null=True) @@ -726,7 +726,7 @@ class InterfaceSerializer(TaggitSerializer, IsConnectedMixin, ValidatedModelSeri required=False, many=True ) - cable = NestedCableSerializer() + cable = NestedCableSerializer(read_only=True) tags = TagListSerializerField(required=False) class Meta: @@ -764,7 +764,7 @@ class InterfaceSerializer(TaggitSerializer, IsConnectedMixin, ValidatedModelSeri class RearPortSerializer(ValidatedModelSerializer): device = NestedDeviceSerializer() type = ChoiceField(choices=PORT_TYPE_CHOICES) - cable = NestedCableSerializer() + cable = NestedCableSerializer(read_only=True) tags = TagListSerializerField(required=False) class Meta: @@ -789,7 +789,7 @@ class FrontPortSerializer(ValidatedModelSerializer): device = NestedDeviceSerializer() type = ChoiceField(choices=PORT_TYPE_CHOICES) rear_port = NestedRearPortSerializer() - cable = NestedCableSerializer() + cable = NestedCableSerializer(read_only=True) tags = TagListSerializerField(required=False) class Meta: From 427226de8c77d917c9158d316295183853feef44 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Oct 2018 13:26:09 -0400 Subject: [PATCH 044/191] Optimized API views --- netbox/dcim/api/serializers.py | 12 ++++++++-- netbox/dcim/api/views.py | 42 ++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index a85589235..64d30d5dc 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -785,10 +785,18 @@ class NestedRearPortSerializer(WritableNestedSerializer): # Front ports # +class FrontPortRearPortSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail') + + class Meta: + model = RearPort + fields = ['id', 'url', 'name'] + + class FrontPortSerializer(ValidatedModelSerializer): device = NestedDeviceSerializer() type = ChoiceField(choices=PORT_TYPE_CHOICES) - rear_port = NestedRearPortSerializer() + rear_port = FrontPortRearPortSerializer() cable = NestedCableSerializer(read_only=True) tags = TagListSerializerField(required=False) @@ -821,7 +829,7 @@ class DeviceBaySerializer(TaggitSerializer, ValidatedModelSerializer): class NestedDeviceBaySerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicebay-detail') + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail') device = NestedDeviceSerializer(read_only=True) class Meta: diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index aa9c3e226..8479d7d0c 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -330,31 +330,51 @@ class DeviceViewSet(CustomFieldModelViewSet): # class ConsolePortViewSet(ModelViewSet): - queryset = ConsolePort.objects.select_related('device', 'connected_endpoint__device').prefetch_related('tags') + queryset = ConsolePort.objects.select_related( + 'device', 'connected_endpoint__device', 'cable' + ).prefetch_related( + 'tags' + ) serializer_class = serializers.ConsolePortSerializer filter_class = filters.ConsolePortFilter class ConsoleServerPortViewSet(ModelViewSet): - queryset = ConsoleServerPort.objects.select_related('device', 'connected_endpoint__device').prefetch_related('tags') + queryset = ConsoleServerPort.objects.select_related( + 'device', 'connected_endpoint__device', 'cable' + ).prefetch_related( + 'tags' + ) serializer_class = serializers.ConsoleServerPortSerializer filter_class = filters.ConsoleServerPortFilter class PowerPortViewSet(ModelViewSet): - queryset = PowerPort.objects.select_related('device', 'connected_endpoint__device').prefetch_related('tags') + queryset = PowerPort.objects.select_related( + 'device', 'connected_endpoint__device', 'cable' + ).prefetch_related( + 'tags' + ) serializer_class = serializers.PowerPortSerializer filter_class = filters.PowerPortFilter class PowerOutletViewSet(ModelViewSet): - queryset = PowerOutlet.objects.select_related('device', 'connected_endpoint__device').prefetch_related('tags') + queryset = PowerOutlet.objects.select_related( + 'device', 'connected_endpoint__device', 'cable' + ).prefetch_related( + 'tags' + ) serializer_class = serializers.PowerOutletSerializer filter_class = filters.PowerOutletFilter class InterfaceViewSet(ModelViewSet): - queryset = Interface.objects.select_related('device').prefetch_related('tags') + queryset = Interface.objects.select_related( + 'device', 'connected_endpoint__device', 'cable' + ).prefetch_related( + 'tags' + ) serializer_class = serializers.InterfaceSerializer filter_class = filters.InterfaceFilter @@ -370,13 +390,21 @@ class InterfaceViewSet(ModelViewSet): class FrontPortViewSet(ModelViewSet): - queryset = FrontPort.objects.select_related('device__device_type__manufacturer', 'rear_port') + queryset = FrontPort.objects.select_related( + 'device__device_type__manufacturer', 'rear_port', 'cable' + ).prefetch_related( + 'tags' + ) serializer_class = serializers.FrontPortSerializer filter_class = filters.FrontPortFilter class RearPortViewSet(ModelViewSet): - queryset = RearPort.objects.select_related('device__device_type__manufacturer') + queryset = RearPort.objects.select_related( + 'device__device_type__manufacturer', 'cable' + ).prefetch_related( + 'tags' + ) serializer_class = serializers.RearPortSerializer filter_class = filters.RearPortFilter From d7766b982898faad52cc89a8fb9a225d8b6fe47e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Oct 2018 13:36:41 -0400 Subject: [PATCH 045/191] Replace 'is_connected' boolean with Cable attachment --- netbox/circuits/forms.py | 6 ++-- netbox/dcim/api/serializers.py | 54 +++++++--------------------------- netbox/dcim/forms.py | 10 +++---- netbox/dcim/models.py | 12 ++------ netbox/dcim/tests/test_api.py | 10 +++---- 5 files changed, 26 insertions(+), 66 deletions(-) diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py index b5883e6ec..2f10598f2 100644 --- a/netbox/circuits/forms.py +++ b/netbox/circuits/forms.py @@ -245,7 +245,7 @@ class CircuitTerminationForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm label='Interface', widget=APISelect( api_url='/api/dcim/interfaces/?device_id={{device}}&type=physical', - disabled_indicator='is_connected' + disabled_indicator='cable' ) ) @@ -276,12 +276,12 @@ class CircuitTerminationForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm super(CircuitTerminationForm, self).__init__(*args, **kwargs) - # Mark connected interfaces as disabled + # Mark occupied interfaces as disabled self.fields['interface'].choices = [] for iface in self.fields['interface'].queryset: self.fields['interface'].choices.append( (iface.id, { 'label': iface.name, - 'disabled': iface.is_connected and iface.pk != self.initial.get('interface'), + 'disabled': bool(iface.cable) and iface.pk != self.initial.get('interface'), }) ) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 64d30d5dc..26ec68a84 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -559,14 +559,10 @@ class ConsoleServerPortSerializer(TaggitSerializer, ValidatedModelSerializer): class NestedConsoleServerPortSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverport-detail') device = NestedDeviceSerializer(read_only=True) - is_connected = serializers.SerializerMethodField(read_only=True) class Meta: model = ConsoleServerPort - fields = ['id', 'url', 'device', 'name', 'is_connected'] - - def get_is_connected(self, obj): - return hasattr(obj, 'connected_endpoint') and obj.connected_endpoint is not None + fields = ['id', 'url', 'device', 'name', 'cable'] # @@ -588,14 +584,10 @@ class ConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): class NestedConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleport-detail') device = NestedDeviceSerializer(read_only=True) - is_connected = serializers.SerializerMethodField(read_only=True) class Meta: model = ConsolePort - fields = ['id', 'url', 'device', 'name', 'is_connected'] - - def get_is_connected(self, obj): - return obj.connected_endpoint is not None + fields = ['id', 'url', 'device', 'name', 'cable'] # @@ -616,14 +608,10 @@ class PowerOutletSerializer(TaggitSerializer, ValidatedModelSerializer): class NestedPowerOutletSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlet-detail') device = NestedDeviceSerializer(read_only=True) - is_connected = serializers.SerializerMethodField(read_only=True) class Meta: model = PowerOutlet - fields = ['id', 'url', 'device', 'name', 'is_connected'] - - def get_is_connected(self, obj): - return hasattr(obj, 'connected_endpoint') and obj.connected_endpoint is not None + fields = ['id', 'url', 'device', 'name', 'cable'] # @@ -645,43 +633,23 @@ class PowerPortSerializer(TaggitSerializer, ValidatedModelSerializer): class NestedPowerPortSerializer(TaggitSerializer, ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerport-detail') device = NestedDeviceSerializer(read_only=True) - is_connected = serializers.SerializerMethodField(read_only=True) class Meta: model = PowerPort - fields = ['id', 'url', 'device', 'name', 'is_connected'] - - def get_is_connected(self, obj): - return obj.connected_endpoint is not None + fields = ['id', 'url', 'device', 'name', 'cable'] # # Interfaces # -class IsConnectedMixin(object): - """ - Provide a method for setting is_connected on Interface serializers. - """ - def get_is_connected(self, obj): - """ - Return True if the interface has a connected interface or circuit. - """ - if obj.connected_endpoint: - return True - if hasattr(obj, 'circuit_termination') and obj.circuit_termination is not None: - return True - return False - - -class NestedInterfaceSerializer(IsConnectedMixin, WritableNestedSerializer): +class NestedInterfaceSerializer(WritableNestedSerializer): device = NestedDeviceSerializer(read_only=True) url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interface-detail') - is_connected = serializers.SerializerMethodField(read_only=True) class Meta: model = Interface - fields = ['id', 'url', 'device', 'name', 'is_connected'] + fields = ['id', 'url', 'device', 'name', 'cable'] class InterfaceNestedCircuitSerializer(serializers.ModelSerializer): @@ -711,12 +679,11 @@ class InterfaceVLANSerializer(WritableNestedSerializer): fields = ['id', 'url', 'vid', 'name', 'display_name'] -class InterfaceSerializer(TaggitSerializer, IsConnectedMixin, ValidatedModelSerializer): +class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer): device = NestedDeviceSerializer() form_factor = ChoiceField(choices=IFACE_FF_CHOICES, required=False) lag = NestedInterfaceSerializer(required=False, allow_null=True) connected_endpoint = NestedInterfaceSerializer(read_only=True) - is_connected = serializers.SerializerMethodField(read_only=True) circuit_termination = InterfaceCircuitTerminationSerializer(read_only=True) mode = ChoiceField(choices=IFACE_MODE_CHOICES, required=False, allow_null=True) untagged_vlan = InterfaceVLANSerializer(required=False, allow_null=True) @@ -733,8 +700,7 @@ class InterfaceSerializer(TaggitSerializer, IsConnectedMixin, ValidatedModelSeri model = Interface fields = [ 'id', 'device', 'name', 'form_factor', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description', - 'is_connected', 'connected_endpoint', 'circuit_termination', 'cable', 'mode', 'untagged_vlan', - 'tagged_vlans', 'tags', + 'connected_endpoint', 'circuit_termination', 'cable', 'mode', 'untagged_vlan', 'tagged_vlans', 'tags', ] def validate(self, data): @@ -778,7 +744,7 @@ class NestedRearPortSerializer(WritableNestedSerializer): class Meta: model = RearPort - fields = ['id', 'url', 'device', 'name'] + fields = ['id', 'url', 'device', 'name', 'cable'] # @@ -811,7 +777,7 @@ class NestedFrontPortSerializer(WritableNestedSerializer): class Meta: model = FrontPort - fields = ['id', 'url', 'device', 'name'] + fields = ['id', 'url', 'device', 'name', 'cable'] # diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 8db4ceb4f..3650cf0a1 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1402,7 +1402,7 @@ class ConsolePortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelF label='Port', widget=APISelect( api_url='/api/dcim/console-server-ports/?device_id={{console_server}}', - disabled_indicator='is_connected', + disabled_indicator='cable', ) ) @@ -1493,7 +1493,7 @@ class ConsoleServerPortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms. label='Port', widget=APISelect( api_url='/api/dcim/console-ports/?device_id={{device}}', - disabled_indicator='is_connected' + disabled_indicator='cable' ) ) connection_status = forms.BooleanField( @@ -1671,7 +1671,7 @@ class PowerPortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelFor label='Outlet', widget=APISelect( api_url='/api/dcim/power-outlets/?device_id={{pdu}}', - disabled_indicator='is_connected' + disabled_indicator='cable' ) ) @@ -1762,7 +1762,7 @@ class PowerOutletConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.Form): label='Port', widget=APISelect( api_url='/api/dcim/power-ports/?device_id={{device}}', - disabled_indicator='is_connected' + disabled_indicator='cable' ) ) connection_status = forms.BooleanField( @@ -2171,7 +2171,7 @@ class CableCreateForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): label='Name', widget=APISelect( api_url='/api/dcim/{{termination_b_type}}s/?device_id={{termination_b_device}}', - disabled_indicator='is_connected' + disabled_indicator='cable' ) ) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index d1df21ca9..e8f00c830 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1888,7 +1888,9 @@ class Interface(CableTermination, ComponentModel): }) # Virtual interfaces cannot be connected - if self.form_factor in NONCONNECTABLE_IFACE_TYPES and self.is_connected: + if self.form_factor in NONCONNECTABLE_IFACE_TYPES and ( + self.cable or getattr(self, 'circuit_termination', False) + ): raise ValidationError({ 'form_factor': "Virtual and wireless interfaces cannot be connected to another interface or circuit. " "Disconnect the interface or choose a suitable form factor." @@ -1977,14 +1979,6 @@ class Interface(CableTermination, ComponentModel): def is_lag(self): return self.form_factor == IFACE_FF_LAG - @property - def is_connected(self): - try: - return bool(self.circuit_termination) - except ObjectDoesNotExist: - pass - return bool(self.connected_endpoint) - # # Pass-through ports diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 389797a09..d63348751 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -1953,7 +1953,7 @@ class ConsolePortTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['device', 'id', 'is_connected', 'name', 'url'] + ['cable', 'device', 'id', 'name', 'url'] ) def test_create_consoleport(self): @@ -2068,7 +2068,7 @@ class ConsoleServerPortTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['device', 'id', 'is_connected', 'name', 'url'] + ['cable', 'device', 'id', 'name', 'url'] ) def test_create_consoleserverport(self): @@ -2179,7 +2179,7 @@ class PowerPortTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['device', 'id', 'is_connected', 'name', 'url'] + ['cable', 'device', 'id', 'name', 'url'] ) def test_create_powerport(self): @@ -2294,7 +2294,7 @@ class PowerOutletTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['device', 'id', 'is_connected', 'name', 'url'] + ['cable', 'device', 'id', 'name', 'url'] ) def test_create_poweroutlet(self): @@ -2431,7 +2431,7 @@ class InterfaceTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['device', 'id', 'is_connected', 'name', 'url'] + ['cable', 'device', 'id', 'name', 'url'] ) def test_create_interface(self): From 8ebf7a7ad0143b32dbe443e68030e63651cc2b11 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Oct 2018 13:42:58 -0400 Subject: [PATCH 046/191] Standard naming of reverse relationship to Device from component models --- netbox/dcim/migrations/0065_front_rear_ports.py | 4 ++-- netbox/dcim/migrations/0066_cables.py | 10 ++++++++++ netbox/dcim/models.py | 8 ++++---- netbox/dcim/views.py | 8 ++++---- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/netbox/dcim/migrations/0065_front_rear_ports.py b/netbox/dcim/migrations/0065_front_rear_ports.py index e3f2f290a..2e893c4b3 100644 --- a/netbox/dcim/migrations/0065_front_rear_ports.py +++ b/netbox/dcim/migrations/0065_front_rear_ports.py @@ -21,7 +21,7 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=64)), ('type', models.PositiveSmallIntegerField()), ('rear_port_position', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(64)])), - ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_ports', to='dcim.Device')), + ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='frontports', to='dcim.Device')), ], options={ 'ordering': ['device', 'name'], @@ -46,7 +46,7 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=64)), ('type', models.PositiveSmallIntegerField()), ('positions', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(64)])), - ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rear_ports', to='dcim.Device')), + ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rearports', to='dcim.Device')), ('tags', taggit.managers.TaggableManager(through='taggit.TaggedItem', to='taggit.Tag')), ], options={ diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py index 8a391c97a..442e9d5d8 100644 --- a/netbox/dcim/migrations/0066_cables.py +++ b/netbox/dcim/migrations/0066_cables.py @@ -156,6 +156,11 @@ class Migration(migrations.Migration): old_name='cs_port', new_name='connected_endpoint' ), + migrations.AlterField( + model_name='consoleport', + name='device', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='consoleports', to='dcim.Device'), + ), migrations.AlterField( model_name='consoleport', name='connected_endpoint', @@ -183,6 +188,11 @@ class Migration(migrations.Migration): old_name='power_outlet', new_name='connected_endpoint' ), + migrations.AlterField( + model_name='powerport', + name='device', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='powerports', to='dcim.Device'), + ), migrations.AlterField( model_name='powerport', name='connected_endpoint', diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index e8f00c830..0b69a0ac7 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1595,7 +1595,7 @@ class ConsolePort(CableTermination, ComponentModel): device = models.ForeignKey( to='dcim.Device', on_delete=models.CASCADE, - related_name='console_ports' + related_name='consoleports' ) name = models.CharField( max_length=50 @@ -1687,7 +1687,7 @@ class PowerPort(CableTermination, ComponentModel): device = models.ForeignKey( to='dcim.Device', on_delete=models.CASCADE, - related_name='power_ports' + related_name='powerports' ) name = models.CharField( max_length=50 @@ -1991,7 +1991,7 @@ class FrontPort(CableTermination, ComponentModel): device = models.ForeignKey( to='dcim.Device', on_delete=models.CASCADE, - related_name='front_ports' + related_name='frontports' ) name = models.CharField( max_length=64 @@ -2045,7 +2045,7 @@ class RearPort(CableTermination, ComponentModel): device = models.ForeignKey( to='dcim.Device', on_delete=models.CASCADE, - related_name='rear_ports' + related_name='rearports' ) name = models.CharField( max_length=64 diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 42d12335d..c2f9a9695 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -884,7 +884,7 @@ class DeviceView(View): # Console ports console_ports = natsorted( - device.console_ports.select_related('connected_endpoint__device', 'cable'), + device.consoleports.select_related('connected_endpoint__device', 'cable'), key=attrgetter('name') ) @@ -893,7 +893,7 @@ class DeviceView(View): # Power ports power_ports = natsorted( - device.power_ports.select_related('connected_endpoint__device', 'cable'), + device.powerports.select_related('connected_endpoint__device', 'cable'), key=attrgetter('name') ) @@ -910,10 +910,10 @@ class DeviceView(View): ) # Front ports - front_ports = device.front_ports.select_related('rear_port', 'cable') + front_ports = device.frontports.select_related('rear_port', 'cable') # Rear ports - rear_ports = device.rear_ports.select_related('cable') + rear_ports = device.rearports.select_related('cable') # Device bays device_bays = natsorted( From e75ef5fd2d935c093f9d9bf669c17668531443a1 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Oct 2018 14:12:02 -0400 Subject: [PATCH 047/191] Replace references to Interface.connection with connected_endpoint --- .../templates/dcim/device_lldp_neighbors.html | 16 ++++++-------- netbox/templates/dcim/inc/interface.html | 12 +++++----- netbox/templates/dcim/interface.html | 22 +++++++++---------- 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/netbox/templates/dcim/device_lldp_neighbors.html b/netbox/templates/dcim/device_lldp_neighbors.html index d4fbcbc79..78ec017ec 100644 --- a/netbox/templates/dcim/device_lldp_neighbors.html +++ b/netbox/templates/dcim/device_lldp_neighbors.html @@ -22,15 +22,13 @@ {% for iface in interfaces %} - {% if iface.connection %} - {% with iface.connected_interface as connected_iface %} - - - {% endwith %} + {% if iface.connected_endpoint %} + + {% else %} {% endif %} diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 3c584ba76..1ee1706ab 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -81,7 +81,7 @@ {# Buttons #} - {% if interface.connection %} - - - - - {% endif %} + + + +
      {% with cable=pp.get_connected_cable %} {% if cable %} - via {{ cable }} + Cable {{ cable }} + {% if cable.far_end != pp.connected_endpoint %} + to {{ cable.far_end.device }} {{ cable.far_end }} + {% endif %} {% endif %} {% endwith %} - {% with cable=cp.get_connected_cable %} - {% if cable %} - Cable {{ cable }} - {% if cable.far_end != cp.connected_endpoint %} - to {{ cable.far_end.device }} {{ cable.far_end }} - {% endif %} - {% endif %} - {% endwith %} + {% if cp.cable %} + {{ cp.cable }} + {% else %} + — + {% endif %} - {% with cable=csp.get_connected_cable %} - {% if cable %} - {{ cable }} - {% if cable.far_end != csp.connected_endpoint %} - to {{ cable.far_end.device }} {{ cable.far_end }} - {% endif %} - {% endif %} - {% endwith %} + {% if csp.cable %} + {{ csp.cable }} + {% else %} + — + {% endif %} {{ iface.description|default:"—" }}{{ iface.get_mode_display }}{{ iface.get_mode_display|default:"—" }} - {% with cable=iface.get_connected_cable %} - {% if cable %} - {{ cable }} - {% if cable.far_end != iface.connected_endpoint %} - to {{ cable.far_end.device }} {{ cable.far_end }} - {% endif %} - {% endif %} - {% endwith %} + {% if iface.cable %} + {{ iface.cable }} + {% else %} + — + {% endif %} - {% with cable=po.get_connected_cable %} - {% if cable %} - {{ cable }} - {% if cable.far_end != po.connected_endpoint %} - to {{ cable.far_end.device }} {{ cable.far_end }} - {% endif %} - {% endif %} - {% endwith %} + {% if po.cable %} + {{ po.cable }} + {% else %} + — + {% endif %} - {% with cable=pp.get_connected_cable %} - {% if cable %} - Cable {{ cable }} - {% if cable.far_end != pp.connected_endpoint %} - to {{ cable.far_end.device }} {{ cable.far_end }} - {% endif %} - {% endif %} - {% endwith %} + {% if pp.cable %} + {{ pp.cable }} + {% else %} + — + {% endif %}
      - - + + + {{ frontport }} + {{ frontport.get_type_display }}{{ frontport.rear_port }}{{ frontport.rear_port_position }} + {% if frontport.cable %} + {{ frontport.cable }} + {% else %} + Not connected {% endif %} + - {{ frontport }} - {{ frontport.get_type_display }}{{ frontport.rear_port }}{{ frontport.rear_port_position }} - {% if cable %} - {{ cable }} to {{ cable.far_end.device }} {{ cable.far_end }} - {% else %} - Not connected - {% endif %} - - {% if perms.dcim.change_frontport %} - - - - {% endif %} - {% if perms.dcim.delete_frontport %} - - - - {% endif %} -
      + {% if perms.dcim.change_frontport %} + + + + {% endif %} + {% if perms.dcim.delete_frontport %} + + + + {% endif %} +
      - - + + + {{ rearport }} + {{ rearport.get_type_display }}{{ rearport.positions }} + {% if rearport.cable %} + {{ rearport.cable }} + {% else %} + Not connected {% endif %} + - {{ rearport }} - {{ rearport.get_type_display }}{{ rearport.positions }} - {% if cable %} - {{ cable }} to {{ cable.far_end.device }} {{ cable.far_end }} - {% else %} - Not connected - {% endif %} - - {% if perms.dcim.change_rearport %} - - - - {% endif %} - {% if perms.dcim.delete_rearport %} - - - - {% endif %} -
      + {% if perms.dcim.change_rearport %} + + + + {% endif %} + {% if perms.dcim.delete_rearport %} + + + + {% endif %} +
      - {{ frontport }} + {{ frontport }}
      - {{ rearport }} + {{ rearport }}
      {{ iface }} - {{ connected_iface.device }} - - {{ connected_iface }} - + {{ iface.connected_endpoint.device }} + + {{ iface.connected_endpoint }} + None {% if show_graphs %} - {% if iface.circuit_termination or iface.connection %} + {% if iface.circuit_termination or iface.connected_endpoint %} @@ -94,17 +94,17 @@ {% endif %} {% if perms.dcim.change_interface %} {% if not iface.is_virtual %} - {% if iface.connection %} - {% if iface.connection.connection_status %} - + {% if iface.cable %} + {% if iface.cable.status %} + {% else %} - + {% endif %} - + {% elif iface.circuit_termination and perms.circuits.change_circuittermination %} diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index 47278d468..4493eefc9 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -196,18 +196,16 @@ 802.1Q Mode {{ connected_interface.get_mode_display }}
      Connection Status - {% if interface.connection.connection_status %} - {{ interface.connection.get_connection_status_display }} - {% else %} - {{ interface.connection.get_connection_status_display }} - {% endif %} -
      Connection Status + {% if interface.connection_status %} + {{ interface.get_connection_status_display }} + {% else %} + {{ interface.get_connection_status_display }} + {% endif %} +
      {% else %}
      From e3dc12338b186c2d13ac3597ed4a5c26294463ef Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Oct 2018 15:43:41 -0400 Subject: [PATCH 048/191] Introduced a 'trace' API endpoint for cable terminations --- netbox/dcim/api/serializers.py | 13 +++++++++ netbox/dcim/api/views.py | 48 ++++++++++++++++++++++++++++----- netbox/dcim/models.py | 49 ++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 26ec68a84..cd3652173 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -533,6 +533,19 @@ class CableSerializer(ValidatedModelSerializer): return self._get_termination(obj, 'b') +class TracedCableSerializer(serializers.ModelSerializer): + """ + Used only while tracing a cable path. + """ + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail') + + class Meta: + model = Cable + fields = [ + 'id', 'url', 'type', 'status', 'label', 'color', 'length', 'length_unit', + ] + + class NestedCableSerializer(serializers.Serializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail') diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 8479d7d0c..31ec0a3cf 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -22,7 +22,9 @@ from dcim.models import ( from extras.api.serializers import RenderedGraphSerializer from extras.api.views import CustomFieldModelViewSet from extras.models import Graph, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE -from utilities.api import IsAuthenticatedOrLoginNotRequired, FieldChoicesViewSet, ModelViewSet, ServiceUnavailable +from utilities.api import ( + get_serializer_for_model, IsAuthenticatedOrLoginNotRequired, FieldChoicesViewSet, ModelViewSet, ServiceUnavailable, +) from . import serializers from .exceptions import MissingFilterException @@ -43,6 +45,40 @@ class DCIMFieldChoicesViewSet(FieldChoicesViewSet): ) +# Mixins + +class CableTraceMixin(object): + + @action(detail=True, url_path='trace') + def trace(self, request, pk): + """ + Trace a complete cable path and return each segment as a three-tuple of (termination, cable, termination). + """ + obj = get_object_or_404(self.queryset.model, pk=pk) + + # Initialize the path array + path = [] + + for near_end, cable, far_end in obj.trace(): + + # Serialize each object + serializer_a = get_serializer_for_model(near_end, prefix='Nested') + x = serializer_a(near_end, context={'request': request}).data + if cable is not None: + y = serializers.TracedCableSerializer(cable, context={'request': request}).data + else: + y = None + if far_end is not None: + serializer_b = get_serializer_for_model(far_end, prefix='Nested') + z = serializer_b(far_end, context={'request': request}).data + else: + z = None + + path.append((x, y, z)) + + return Response(path) + + # # Regions # @@ -329,7 +365,7 @@ class DeviceViewSet(CustomFieldModelViewSet): # Device components # -class ConsolePortViewSet(ModelViewSet): +class ConsolePortViewSet(CableTraceMixin, ModelViewSet): queryset = ConsolePort.objects.select_related( 'device', 'connected_endpoint__device', 'cable' ).prefetch_related( @@ -339,7 +375,7 @@ class ConsolePortViewSet(ModelViewSet): filter_class = filters.ConsolePortFilter -class ConsoleServerPortViewSet(ModelViewSet): +class ConsoleServerPortViewSet(CableTraceMixin, ModelViewSet): queryset = ConsoleServerPort.objects.select_related( 'device', 'connected_endpoint__device', 'cable' ).prefetch_related( @@ -349,7 +385,7 @@ class ConsoleServerPortViewSet(ModelViewSet): filter_class = filters.ConsoleServerPortFilter -class PowerPortViewSet(ModelViewSet): +class PowerPortViewSet(CableTraceMixin, ModelViewSet): queryset = PowerPort.objects.select_related( 'device', 'connected_endpoint__device', 'cable' ).prefetch_related( @@ -359,7 +395,7 @@ class PowerPortViewSet(ModelViewSet): filter_class = filters.PowerPortFilter -class PowerOutletViewSet(ModelViewSet): +class PowerOutletViewSet(CableTraceMixin, ModelViewSet): queryset = PowerOutlet.objects.select_related( 'device', 'connected_endpoint__device', 'cable' ).prefetch_related( @@ -369,7 +405,7 @@ class PowerOutletViewSet(ModelViewSet): filter_class = filters.PowerOutletFilter -class InterfaceViewSet(ModelViewSet): +class InterfaceViewSet(CableTraceMixin, ModelViewSet): queryset = Interface.objects.select_related( 'device', 'connected_endpoint__device', 'cable' ).prefetch_related( diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 0b69a0ac7..1a8631e6c 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -76,6 +76,55 @@ class CableTermination(models.Model): class Meta: abstract = True + def trace(self, position=1): + """ + Return a list representing a complete cable path, with each individual segment represented as a three-tuple: + [ + (termination A, cable, termination B), + (termination C, cable, termination D), + (termination E, cable, termination F) + ] + """ + def get_peer_port(termination, position=1): + + # Map a front port to its corresponding rear port + if isinstance(termination, FrontPort): + return termination.rear_port, termination.rear_port_position + + # Map a rear port/position to its corresponding front port + elif isinstance(termination, RearPort): + if position not in range(1, termination.positions + 1): + raise Exception("Invalid position for {} ({} positions): {})".format( + termination, termination.positions, position + )) + peer_port = FrontPort.objects.get( + rear_port=termination, + rear_port_position=position, + ) + return peer_port, 1 + + # Termination is not a pass-through port + else: + return None, None + + if not self.cable: + return [(self, None, None)] + + far_end = self.cable.termination_b if self.cable.termination_a == self else self.cable.termination_a + path = [(self, self.cable, far_end)] + + peer_port, position = get_peer_port(far_end, position) + if peer_port is None: + return path + + next_segment = peer_port.trace(position) + if next_segment is None: + return path + [(peer_port, None, None)] + + return path + next_segment + + + # TODO: Deprecate in favor of obj.cable def get_connected_cable(self): """ Return the connected cable if one exists; else None. Assign the far end of the connection on the Cable instance. From cbfb25f00309cc95164df9cb5f8f9a858735e275 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Oct 2018 16:45:20 -0400 Subject: [PATCH 049/191] Initial work on a cable tracing modal --- netbox/project-static/js/cabletrace.js | 24 +++++++++++++++++++ netbox/templates/circuits/provider.html | 2 +- netbox/templates/dcim/device.html | 4 +++- netbox/templates/dcim/inc/interface.html | 3 +++ netbox/templates/dcim/site.html | 2 +- .../inc/{graphs_modal.html => modal.html} | 4 ++-- 6 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 netbox/project-static/js/cabletrace.js rename netbox/templates/inc/{graphs_modal.html => modal.html} (68%) diff --git a/netbox/project-static/js/cabletrace.js b/netbox/project-static/js/cabletrace.js new file mode 100644 index 000000000..2307cef87 --- /dev/null +++ b/netbox/project-static/js/cabletrace.js @@ -0,0 +1,24 @@ +$('#cabletrace_modal').on('show.bs.modal', function (event) { + var button = $(event.relatedTarget); + var obj = button.data('obj'); + var url = button.data('url'); + var modal_title = $(this).find('.modal-title'); + var modal_body = $(this).find('.modal-body'); + modal_title.text(obj); + modal_body.empty(); + $.ajax({ + url: url, + dataType: 'json', + success: function(json) { + $.each(json, function(i, segment) { + modal_body.append( + '
      ' + + '
      ' + segment[0].device.name + '
      ' + segment[0].name + '
      ' + + '
      Cable #' + segment[1].id + '
      ' + + '
      ' + segment[2].device.name + '
      ' + segment[2].name + '
      ' + + '
      ' + ); + }) + } + }); +}); diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index 4ec9adee1..733632342 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -205,7 +205,7 @@
      -{% include 'inc/graphs_modal.html' %} +{% include 'inc/modal.html' with modal_name='graphs' %} {% endblock %} {% block javascript %} diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 29f187825..1c2bbfccd 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -776,7 +776,8 @@ {% endif %}
      -{% include 'inc/graphs_modal.html' %} +{% include 'inc/modal.html' with modal_name='graphs' %} +{% include 'inc/modal.html' with modal_name='cabletrace' %} {% include 'secrets/inc/private_key_modal.html' %} {% endblock %} @@ -847,6 +848,7 @@ $('button.toggle-ips').click(function() { return false; }); + {% endblock %} diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 1ee1706ab..8b6583ace 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -32,6 +32,9 @@ {% if iface.cable %} {{ iface.cable }} + {% else %} — {% endif %} diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index f4623b57b..8fedfbcee 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -330,7 +330,7 @@
      -{% include 'inc/graphs_modal.html' %} +{% include 'inc/modal.html' with modal_name='graphs' %} {% endblock %} {% block javascript %} diff --git a/netbox/templates/inc/graphs_modal.html b/netbox/templates/inc/modal.html similarity index 68% rename from netbox/templates/inc/graphs_modal.html rename to netbox/templates/inc/modal.html index 29eaf18bf..b70b9115f 100644 --- a/netbox/templates/inc/graphs_modal.html +++ b/netbox/templates/inc/modal.html @@ -1,9 +1,9 @@ -
      diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html index a1b236dcc..bdfd6faae 100644 --- a/netbox/templates/circuits/inc/circuit_termination.html +++ b/netbox/templates/circuits/inc/circuit_termination.html @@ -39,10 +39,17 @@ Termination - {% if termination.interface %} - {{ termination.interface.device }} - {{ termination.interface }} + {% if termination.connected_endpoint %} + {{ termination.connected_endpoint.device }} + {{ termination.connected_endpoint }} {% else %} + {% if perms.circuits.change_circuittermination %} +
      + + Connect + +
      + {% endif %} Not defined {% endif %} @@ -61,8 +68,8 @@ IP Addressing - {% if termination.interface %} - {% for ip in termination.interface.ip_addresses.all %} + {% if termination.connected_endpoint %} + {% for ip in termination.connected_endpoint.ip_addresses.all %} {% if not forloop.first %}
      {% endif %} {{ ip }} ({{ ip.vrf|default:"Global" }}) {% empty %} diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html index f067bd8d5..ecce56118 100644 --- a/netbox/templates/dcim/cable_connect.html +++ b/netbox/templates/dcim/cable_connect.html @@ -29,30 +29,59 @@ A Side
      -
      - -
      -

      {{ termination_a.device.site }}

      + {% if termination_a.device %} + {# Device component #} +
      + +
      +

      {{ termination_a.device.site }}

      +
      -
      -
      - -
      -

      {{ termination_a.device.rack|default:"None" }}

      +
      + +
      +

      {{ termination_a.device.rack|default:"None" }}

      +
      -
      -
      - -
      -

      {{ termination_a.device }}

      +
      + +
      +

      {{ termination_a.device }}

      +
      -
      -
      - -
      -

      {{ termination_a }}

      +
      + +
      +

      {{ termination_a }}

      +
      -
      + {% else %} + {# Circuit termination #} +
      + +
      +

      {{ termination_a.site }}

      +
      +
      +
      + +
      +

      {{ termination_a.circuit.provider }}

      +
      +
      +
      + +
      +

      {{ termination_a.circuit.cid }}

      +
      +
      +
      + +
      +

      {{ termination_a.term_side }}

      +
      +
      + {% endif %}
      diff --git a/netbox/templates/dcim/inc/cable_termination.html b/netbox/templates/dcim/inc/cable_termination.html index 8ff74b855..e1b0959bb 100644 --- a/netbox/templates/dcim/inc/cable_termination.html +++ b/netbox/templates/dcim/inc/cable_termination.html @@ -1,12 +1,29 @@ - - - - - - - - + {% if termination.device %} + {# Device component #} + + + + + + + + + {% else %} + {# Circuit termination #} + + + + + + + + + {% endif %}
      Device - {{ termination.device }} -
      Component{{ termination }}
      Device + {{ termination.device }} +
      Component{{ termination }}
      Provider + {{ termination.circuit.provider }} +
      Circuit + {{ termination.circuit }} (Side {{ termination.term_side }}) +
      diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 8b6583ace..a3bc3400a 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -50,17 +50,17 @@ Virtual interface {% elif iface.is_wireless %} Wireless interface - {% elif iface.connected_endpoint %} - {% with connected_iface=iface.connected_endpoint %} - - {{ connected_iface.device }} - - - {{ connected_iface }} - - {% endwith %} - {% elif iface.circuit_termination %} - {% with iface.circuit_termination.get_peer_termination as peer_termination %} + {% elif iface.connected_endpoint.name %} + {# Connected to an Interface #} + + {{ iface.connected_endpoint.device }} + + + {{ iface.connected_endpoint }} + + {% elif iface.connected_endpoint.term_side %} + {# Connected to a CircuitTermination #} + {% with iface.connected_endpoint.get_peer_termination as peer_termination %} {% if peer_termination %} @@ -72,7 +72,7 @@ {% endif %} via {% endif %} - {{ iface.circuit_termination.circuit }} + {{ iface.connected_endpoint.circuit }} {% endwith %} {% else %} @@ -84,7 +84,7 @@ {# Buttons #} {% if show_graphs %} - {% if iface.circuit_termination or iface.connected_endpoint %} + {% if iface.connected_endpoint %} @@ -110,13 +110,6 @@ - {% elif iface.circuit_termination and perms.circuits.change_circuittermination %} - - - - {% else %} From 3420b5fbdf226243e8c058c0ba5afc9809d7a65c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 30 Oct 2018 14:27:45 -0400 Subject: [PATCH 051/191] CircuitTermination should inherit from CableTermination --- netbox/circuits/migrations/0013_cables.py | 9 +++++++-- netbox/circuits/models.py | 3 ++- netbox/dcim/models.py | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/netbox/circuits/migrations/0013_cables.py b/netbox/circuits/migrations/0013_cables.py index dfdfedb96..a2784ed0d 100644 --- a/netbox/circuits/migrations/0013_cables.py +++ b/netbox/circuits/migrations/0013_cables.py @@ -57,7 +57,7 @@ class Migration(migrations.Migration): operations = [ - # Add CircuitTermination.connected_endpoint + # Add new CircuitTermination fields migrations.AddField( model_name='circuittermination', name='connected_endpoint', @@ -68,11 +68,16 @@ class Migration(migrations.Migration): name='connection_status', field=models.NullBooleanField(default=True), ), + migrations.AddField( + model_name='circuittermination', + name='cable', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + ), # Copy CircuitTermination connections to Interfaces as Cables migrations.RunPython(circuit_terminations_to_cables), - # Model changes + # Remove interface field from CircuitTermination migrations.RemoveField( model_name='circuittermination', name='interface', diff --git a/netbox/circuits/models.py b/netbox/circuits/models.py index 2b01965c6..5572f1626 100644 --- a/netbox/circuits/models.py +++ b/netbox/circuits/models.py @@ -5,6 +5,7 @@ from taggit.managers import TaggableManager from dcim.constants import CONNECTION_STATUS_CHOICES, CONNECTION_STATUS_CONNECTED, STATUS_CLASSES from dcim.fields import ASNField +from dcim.models import CableTermination from extras.models import CustomFieldModel, ObjectChange from utilities.models import ChangeLoggedModel from utilities.utils import serialize_object @@ -211,7 +212,7 @@ class Circuit(ChangeLoggedModel, CustomFieldModel): return self._get_termination('Z') -class CircuitTermination(models.Model): +class CircuitTermination(CableTermination): circuit = models.ForeignKey( to='circuits.Circuit', on_delete=models.CASCADE, diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 9889f9466..90a58bfb3 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -15,7 +15,6 @@ from mptt.models import MPTTModel, TreeForeignKey from taggit.managers import TaggableManager from timezone_field import TimeZoneField -from circuits.models import Circuit, CircuitTermination from extras.models import ConfigContextModel, CustomFieldModel, ObjectChange from utilities.fields import ColorField, NullableCharField from utilities.managers import NaturalOrderByManager @@ -336,6 +335,7 @@ class Site(ChangeLoggedModel, CustomFieldModel): @property def count_circuits(self): + from circuits.models import Circuit return Circuit.objects.filter(terminations__site=self).count() @property @@ -2023,6 +2023,8 @@ class Interface(CableTermination, ComponentModel): @connected_endpoint.setter def connected_endpoint(self, value): + from circuits.models import CircuitTermination + if value is None: self._connected_interface = None self._connected_circuittermination = None From 2fa1c81070428541faf5cbda65e9cf455c7e7a66 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 30 Oct 2018 14:28:46 -0400 Subject: [PATCH 052/191] Added initial tests for cable connections --- netbox/dcim/api/serializers.py | 4 +- netbox/dcim/tests/test_api.py | 376 ++++++++++++++++++++++++++++++++- 2 files changed, 371 insertions(+), 9 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 93e7092f6..3d55a5896 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -501,8 +501,8 @@ class CableSerializer(ValidatedModelSerializer): termination_b_type = ContentTypeField() termination_a = serializers.SerializerMethodField(read_only=True) termination_b = serializers.SerializerMethodField(read_only=True) - status = ChoiceField(choices=CONNECTION_STATUS_CHOICES) - length_unit = ChoiceField(choices=LENGTH_UNIT_CHOICES) + status = ChoiceField(choices=CONNECTION_STATUS_CHOICES, required=False) + length_unit = ChoiceField(choices=LENGTH_UNIT_CHOICES, required=False) class Meta: model = Cable diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index d63348751..f0f96d431 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -2,15 +2,13 @@ from django.urls import reverse from netaddr import IPNetwork from rest_framework import status -from dcim.constants import ( - IFACE_FF_1GE_FIXED, IFACE_FF_LAG, IFACE_MODE_TAGGED, SITE_STATUS_ACTIVE, SUBDEVICE_ROLE_CHILD, - SUBDEVICE_ROLE_PARENT, -) +from circuits.models import Circuit, CircuitTermination, CircuitType, Provider +from dcim.constants import * from dcim.models import ( - ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, Interface, InterfaceTemplate, Manufacturer, + Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, + DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, Interface, InterfaceTemplate, Manufacturer, InventoryItem, Platform, PowerPort, PowerPortTemplate, PowerOutlet, PowerOutletTemplate, Rack, RackGroup, - RackReservation, RackRole, Region, Site, VirtualChassis, + RackReservation, RackRole, RearPort, Region, Site, VirtualChassis, ) from ipam.models import IPAddress, VLAN from extras.models import Graph, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE @@ -2801,6 +2799,370 @@ class InventoryItemTest(APITestCase): self.assertEqual(InventoryItem.objects.count(), 2) +class CableTest(APITestCase): + + def setUp(self): + + super(CableTest, self).setUp() + + self.site = Site.objects.create( + name='Test Site 1', slug='test-site-1' + ) + manufacturer = Manufacturer.objects.create( + name='Test Manufacturer 1', slug='test-manufacturer-1' + ) + devicetype = DeviceType.objects.create( + manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1' + ) + devicerole = DeviceRole.objects.create( + name='Test Device Role 1', slug='test-device-role-1', color='ff0000' + ) + self.device1 = Device.objects.create( + device_type=devicetype, device_role=devicerole, name='Test Device 1', site=self.site + ) + self.device2 = Device.objects.create( + device_type=devicetype, device_role=devicerole, name='Test Device 2', site=self.site + ) + self.panel1 = Device.objects.create( + device_type=devicetype, device_role=devicerole, name='Test Panel 1', site=self.site + ) + self.panel2 = Device.objects.create( + device_type=devicetype, device_role=devicerole, name='Test Panel 2', site=self.site + ) + + def test_create_direct_console_connection(self): + + consoleport1 = ConsolePort.objects.create( + device=self.device1, name='Test Console Port 1' + ) + consoleserverport1 = ConsoleServerPort.objects.create( + device=self.device2, name='Test Console Server Port 1' + ) + + data = { + 'termination_a_type': 'dcim.consoleport', + 'termination_a_id': consoleport1.pk, + 'termination_b_type': 'dcim.consoleserverport', + 'termination_b_id': consoleserverport1.pk, + } + + url = reverse('dcim-api:cable-list') + response = self.client.post(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_201_CREATED) + self.assertEqual(Cable.objects.count(), 1) + + cable = Cable.objects.get(pk=response.data['id']) + consoleport1 = ConsolePort.objects.get(pk=consoleport1.pk) + consoleserverport1 = ConsoleServerPort.objects.get(pk=consoleserverport1.pk) + + self.assertEqual(cable.termination_a, consoleport1) + self.assertEqual(cable.termination_b, consoleserverport1) + self.assertEqual(consoleport1.cable, cable) + self.assertEqual(consoleserverport1.cable, cable) + self.assertEqual(consoleport1.connected_endpoint, consoleserverport1) + self.assertEqual(consoleserverport1.connected_endpoint, consoleport1) + + def test_create_patched_console_connection(self): + + consoleport1 = ConsolePort.objects.create( + device=self.device1, name='Test Console Port 1' + ) + consoleserverport1 = ConsoleServerPort.objects.create( + device=self.device2, name='Test Console Server Port 1' + ) + rearport1 = RearPort.objects.create( + device=self.panel1, name='Test Rear Port 1', type=PORT_TYPE_8P8C + ) + frontport1 = FrontPort.objects.create( + device=self.panel1, name='Test Front Port 1', type=PORT_TYPE_8P8C, rear_port=rearport1 + ) + rearport2 = RearPort.objects.create( + device=self.panel2, name='Test Rear Port 2', type=PORT_TYPE_8P8C + ) + frontport2 = FrontPort.objects.create( + device=self.panel2, name='Test Front Port 2', type=PORT_TYPE_8P8C, rear_port=rearport2 + ) + + url = reverse('dcim-api:cable-list') + cables = [ + # Console port to panel1 front + { + 'termination_a_type': 'dcim.consoleport', + 'termination_a_id': consoleport1.pk, + 'termination_b_type': 'dcim.frontport', + 'termination_b_id': frontport1.pk, + }, + # Panel1 rear to panel2 rear + { + 'termination_a_type': 'dcim.rearport', + 'termination_a_id': rearport1.pk, + 'termination_b_type': 'dcim.rearport', + 'termination_b_id': rearport2.pk, + }, + # Panel2 front to console server port + { + 'termination_a_type': 'dcim.frontport', + 'termination_a_id': frontport2.pk, + 'termination_b_type': 'dcim.consoleserverport', + 'termination_b_id': consoleserverport1.pk, + }, + ] + + for data in cables: + + response = self.client.post(url, data, format='json', **self.header) + self.assertHttpStatus(response, status.HTTP_201_CREATED) + + cable = Cable.objects.get(pk=response.data['id']) + self.assertEqual(cable.termination_a.cable, cable) + self.assertEqual(cable.termination_b.cable, cable) + + consoleport1 = ConsolePort.objects.get(pk=consoleport1.pk) + consoleserverport1 = ConsoleServerPort.objects.get(pk=consoleserverport1.pk) + self.assertEqual(consoleport1.connected_endpoint, consoleserverport1) + self.assertEqual(consoleserverport1.connected_endpoint, consoleport1) + + def test_create_direct_power_connection(self): + + powerport1 = PowerPort.objects.create( + device=self.device1, name='Test Power Port 1' + ) + poweroutlet1 = PowerOutlet.objects.create( + device=self.device2, name='Test Power Outlet 1' + ) + + data = { + 'termination_a_type': 'dcim.powerport', + 'termination_a_id': powerport1.pk, + 'termination_b_type': 'dcim.poweroutlet', + 'termination_b_id': poweroutlet1.pk, + } + + url = reverse('dcim-api:cable-list') + response = self.client.post(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_201_CREATED) + self.assertEqual(Cable.objects.count(), 1) + + cable = Cable.objects.get(pk=response.data['id']) + powerport1 = PowerPort.objects.get(pk=powerport1.pk) + poweroutlet1 = PowerOutlet.objects.get(pk=poweroutlet1.pk) + + self.assertEqual(cable.termination_a, powerport1) + self.assertEqual(cable.termination_b, poweroutlet1) + self.assertEqual(powerport1.cable, cable) + self.assertEqual(poweroutlet1.cable, cable) + self.assertEqual(powerport1.connected_endpoint, poweroutlet1) + self.assertEqual(poweroutlet1.connected_endpoint, powerport1) + + # Note: Power connections via patch ports are not supported. + + def test_create_direct_interface_connection(self): + + interface1 = Interface.objects.create( + device=self.device1, name='Test Interface 1' + ) + interface2 = Interface.objects.create( + device=self.device2, name='Test Interface 2' + ) + + data = { + 'termination_a_type': 'dcim.interface', + 'termination_a_id': interface1.pk, + 'termination_b_type': 'dcim.interface', + 'termination_b_id': interface2.pk, + } + + url = reverse('dcim-api:cable-list') + response = self.client.post(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_201_CREATED) + self.assertEqual(Cable.objects.count(), 1) + + cable = Cable.objects.get(pk=response.data['id']) + interface1 = Interface.objects.get(pk=interface1.pk) + interface2 = Interface.objects.get(pk=interface2.pk) + + self.assertEqual(cable.termination_a, interface1) + self.assertEqual(cable.termination_b, interface2) + self.assertEqual(interface1.cable, cable) + self.assertEqual(interface2.cable, cable) + self.assertEqual(interface1.connected_endpoint, interface2) + self.assertEqual(interface2.connected_endpoint, interface1) + + def test_create_patched_interface_connection(self): + + interface1 = Interface.objects.create( + device=self.device1, name='Test Interface 1' + ) + interface2 = Interface.objects.create( + device=self.device2, name='Test Interface 2' + ) + rearport1 = RearPort.objects.create( + device=self.panel1, name='Test Rear Port 1', type=PORT_TYPE_8P8C + ) + frontport1 = FrontPort.objects.create( + device=self.panel1, name='Test Front Port 1', type=PORT_TYPE_8P8C, rear_port=rearport1 + ) + rearport2 = RearPort.objects.create( + device=self.panel2, name='Test Rear Port 2', type=PORT_TYPE_8P8C + ) + frontport2 = FrontPort.objects.create( + device=self.panel2, name='Test Front Port 2', type=PORT_TYPE_8P8C, rear_port=rearport2 + ) + + url = reverse('dcim-api:cable-list') + cables = [ + # Interface1 to panel1 front + { + 'termination_a_type': 'dcim.interface', + 'termination_a_id': interface1.pk, + 'termination_b_type': 'dcim.frontport', + 'termination_b_id': frontport1.pk, + }, + # Panel1 rear to panel2 rear + { + 'termination_a_type': 'dcim.rearport', + 'termination_a_id': rearport1.pk, + 'termination_b_type': 'dcim.rearport', + 'termination_b_id': rearport2.pk, + }, + # Panel2 front to interface2 + { + 'termination_a_type': 'dcim.frontport', + 'termination_a_id': frontport2.pk, + 'termination_b_type': 'dcim.interface', + 'termination_b_id': interface2.pk, + }, + ] + + for data in cables: + + response = self.client.post(url, data, format='json', **self.header) + self.assertHttpStatus(response, status.HTTP_201_CREATED) + + cable = Cable.objects.get(pk=response.data['id']) + self.assertEqual(cable.termination_a.cable, cable) + self.assertEqual(cable.termination_b.cable, cable) + + interface1 = Interface.objects.get(pk=interface1.pk) + interface2 = Interface.objects.get(pk=interface2.pk) + self.assertEqual(interface1.connected_endpoint, interface2) + self.assertEqual(interface2.connected_endpoint, interface1) + + def test_create_direct_circuittermination_connection(self): + + provider = Provider.objects.create( + name='Test Provider 1', slug='test-provider-1' + ) + circuittype = CircuitType.objects.create( + name='Test Circuit Type 1', slug='test-circuit-type-1' + ) + circuit = Circuit.objects.create( + provider=provider, type=circuittype, cid='Test Circuit 1' + ) + interface1 = Interface.objects.create( + device=self.device1, name='Test Interface 1' + ) + circuittermination1 = CircuitTermination.objects.create( + circuit=circuit, term_side='A', site=self.site, port_speed=10000 + ) + + data = { + 'termination_a_type': 'dcim.interface', + 'termination_a_id': interface1.pk, + 'termination_b_type': 'circuits.circuittermination', + 'termination_b_id': circuittermination1.pk, + } + + url = reverse('dcim-api:cable-list') + response = self.client.post(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_201_CREATED) + self.assertEqual(Cable.objects.count(), 1) + + cable = Cable.objects.get(pk=response.data['id']) + interface1 = Interface.objects.get(pk=interface1.pk) + circuittermination1 = CircuitTermination.objects.get(pk=circuittermination1.pk) + + self.assertEqual(cable.termination_a, interface1) + self.assertEqual(cable.termination_b, circuittermination1) + self.assertEqual(interface1.cable, cable) + self.assertEqual(circuittermination1.cable, cable) + self.assertEqual(interface1.connected_endpoint, circuittermination1) + self.assertEqual(circuittermination1.connected_endpoint, interface1) + + def test_create_patched_circuittermination_connection(self): + + provider = Provider.objects.create( + name='Test Provider 1', slug='test-provider-1' + ) + circuittype = CircuitType.objects.create( + name='Test Circuit Type 1', slug='test-circuit-type-1' + ) + circuit = Circuit.objects.create( + provider=provider, type=circuittype, cid='Test Circuit 1' + ) + interface1 = Interface.objects.create( + device=self.device1, name='Test Interface 1' + ) + circuittermination1 = CircuitTermination.objects.create( + circuit=circuit, term_side='A', site=self.site, port_speed=10000 + ) + rearport1 = RearPort.objects.create( + device=self.panel1, name='Test Rear Port 1', type=PORT_TYPE_8P8C + ) + frontport1 = FrontPort.objects.create( + device=self.panel1, name='Test Front Port 1', type=PORT_TYPE_8P8C, rear_port=rearport1 + ) + rearport2 = RearPort.objects.create( + device=self.panel2, name='Test Rear Port 2', type=PORT_TYPE_8P8C + ) + frontport2 = FrontPort.objects.create( + device=self.panel2, name='Test Front Port 2', type=PORT_TYPE_8P8C, rear_port=rearport2 + ) + + url = reverse('dcim-api:cable-list') + cables = [ + # Interface to panel1 front + { + 'termination_a_type': 'dcim.interface', + 'termination_a_id': interface1.pk, + 'termination_b_type': 'dcim.frontport', + 'termination_b_id': frontport1.pk, + }, + # Panel1 rear to panel2 rear + { + 'termination_a_type': 'dcim.rearport', + 'termination_a_id': rearport1.pk, + 'termination_b_type': 'dcim.rearport', + 'termination_b_id': rearport2.pk, + }, + # Panel2 front to circuit termination + { + 'termination_a_type': 'dcim.frontport', + 'termination_a_id': frontport2.pk, + 'termination_b_type': 'circuits.circuittermination', + 'termination_b_id': circuittermination1.pk, + }, + ] + + for data in cables: + + response = self.client.post(url, data, format='json', **self.header) + self.assertHttpStatus(response, status.HTTP_201_CREATED) + + cable = Cable.objects.get(pk=response.data['id']) + self.assertEqual(cable.termination_a.cable, cable) + self.assertEqual(cable.termination_b.cable, cable) + + interface1 = Interface.objects.get(pk=interface1.pk) + circuittermination1 = CircuitTermination.objects.get(pk=circuittermination1.pk) + self.assertEqual(interface1.connected_endpoint, circuittermination1) + self.assertEqual(circuittermination1.connected_endpoint, interface1) + + class ConsoleConnectionTest(APITestCase): def setUp(self): From aad4f58633dc7863497aa3121b33d621fbd2cc3d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 30 Oct 2018 14:53:41 -0400 Subject: [PATCH 053/191] Add 'cable' field to CircuitTermination serializer --- netbox/circuits/api/serializers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/netbox/circuits/api/serializers.py b/netbox/circuits/api/serializers.py index 8b6923121..33f571c7e 100644 --- a/netbox/circuits/api/serializers.py +++ b/netbox/circuits/api/serializers.py @@ -3,7 +3,7 @@ from taggit_serializer.serializers import TaggitSerializer, TagListSerializerFie from circuits.constants import CIRCUIT_STATUS_CHOICES from circuits.models import Provider, Circuit, CircuitTermination, CircuitType -from dcim.api.serializers import NestedSiteSerializer +from dcim.api.serializers import NestedCableSerializer, NestedSiteSerializer from extras.api.customfields import CustomFieldModelSerializer from tenancy.api.serializers import NestedTenantSerializer from utilities.api import ChoiceField, ValidatedModelSerializer, WritableNestedSerializer @@ -85,11 +85,12 @@ class NestedCircuitSerializer(WritableNestedSerializer): class CircuitTerminationSerializer(ValidatedModelSerializer): circuit = NestedCircuitSerializer() site = NestedSiteSerializer() + cable = NestedCableSerializer(read_only=True) class Meta: model = CircuitTermination fields = [ - 'id', 'circuit', 'term_side', 'site', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', + 'id', 'circuit', 'term_side', 'site', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'cable', ] From 60f5371b3196b7127f3feb833aa8f37fdbd71bdd Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 30 Oct 2018 14:54:29 -0400 Subject: [PATCH 054/191] Fix front ports queryset --- netbox/dcim/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 3650cf0a1..e924979cd 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -2032,7 +2032,7 @@ class FrontPortCreateForm(ComponentForm): # Determine which rear port positions are occupied. These will be excluded from the list of available mappings. occupied_port_positions = [ (front_port.rear_port_id, front_port.rear_port_position) - for front_port in self.parent.front_port_templates.all() + for front_port in self.parent.frontports.all() ] # Populate rear port choices From e1e9a451da911daf989d0ef29151e3ade39c0e5f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 30 Oct 2018 14:57:49 -0400 Subject: [PATCH 055/191] PEP8 fix --- netbox/dcim/models.py | 1 - 1 file changed, 1 deletion(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 90a58bfb3..5b5f6cd10 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -122,7 +122,6 @@ class CableTermination(models.Model): return path + next_segment - # TODO: Deprecate in favor of obj.cable def get_connected_cable(self): """ From 10492de50d3e15750214fc39d72e027e60152c0b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 30 Oct 2018 14:58:04 -0400 Subject: [PATCH 056/191] Fix NestedCableSerializer --- netbox/dcim/api/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 3d55a5896..8a2ff2122 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -546,7 +546,7 @@ class TracedCableSerializer(serializers.ModelSerializer): ] -class NestedCableSerializer(serializers.Serializer): +class NestedCableSerializer(serializers.ModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail') class Meta: From 62ca511619317a868db6bf9d5a013b8744755cc4 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 30 Oct 2018 15:12:14 -0400 Subject: [PATCH 057/191] Updated documentation --- docs/core-functionality/devices.md | 40 ++++++++++++++++-------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/docs/core-functionality/devices.md b/docs/core-functionality/devices.md index 5ae599c73..1c66afdae 100644 --- a/docs/core-functionality/devices.md +++ b/docs/core-functionality/devices.md @@ -4,12 +4,6 @@ A device type represents a particular make and model of hardware that exists in Device types are instantiated as devices installed within racks. For example, you might define a device type to represent a Juniper EX4300-48T network switch with 48 Ethernet interfaces. You can then create multiple devices of this type named "switch1," "switch2," and so on. Each device will inherit the components (such as interfaces) of its device type at the time of creation. (However, changes made to a device type will **not** apply to instances of that device type retroactively.) -The device type model includes three flags which inform what type of components may be added to it: - -* `is_console_server`: This device type has console server ports -* `is_pdu`: This device type has power outlets -* `is_network_device`: This device type has network interfaces - Some devices house child devices which share physical resources, like space and power, but which functional independently from one another. A common example of this is blade server chassis. Each device type is designated as one of the following: * A parent device (which has device bays) @@ -32,6 +26,8 @@ Each device type is assigned a number of component templates which define the ph * Power ports * Power outlets * Network interfaces +* Front ports +* Rear ports * Device bays (which house child devices) Whenever a new device is created, its components are automatically created per the templates assigned to its device type. For example, a Juniper EX4300-48T device type might have the following component templates defined: @@ -56,32 +52,28 @@ When assigning a multi-U device to a rack, it is considered to be mounted in the A device is said to be full depth if its installation on one rack face prevents the installation of any other device on the opposite face within the same rack unit(s). This could be either because the device is physically too deep to allow a device behind it, or because the installation of an opposing device would impede airflow. -## Device Roles +## Device Components -Devices can be organized by functional roles. These roles are fully customizable. For example, you might create roles for core switches, distribution switches, and access switches. - ---- - -# Device Components - -There are six types of device components which comprise all of the interconnection logic with NetBox: +There are eight types of device components which comprise all of the interconnection logic with NetBox: * Console ports * Console server ports * Power ports * Power outlets * Network interfaces +* Front ports +* Rear ports * Device bays -## Console +### Console Console ports connect only to console server ports. Console connections can be marked as either *planned* or *connected*. -## Power +### Power Power ports connect only to power outlets. Power connections can be marked as either *planned* or *connected*. -## Interfaces +### Interfaces Interfaces connect to one another in a symmetric manner: If interface A connects to interface B, interface B therefore connects to interface A. Each type of connection can be classified as either *planned* or *connected*. @@ -91,12 +83,24 @@ Each interface can also be enabled or disabled, and optionally designated as man VLANs can be assigned to each interface as either tagged or untagged. (An interface may have only one untagged VLAN.) -## Device Bays +### Pass-through Ports + +Pass-through ports are used to model physical terminations which comprise part of a longer path, such as a cable terminated to a patch panel. Each front port maps to a position on a rear port. A 24-port UTP patch panel, for instance, would have 24 front ports and 24 rear ports. Although this relationship is typically one-to-one, a rear port may have multiple front ports mapped to it. This can be useful for modeling instances where multiple paths share a common cable (for example, six different fiber connections sharing a 12-strand MPO cable). + +Pass-through ports can also be used to model "bump in the wire" devices, such as a media convertor or passive tap. + +### Device Bays Device bays represent the ability of a device to house child devices. For example, you might install four blade servers into a 2U chassis. The chassis would appear in the rack elevation as a 2U device with four device bays. Each server within it would be defined as a 0U device installed in one of the device bays. Child devices do not appear within rack elevations, but they are included in the "Non-Racked Devices" list within the rack view. --- +# Device Roles + +Devices can be organized by functional roles. These roles are fully customizable. For example, you might create roles for core switches, distribution switches, and access switches. + +--- + # Platforms A platform defines the type of software running on a device or virtual machine. This can be helpful when it is necessary to distinguish between, for instance, different feature sets. Note that two devices of the same type may be assigned different platforms: for example, one Juniper MX240 running Junos 14 and another running Junos 15. From 669fe1f192536c294f7e8563413bd787bf7fcdab Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 30 Oct 2018 15:16:15 -0400 Subject: [PATCH 058/191] Add missing interfaces table --- netbox/templates/dcim/devicetype.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 873de28c7..082726ef6 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -160,6 +160,13 @@
      {% endif %} +{% if devicetype.interface_templates.exists %} +
      +
      + {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfacaes' add_url='dcim:devicetype_add_interface' delete_url='dcim:devicetype_delete_interface' %} +
      +
      +{% endif %} {% if devicetype.power_outlet_templates.exists %}
      From 470aabe1d7cc1f628892121ed6b1162fc9ed2bf8 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 30 Oct 2018 16:30:03 -0400 Subject: [PATCH 059/191] Added dedicated cable trace view; removed modal --- netbox/circuits/urls.py | 3 +- netbox/dcim/models.py | 8 ++++ netbox/dcim/urls.py | 11 ++++- netbox/dcim/views.py | 15 +++++++ .../circuits/inc/circuit_termination.html | 9 ++-- netbox/templates/dcim/cable_trace.html | 42 +++++++++++++++++++ netbox/templates/dcim/device.html | 2 - .../templates/dcim/inc/cable_trace_end.html | 27 ++++++++++++ netbox/templates/dcim/inc/interface.html | 4 +- 9 files changed, 111 insertions(+), 10 deletions(-) create mode 100644 netbox/templates/dcim/cable_trace.html create mode 100644 netbox/templates/dcim/inc/cable_trace_end.html diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py index b0920d9cd..be1106308 100644 --- a/netbox/circuits/urls.py +++ b/netbox/circuits/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url -from dcim.views import CableCreateView +from dcim.views import CableCreateView, CableTraceView from extras.views import ObjectChangeLogView from . import views from .models import Circuit, CircuitTermination, CircuitType, Provider @@ -44,5 +44,6 @@ urlpatterns = [ url(r'^circuit-terminations/(?P\d+)/edit/$', views.CircuitTerminationEditView.as_view(), name='circuittermination_edit'), url(r'^circuit-terminations/(?P\d+)/delete/$', views.CircuitTerminationDeleteView.as_view(), name='circuittermination_delete'), url(r'^circuit-terminations/(?P\d+)/connect/$', CableCreateView.as_view(), name='circuittermination_connect', kwargs={'termination_a_type': CircuitTermination}), + url(r'^circuit-terminations/(?P\d+)/trace/$', CableTraceView.as_view(), name='circuittermination_trace', kwargs={'model': CircuitTermination}), ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 5b5f6cd10..4014d00e5 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -85,6 +85,7 @@ class CableTermination(models.Model): ] """ def get_peer_port(termination, position=1): + from circuits.models import CircuitTermination # Map a front port to its corresponding rear port if isinstance(termination, FrontPort): @@ -102,6 +103,13 @@ class CableTermination(models.Model): ) return peer_port, 1 + # Follow a circuit to its other termination + elif isinstance(termination, CircuitTermination): + peer_termination = termination.get_peer_termination() + if peer_termination is None: + return None, None + return peer_termination, position + # Termination is not a pass-through port else: return None, None diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 9a669d4f1..13ffec1ec 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -5,8 +5,8 @@ from ipam.views import ServiceCreateView from secrets.views import secret_add from . import views from .models import ( - ConsolePort, ConsoleServerPort, Device, DeviceRole, DeviceType, Interface, Manufacturer, Platform, PowerPort, - PowerOutlet, Rack, RackGroup, RackReservation, RackRole, Region, Site, VirtualChassis, + ConsolePort, ConsoleServerPort, Device, DeviceRole, DeviceType, FrontPort, Interface, Manufacturer, Platform, + PowerPort, PowerOutlet, Rack, RackGroup, RackReservation, RackRole, RearPort, Region, Site, VirtualChassis, ) app_name = 'dcim' @@ -166,6 +166,7 @@ urlpatterns = [ url(r'^console-ports/(?P\d+)/disconnect/$', views.ConsolePortDisconnectView.as_view(), name='consoleport_disconnect'), url(r'^console-ports/(?P\d+)/edit/$', views.ConsolePortEditView.as_view(), name='consoleport_edit'), url(r'^console-ports/(?P\d+)/delete/$', views.ConsolePortDeleteView.as_view(), name='consoleport_delete'), + url(r'^console-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='consoleport_trace', kwargs={'model': ConsolePort}), # Console server ports url(r'^devices/console-server-ports/add/$', views.DeviceBulkAddConsoleServerPortView.as_view(), name='device_bulk_add_consoleserverport'), @@ -177,6 +178,7 @@ urlpatterns = [ url(r'^console-server-ports/(?P\d+)/disconnect/$', views.ConsoleServerPortDisconnectView.as_view(), name='consoleserverport_disconnect'), url(r'^console-server-ports/(?P\d+)/edit/$', views.ConsoleServerPortEditView.as_view(), name='consoleserverport_edit'), url(r'^console-server-ports/(?P\d+)/delete/$', views.ConsoleServerPortDeleteView.as_view(), name='consoleserverport_delete'), + url(r'^console-server-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='consoleserverport_trace', kwargs={'model': ConsoleServerPort}), url(r'^console-server-ports/rename/$', views.ConsoleServerPortBulkRenameView.as_view(), name='consoleserverport_bulk_rename'), # Power ports @@ -188,6 +190,7 @@ urlpatterns = [ url(r'^power-ports/(?P\d+)/disconnect/$', views.PowerPortDisconnectView.as_view(), name='powerport_disconnect'), url(r'^power-ports/(?P\d+)/edit/$', views.PowerPortEditView.as_view(), name='powerport_edit'), url(r'^power-ports/(?P\d+)/delete/$', views.PowerPortDeleteView.as_view(), name='powerport_delete'), + url(r'^power-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='powerport_trace', kwargs={'model': PowerPort}), # Power outlets url(r'^devices/power-outlets/add/$', views.DeviceBulkAddPowerOutletView.as_view(), name='device_bulk_add_poweroutlet'), @@ -199,6 +202,7 @@ urlpatterns = [ url(r'^power-outlets/(?P\d+)/disconnect/$', views.PowerOutletDisconnectView.as_view(), name='poweroutlet_disconnect'), url(r'^power-outlets/(?P\d+)/edit/$', views.PowerOutletEditView.as_view(), name='poweroutlet_edit'), url(r'^power-outlets/(?P\d+)/delete/$', views.PowerOutletDeleteView.as_view(), name='poweroutlet_delete'), + url(r'^power-outlets/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='poweroutlet_trace', kwargs={'model': PowerOutlet}), url(r'^power-outlets/rename/$', views.PowerOutletBulkRenameView.as_view(), name='poweroutlet_bulk_rename'), # Interfaces @@ -213,6 +217,7 @@ urlpatterns = [ url(r'^interfaces/(?P\d+)/assign-vlans/$', views.InterfaceAssignVLANsView.as_view(), name='interface_assign_vlans'), url(r'^interfaces/(?P\d+)/delete/$', views.InterfaceDeleteView.as_view(), name='interface_delete'), url(r'^interfaces/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='interface_changelog', kwargs={'model': Interface}), + url(r'^interfaces/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='interface_trace', kwargs={'model': Interface}), url(r'^interfaces/rename/$', views.InterfaceBulkRenameView.as_view(), name='interface_bulk_rename'), # Front ports @@ -221,6 +226,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/front-ports/delete/$', views.FrontPortBulkDeleteView.as_view(), name='frontport_bulk_delete'), url(r'^front-ports/(?P\d+)/edit/$', views.FrontPortEditView.as_view(), name='frontport_edit'), url(r'^front-ports/(?P\d+)/delete/$', views.FrontPortDeleteView.as_view(), name='frontport_delete'), + url(r'^front-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='frontport_trace', kwargs={'model': FrontPort}), url(r'^front-ports/rename/$', views.FrontPortBulkRenameView.as_view(), name='frontport_bulk_rename'), # Rear ports @@ -229,6 +235,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/rear-ports/delete/$', views.RearPortBulkDeleteView.as_view(), name='rearport_bulk_delete'), url(r'^rear-ports/(?P\d+)/edit/$', views.RearPortEditView.as_view(), name='rearport_edit'), url(r'^rear-ports/(?P\d+)/delete/$', views.RearPortDeleteView.as_view(), name='rearport_delete'), + url(r'^rear-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='rearport_trace', kwargs={'model': RearPort}), url(r'^rear-ports/rename/$', views.RearPortBulkRenameView.as_view(), name='rearport_bulk_rename'), # Device bays diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 81b3d28fe..60b998a6f 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2063,6 +2063,21 @@ class CableDeleteView(PermissionRequiredMixin, ObjectDeleteView): default_return_url = 'dcim:cable_list' +class CableTraceView(View): + """ + Trace a cable path beginning from the given termination. + """ + + def get(self, request, model, pk): + + obj = get_object_or_404(model, pk=pk) + + return render(request, 'dcim/cable_trace.html', { + 'obj': obj, + 'trace': obj.trace(), + }) + + # # Connections # diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html index bdfd6faae..560322357 100644 --- a/netbox/templates/circuits/inc/circuit_termination.html +++ b/netbox/templates/circuits/inc/circuit_termination.html @@ -39,9 +39,12 @@ Termination - {% if termination.connected_endpoint %} - {{ termination.connected_endpoint.device }} - {{ termination.connected_endpoint }} + {% if termination.cable %} + {{ termination.cable }} + {% if termination.connected_endpoint %} + to {{ termination.connected_endpoint.device }} + {{ termination.connected_endpoint }} + {% endif %} {% else %} {% if perms.circuits.change_circuittermination %}
      diff --git a/netbox/templates/dcim/cable_trace.html b/netbox/templates/dcim/cable_trace.html new file mode 100644 index 000000000..3211664ad --- /dev/null +++ b/netbox/templates/dcim/cable_trace.html @@ -0,0 +1,42 @@ +{% extends '_base.html' %} +{% load helpers %} + +{% block header %} +

      {% block title %}Cable Trace for {{ obj }}{% endblock %}

      +{% endblock %} + +{% block content %} +
      +
      +

      Near End

      +
      +
      +

      Far End

      +
      +
      + {% for near_end, cable, far_end in trace %} +
      +
      +

      {{ forloop.counter }}

      +
      +
      + {% include 'dcim/inc/cable_trace_end.html' with end=near_end %} +
      +
      +

      + + {% if cable.label %}{{ cable.label }}{% else %}Cable #{{ cable.pk }}{% endif %} + +

      + {{ cable.get_status_display }}
      + {{ cable.get_type_display|default:"" }} + {% if cable.length %}- {{ cable.length }}{{ cable.length_unit }}{% endif %} +   +
      +
      + {% include 'dcim/inc/cable_trace_end.html' with end=far_end %} +
      +
      + {% if not forloop.last %}
      {% endif %} + {% endfor %} +{% endblock %} diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 1c2bbfccd..7c1042d2c 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -777,7 +777,6 @@
      {% include 'inc/modal.html' with modal_name='graphs' %} -{% include 'inc/modal.html' with modal_name='cabletrace' %} {% include 'secrets/inc/private_key_modal.html' %} {% endblock %} @@ -848,7 +847,6 @@ $('button.toggle-ips').click(function() { return false; }); - {% endblock %} diff --git a/netbox/templates/dcim/inc/cable_trace_end.html b/netbox/templates/dcim/inc/cable_trace_end.html new file mode 100644 index 000000000..1ed12c877 --- /dev/null +++ b/netbox/templates/dcim/inc/cable_trace_end.html @@ -0,0 +1,27 @@ +{% load helpers %} + +
      +
      + {% if end.device %} + {{ end.device }} + {% else %} + {{ end.circuit }} + {% endif %} +
      +
      + {% if end.device %} + {# Device component #} + {% with model=end|model_name %} + {{ model|bettertitle }} {{ end }}
      + {% if model == 'interface' %} + {{ end.get_form_factor_display }} + {% elif model == 'front port' or model == 'rear port' %} + {{ end.get_type_display }} + {% endif %} + {% endwith %} + {% else %} + {# Circuit termination #} + Side {{ end.term_side }} + {% endif %} +
      +
      diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index a3bc3400a..cfc41ef9b 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -32,9 +32,9 @@ {% if iface.cable %} {{ iface.cable }} - + {% else %} — {% endif %} From f2f9ff5cbd725558c2d880032dab1fb91adb378c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 31 Oct 2018 11:52:43 -0400 Subject: [PATCH 060/191] Cleaned up migrations --- netbox/circuits/migrations/0013_cables.py | 38 +++++------ netbox/dcim/migrations/0066_cables.py | 81 +++++++++++------------ 2 files changed, 59 insertions(+), 60 deletions(-) diff --git a/netbox/circuits/migrations/0013_cables.py b/netbox/circuits/migrations/0013_cables.py index a2784ed0d..a24b4a5d8 100644 --- a/netbox/circuits/migrations/0013_cables.py +++ b/netbox/circuits/migrations/0013_cables.py @@ -20,28 +20,28 @@ def circuit_terminations_to_cables(apps, schema_editor): # Create a new Cable instance from each console connection print("\n Adding circuit terminations... ", end='', flush=True) for circuittermination in CircuitTermination.objects.filter(interface__isnull=False): - c = Cable() - # We have to assign all fields manually because we're inside a migration. - c.termination_a_type = circuittermination_type - c.termination_a_id = circuittermination.id - c.termination_b_type = interface_type - c.termination_b_id = circuittermination.interface_id - c.connection_status = CONNECTION_STATUS_CONNECTED - c.save() - - # Cache the connected Cable on the CircuitTermination - circuittermination.cable = c - circuittermination.connected_endpoint = circuittermination.interface - circuittermination.connection_status = CONNECTION_STATUS_CONNECTED - circuittermination.save() + # Create the new Cable + cable = Cable.objects.create( + termination_a_type=circuittermination_type, + termination_a_id=circuittermination.id, + termination_b_type=interface_type, + termination_b_id=circuittermination.interface_id, + status=CONNECTION_STATUS_CONNECTED + ) + # Cache the Cable on its two termination points + CircuitTermination.objects.filter(pk=circuittermination.pk).update( + cable=cable, + connected_endpoint=circuittermination.interface, + connection_status=CONNECTION_STATUS_CONNECTED + ) # Cache the connected Cable on the Interface - interface = circuittermination.interface - interface.cable = c - interface._connected_circuittermination = circuittermination - interface.connection_status = CONNECTION_STATUS_CONNECTED - interface.save() + Interface.objects.filter(pk=circuittermination.interface_id).update( + cable=cable, + _connected_circuittermination=circuittermination, + connection_status=CONNECTION_STATUS_CONNECTED + ) cable_count = Cable.objects.filter(termination_a_type=circuittermination_type).count() print("{} cables created".format(cable_count)) diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py index 3358900ae..f05dcf418 100644 --- a/netbox/dcim/migrations/0066_cables.py +++ b/netbox/dcim/migrations/0066_cables.py @@ -19,19 +19,19 @@ def console_connections_to_cables(apps, schema_editor): # Create a new Cable instance from each console connection print("\n Adding console connections... ", end='', flush=True) for consoleport in ConsolePort.objects.filter(connected_endpoint__isnull=False): - c = Cable() - # We have to assign GFK fields manually because we're inside a migration. - c.termination_a_type = consoleport_type - c.termination_a_id = consoleport.id - c.termination_b_type = consoleserverport_type - c.termination_b_id = consoleport.connected_endpoint_id - c.connection_status = consoleport.connection_status - c.save() + # Create the new Cable + cable = Cable.objects.create( + termination_a_type=consoleport_type, + termination_a_id=consoleport.id, + termination_b_type=consoleserverport_type, + termination_b_id=consoleport.connected_endpoint_id, + status=consoleport.connection_status + ) - # Cache the Cable on its two termination points (replicate Cable.save()) - ConsolePort.objects.filter(pk=consoleport.id).update(cable=c) - ConsoleServerPort.objects.filter(pk=consoleport.connected_endpoint_id).update(cable=c) + # Cache the Cable on its two termination points + ConsolePort.objects.filter(pk=consoleport.id).update(cable=cable) + ConsoleServerPort.objects.filter(pk=consoleport.connected_endpoint_id).update(cable=cable) cable_count = Cable.objects.filter(termination_a_type=consoleport_type).count() print("{} cables created".format(cable_count)) @@ -53,19 +53,19 @@ def power_connections_to_cables(apps, schema_editor): # Create a new Cable instance from each power connection print(" Adding power connections... ", end='', flush=True) for powerport in PowerPort.objects.filter(connected_endpoint__isnull=False): - c = Cable() - # We have to assign GFK fields manually because we're inside a migration. - c.termination_a_type = powerport_type - c.termination_a_id = powerport.id - c.termination_b_type = poweroutlet_type - c.termination_b_id = powerport.connected_endpoint_id - c.connection_status = powerport.connection_status - c.save() + # Create the new Cable + cable = Cable.objects.create( + termination_a_type=powerport_type, + termination_a_id=powerport.id, + termination_b_type=poweroutlet_type, + termination_b_id=powerport.connected_endpoint_id, + status=powerport.connection_status + ) - # Cache the Cable on its two termination points (replicate Cable.save()) - PowerPort.objects.filter(pk=powerport.id).update(cable=c) - PowerOutlet.objects.filter(pk=powerport.connected_endpoint_id).update(cable=c) + # Cache the Cable on its two termination points + PowerPort.objects.filter(pk=powerport.id).update(cable=cable) + PowerOutlet.objects.filter(pk=powerport.connected_endpoint_id).update(cable=cable) cable_count = Cable.objects.filter(termination_a_type=powerport_type).count() print("{} cables created".format(cable_count)) @@ -86,28 +86,27 @@ def interface_connections_to_cables(apps, schema_editor): # Create a new Cable instance from each InterfaceConnection print(" Adding interface connections... ", end='', flush=True) for conn in InterfaceConnection.objects.all(): - c = Cable() - # We have to assign all fields manually because we're inside a migration. - c.termination_a_type = interface_type - c.termination_a_id = conn.interface_a_id - c.termination_b_type = interface_type - c.termination_b_id = conn.interface_b_id - c.connection_status = conn.connection_status - c.save() + # Create the new Cable + cable = Cable.objects.create( + termination_a_type=interface_type, + termination_a_id=conn.interface_a_id, + termination_b_type=interface_type, + termination_b_id=conn.interface_b_id, + status=conn.connection_status + ) # Cache the connected Cable on each Interface - interface_a = conn.interface_a - interface_a._connected_interface = conn.interface_b - interface_a.connection_status = conn.connection_status - interface_a.cable = c - interface_a.save() - - interface_b = conn.interface_b - interface_b._connected_interface = conn.interface_a - interface_b.connection_status = conn.connection_status - interface_b.cable = c - interface_b.save() + Interface.objects.filter(pk=conn.interface_a_id).update( + _connected_interface=conn.interface_b, + connection_status=conn.connection_status, + cable=cable + ) + Interface.objects.filter(pk=conn.interface_b_id).update( + _connected_interface=conn.interface_a, + connection_status=conn.connection_status, + cable=cable + ) cable_count = Cable.objects.filter(termination_a_type=interface_type).count() print("{} cables created".format(cable_count)) From 6f788fcd2369b6defcce58472605ae144578a0a0 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 31 Oct 2018 12:53:17 -0400 Subject: [PATCH 061/191] Tweaked display of connected circuits --- netbox/templates/dcim/inc/interface.html | 34 +++++++++++++++--------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index cfc41ef9b..48dc67e39 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -8,7 +8,7 @@ {% endif %} {# Icon and name #} - + {{ iface }} @@ -29,7 +29,7 @@ {{ iface.get_mode_display|default:"—" }} {# Cable #} - + {% if iface.cable %} {{ iface.cable }} @@ -61,19 +61,27 @@ {% elif iface.connected_endpoint.term_side %} {# Connected to a CircuitTermination #} {% with iface.connected_endpoint.get_peer_termination as peer_termination %} - - - {% if peer_termination %} - {% if peer_termination.interface %} - {{ peer_termination.interface.device }} - ({{ peer_termination.site }}) - {% else %} + {% if peer_termination %} + {% if peer_termination.connected_endpoint %} + + {{ peer_termination.connected_endpoint.device }}
      + via {{ iface.connected_endpoint.circuit }} + + + {{ peer_termination.connected_endpoint }} + + {% else %} + {{ peer_termination.site }} - {% endif %} - via + via {{ iface.connected_endpoint.circuit }} + {% endif %} - {{ iface.connected_endpoint.circuit }} - + {% else %} + + + {{ iface.connected_endpoint.circuit }} + + {% endif %} {% endwith %} {% else %} From 939a52dcbd463ac0476ddf89d947b03f44adf786 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 31 Oct 2018 13:59:44 -0400 Subject: [PATCH 062/191] Changed variable names for clarity --- netbox/dcim/signals.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/netbox/dcim/signals.py b/netbox/dcim/signals.py index 41ca61d09..d196b1db6 100644 --- a/netbox/dcim/signals.py +++ b/netbox/dcim/signals.py @@ -26,14 +26,14 @@ def update_connected_endpoints(instance, **kwargs): """ When a Cable is saved, update its connected endpoints. """ - termination_a, termination_b = instance.get_path_endpoints() - if termination_a is not None and termination_b is not None: - termination_a.connected_endpoint = termination_b - termination_a.connection_status = True - termination_a.save() - termination_b.connected_endpoint = termination_a - termination_b.connection_status = True - termination_b.save() + endpoint_a, endpoint_b = instance.get_path_endpoints() + if endpoint_a is not None and endpoint_b is not None: + endpoint_a.connected_endpoint = endpoint_b + endpoint_a.connection_status = True + endpoint_a.save() + endpoint_b.connected_endpoint = endpoint_a + endpoint_b.connection_status = True + endpoint_b.save() @receiver(post_delete, sender=Cable) @@ -41,11 +41,11 @@ def nullify_connected_endpoints(instance, **kwargs): """ When a Cable is deleted, nullify its connected endpoints. """ - termination_a, termination_b = instance.get_path_endpoints() - if termination_a is not None and termination_b is not None: - termination_a.connected_endpoint = None - termination_a.connection_status = None - termination_a.save() - termination_b.connected_endpoint = None - termination_b.connection_status = None - termination_b.save() + endpoint_a, endpoint_b = instance.get_path_endpoints() + if endpoint_a is not None and endpoint_b is not None: + endpoint_a.connected_endpoint = None + endpoint_a.connection_status = None + endpoint_a.save() + endpoint_b.connected_endpoint = None + endpoint_b.connection_status = None + endpoint_b.save() From 8992c57039df4828b287c1d55e408fa3a85e94cf Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 31 Oct 2018 15:00:09 -0400 Subject: [PATCH 063/191] Remove reverse relationship to CableTermination.cable --- netbox/dcim/migrations/0066_cables.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py index f05dcf418..b9af2581a 100644 --- a/netbox/dcim/migrations/0066_cables.py +++ b/netbox/dcim/migrations/0066_cables.py @@ -167,7 +167,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='consoleport', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable'), ), migrations.AlterField( model_name='consoleserverport', @@ -177,7 +177,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='consoleserverport', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable'), ), # Alter power port models @@ -199,7 +199,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='powerport', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable'), ), migrations.AlterField( model_name='poweroutlet', @@ -209,7 +209,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='poweroutlet', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable'), ), # Alter the Interface model @@ -231,19 +231,19 @@ class Migration(migrations.Migration): migrations.AddField( model_name='interface', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable'), ), # Alter front/rear port models migrations.AddField( model_name='frontport', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable'), ), migrations.AddField( model_name='rearport', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable'), ), # Copy console/power/interface connections as Cables From d22c23290fcf87702f3f80f71fa58ae598ec8b1d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 31 Oct 2018 15:01:01 -0400 Subject: [PATCH 064/191] Moved cable caching logic from Cable.save() to signals --- netbox/dcim/models.py | 7 +------ netbox/dcim/signals.py | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 4014d00e5..8f6e01554 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -68,6 +68,7 @@ class CableTermination(models.Model): cable = models.ForeignKey( to='dcim.Cable', on_delete=models.SET_NULL, + related_name='+', blank=True, null=True ) @@ -2426,12 +2427,6 @@ class Cable(ChangeLoggedModel): super(Cable, self).save(*args, **kwargs) - # Cache the Cable on its two termination points - self.termination_a.cable = self - self.termination_a.save() - self.termination_b.cable = self - self.termination_b.save() - def get_path_endpoints(self): """ Traverse both ends of a cable path and return its connected endpoints. Note that one or both endpoints may be diff --git a/netbox/dcim/signals.py b/netbox/dcim/signals.py index d196b1db6..26e30babb 100644 --- a/netbox/dcim/signals.py +++ b/netbox/dcim/signals.py @@ -23,9 +23,14 @@ def clear_virtualchassis_members(instance, **kwargs): @receiver(post_save, sender=Cable) def update_connected_endpoints(instance, **kwargs): - """ - When a Cable is saved, update its connected endpoints. - """ + + # Cache the Cable on its two termination points + instance.termination_a.cable = instance + instance.termination_a.save() + instance.termination_b.cable = instance + instance.termination_b.save() + + # Check if this Cable has formed a complete path. If so, update both endpoints. endpoint_a, endpoint_b = instance.get_path_endpoints() if endpoint_a is not None and endpoint_b is not None: endpoint_a.connected_endpoint = endpoint_b @@ -36,11 +41,16 @@ def update_connected_endpoints(instance, **kwargs): endpoint_b.save() -@receiver(post_delete, sender=Cable) +@receiver(pre_delete, sender=Cable) def nullify_connected_endpoints(instance, **kwargs): - """ - When a Cable is deleted, nullify its connected endpoints. - """ + + # Disassociate the Cable from its termination points + instance.termination_a.cable = None + instance.termination_a.save() + instance.termination_b.cable = None + instance.termination_b.save() + + # If this Cable was part of a complete path, tear it down endpoint_a, endpoint_b = instance.get_path_endpoints() if endpoint_a is not None and endpoint_b is not None: endpoint_a.connected_endpoint = None From c2656c4ce16ce2b1fc44baeeecda1d351d8b044c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 31 Oct 2018 15:17:51 -0400 Subject: [PATCH 065/191] Added tests for Cable model --- netbox/dcim/tests/test_api.py | 223 +++++++++++++++++++++------------- 1 file changed, 141 insertions(+), 82 deletions(-) diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index f0f96d431..f165b39a7 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -2805,6 +2805,147 @@ class CableTest(APITestCase): super(CableTest, self).setUp() + site = Site.objects.create(name='Test Site 1', slug='test-site-1') + self.manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1') + devicetype = DeviceType.objects.create( + manufacturer=self.manufacturer, model='Test Device Type 1', slug='test-device-type-1' + ) + devicerole = DeviceRole.objects.create( + name='Test Device Role 1', slug='test-device-role-1', color='ff0000' + ) + self.device1 = Device.objects.create( + device_type=devicetype, device_role=devicerole, name='Test Device 1', site=site + ) + self.device2 = Device.objects.create( + device_type=devicetype, device_role=devicerole, name='Test Device 2', site=site + ) + for device in [self.device1, self.device2]: + for i in range(0, 10): + Interface(device=device, form_factor=IFACE_FF_1GE_FIXED, name='eth{}'.format(i)).save() + + self.cable1 = Cable( + termination_a=self.device1.interfaces.get(name='eth0'), + termination_b=self.device2.interfaces.get(name='eth0'), + label='Test Cable 1' + ) + self.cable1.save() + self.cable2 = Cable( + termination_a=self.device1.interfaces.get(name='eth1'), + termination_b=self.device2.interfaces.get(name='eth1'), + label='Test Cable 2' + ) + self.cable2.save() + self.cable3 = Cable( + termination_a=self.device1.interfaces.get(name='eth2'), + termination_b=self.device2.interfaces.get(name='eth2'), + label='Test Cable 3' + ) + self.cable3.save() + + def test_get_cable(self): + + url = reverse('dcim-api:cable-detail', kwargs={'pk': self.cable1.pk}) + response = self.client.get(url, **self.header) + + self.assertEqual(response.data['id'], self.cable1.pk) + + def test_list_cables(self): + + url = reverse('dcim-api:cable-list') + response = self.client.get(url, **self.header) + + self.assertEqual(response.data['count'], 3) + + def test_create_cable(self): + + interface_a = self.device1.interfaces.get(name='eth3') + interface_b = self.device2.interfaces.get(name='eth3') + data = { + 'termination_a_type': 'dcim.interface', + 'termination_a_id': interface_a.pk, + 'termination_b_type': 'dcim.interface', + 'termination_b_id': interface_b.pk, + 'status': CONNECTION_STATUS_PLANNED, + 'label': 'Test Cable 4', + } + + url = reverse('dcim-api:cable-list') + response = self.client.post(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_201_CREATED) + self.assertEqual(Cable.objects.count(), 4) + cable4 = Cable.objects.get(pk=response.data['id']) + self.assertEqual(cable4.termination_a, interface_a) + self.assertEqual(cable4.termination_b, interface_b) + self.assertEqual(cable4.status, data['status']) + self.assertEqual(cable4.label, data['label']) + + def test_create_cable_bulk(self): + + data = [ + { + 'termination_a_type': 'dcim.interface', + 'termination_a_id': self.device1.interfaces.get(name='eth3').pk, + 'termination_b_type': 'dcim.interface', + 'termination_b_id': self.device2.interfaces.get(name='eth3').pk, + 'label': 'Test Cable 4', + }, + { + 'termination_a_type': 'dcim.interface', + 'termination_a_id': self.device1.interfaces.get(name='eth4').pk, + 'termination_b_type': 'dcim.interface', + 'termination_b_id': self.device2.interfaces.get(name='eth4').pk, + 'label': 'Test Cable 5', + }, + { + 'termination_a_type': 'dcim.interface', + 'termination_a_id': self.device1.interfaces.get(name='eth5').pk, + 'termination_b_type': 'dcim.interface', + 'termination_b_id': self.device2.interfaces.get(name='eth5').pk, + 'label': 'Test Cable 6', + }, + ] + + url = reverse('dcim-api:cable-list') + response = self.client.post(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_201_CREATED) + self.assertEqual(Cable.objects.count(), 6) + self.assertEqual(response.data[0]['label'], data[0]['label']) + self.assertEqual(response.data[1]['label'], data[1]['label']) + self.assertEqual(response.data[2]['label'], data[2]['label']) + + def test_update_cable(self): + + data = { + 'label': 'Test Cable X', + 'status': CONNECTION_STATUS_CONNECTED, + } + + url = reverse('dcim-api:cable-detail', kwargs={'pk': self.cable1.pk}) + response = self.client.patch(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_200_OK) + self.assertEqual(Cable.objects.count(), 3) + cable1 = Cable.objects.get(pk=response.data['id']) + self.assertEqual(cable1.status, data['status']) + self.assertEqual(cable1.label, data['label']) + + def test_delete_cable(self): + + url = reverse('dcim-api:cable-detail', kwargs={'pk': self.cable1.pk}) + response = self.client.delete(url, **self.header) + + self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT) + self.assertEqual(Cable.objects.count(), 2) + + +class ConnectionTest(APITestCase): + + def setUp(self): + + super(ConnectionTest, self).setUp() + self.site = Site.objects.create( name='Test Site 1', slug='test-site-1' ) @@ -3163,88 +3304,6 @@ class CableTest(APITestCase): self.assertEqual(circuittermination1.connected_endpoint, interface1) -class ConsoleConnectionTest(APITestCase): - - def setUp(self): - - super(ConsoleConnectionTest, self).setUp() - - site = Site.objects.create(name='Test Site 1', slug='test-site-1') - manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1') - devicetype = DeviceType.objects.create( - manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1' - ) - devicerole = DeviceRole.objects.create( - name='Test Device Role 1', slug='test-device-role-1', color='ff0000' - ) - device1 = Device.objects.create( - device_type=devicetype, device_role=devicerole, name='Test Device 1', site=site - ) - device2 = Device.objects.create( - device_type=devicetype, device_role=devicerole, name='Test Device 2', site=site - ) - consoleserverport1 = ConsoleServerPort.objects.create(device=device1, name='Test Console Server Port 1') - consoleserverport2 = ConsoleServerPort.objects.create(device=device1, name='Test Console Server Port 2') - consoleserverport3 = ConsoleServerPort.objects.create(device=device1, name='Test Console Server Port 3') - ConsolePort.objects.create( - device=device2, connected_endpoint=consoleserverport1, name='Test Console Port 1', connection_status=True - ) - ConsolePort.objects.create( - device=device2, connected_endpoint=consoleserverport2, name='Test Console Port 2', connection_status=True - ) - ConsolePort.objects.create( - device=device2, connected_endpoint=consoleserverport3, name='Test Console Port 3', connection_status=True - ) - - def test_list_consoleconnections(self): - - url = reverse('dcim-api:consoleconnections-list') - response = self.client.get(url, **self.header) - - self.assertEqual(response.data['count'], 3) - - -class PowerConnectionTest(APITestCase): - - def setUp(self): - - super(PowerConnectionTest, self).setUp() - - site = Site.objects.create(name='Test Site 1', slug='test-site-1') - manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1') - devicetype = DeviceType.objects.create( - manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1' - ) - devicerole = DeviceRole.objects.create( - name='Test Device Role 1', slug='test-device-role-1', color='ff0000' - ) - device1 = Device.objects.create( - device_type=devicetype, device_role=devicerole, name='Test Device 1', site=site - ) - device2 = Device.objects.create( - device_type=devicetype, device_role=devicerole, name='Test Device 2', site=site - ) - poweroutlet1 = PowerOutlet.objects.create(device=device1, name='Test Power Outlet 1') - poweroutlet2 = PowerOutlet.objects.create(device=device1, name='Test Power Outlet 2') - poweroutlet3 = PowerOutlet.objects.create(device=device1, name='Test Power Outlet 3') - PowerPort.objects.create( - device=device2, connected_endpoint=poweroutlet1, name='Test Power Port 1', connection_status=True - ) - PowerPort.objects.create( - device=device2, connected_endpoint=poweroutlet2, name='Test Power Port 2', connection_status=True - ) - PowerPort.objects.create( - device=device2, connected_endpoint=poweroutlet3, name='Test Power Port 3', connection_status=True - ) - - def test_list_powerconnections(self): - - url = reverse('dcim-api:powerconnections-list') - response = self.client.get(url, **self.header) - - self.assertEqual(response.data['count'], 3) - - # class ConnectedDeviceTest(APITestCase): # # def setUp(self): From 121a6afb4558226cfe55f1931d4340eb43233573 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 31 Oct 2018 15:23:00 -0400 Subject: [PATCH 066/191] Fixed typo in API URL template --- netbox/dcim/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index e924979cd..721d586bb 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -2146,7 +2146,7 @@ class CableCreateForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): label='Device', required=False, widget=APISelect( - api_url='/api/dcim/devices/?site_id={termination_b_site}}&rack_id={{termination_b_rack}}', + api_url='/api/dcim/devices/?site_id={{termination_b_site}}&rack_id={{termination_b_rack}}', display_field='display_name', attrs={'filter-for': 'termination_b_id'} ) From f7e23d912c03c8b60f4188b9dba876cddb4f327e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 31 Oct 2018 15:31:44 -0400 Subject: [PATCH 067/191] Expanded cable connection form --- netbox/dcim/forms.py | 2 +- netbox/templates/dcim/cable_connect.html | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 721d586bb..d6d5be7b4 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -2179,7 +2179,7 @@ class CableCreateForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): model = Cable fields = [ 'termination_b_site', 'termination_b_rack', 'termination_b_device', 'livesearch', 'termination_b_type', - 'termination_b_id', 'status', 'label', + 'termination_b_id', 'type', 'status', 'label', 'color', 'length', 'length_unit', ] def __init__(self, *args, **kwargs): diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html index ecce56118..310736af7 100644 --- a/netbox/templates/dcim/cable_connect.html +++ b/netbox/templates/dcim/cable_connect.html @@ -116,8 +116,12 @@
      + {% render_field form.type %} {% render_field form.status %} {% render_field form.label %} + {% render_field form.color %} + {% render_field form.length %} + {% render_field form.length_unit %}
      From 18628166dc11a088650c1f23d1538aabe6e5e848 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 31 Oct 2018 15:54:29 -0400 Subject: [PATCH 068/191] Removed old console/power connection views --- netbox/dcim/urls.py | 8 - netbox/dcim/views.py | 389 ------------------ .../templates/dcim/consoleport_connect.html | 55 --- .../dcim/consoleport_disconnect.html | 8 - .../dcim/consoleserverport_connect.html | 55 --- .../dcim/consoleserverport_disconnect.html | 8 - netbox/templates/dcim/inc/consoleport.html | 2 +- .../templates/dcim/inc/consoleserverport.html | 2 +- netbox/templates/dcim/inc/poweroutlet.html | 2 +- netbox/templates/dcim/inc/powerport.html | 6 +- .../dcim/interfaceconnection_delete.html | 12 - .../dcim/interfaceconnection_edit.html | 97 ----- .../templates/dcim/poweroutlet_connect.html | 55 --- .../dcim/poweroutlet_disconnect.html | 8 - netbox/templates/dcim/powerport_connect.html | 55 --- .../templates/dcim/powerport_disconnect.html | 8 - 16 files changed, 6 insertions(+), 764 deletions(-) delete mode 100644 netbox/templates/dcim/consoleport_connect.html delete mode 100644 netbox/templates/dcim/consoleport_disconnect.html delete mode 100644 netbox/templates/dcim/consoleserverport_connect.html delete mode 100644 netbox/templates/dcim/consoleserverport_disconnect.html delete mode 100644 netbox/templates/dcim/interfaceconnection_delete.html delete mode 100644 netbox/templates/dcim/interfaceconnection_edit.html delete mode 100644 netbox/templates/dcim/poweroutlet_connect.html delete mode 100644 netbox/templates/dcim/poweroutlet_disconnect.html delete mode 100644 netbox/templates/dcim/powerport_connect.html delete mode 100644 netbox/templates/dcim/powerport_disconnect.html diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 13ffec1ec..c06bc4a30 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -161,9 +161,7 @@ urlpatterns = [ url(r'^devices/console-ports/add/$', views.DeviceBulkAddConsolePortView.as_view(), name='device_bulk_add_consoleport'), url(r'^devices/(?P\d+)/console-ports/add/$', views.ConsolePortCreateView.as_view(), name='consoleport_add'), url(r'^devices/(?P\d+)/console-ports/delete/$', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'), - # url(r'^console-ports/(?P\d+)/connect/$', views.ConsolePortConnectView.as_view(), name='consoleport_connect'), url(r'^console-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='consoleport_connect', kwargs={'termination_a_type': ConsolePort}), - url(r'^console-ports/(?P\d+)/disconnect/$', views.ConsolePortDisconnectView.as_view(), name='consoleport_disconnect'), url(r'^console-ports/(?P\d+)/edit/$', views.ConsolePortEditView.as_view(), name='consoleport_edit'), url(r'^console-ports/(?P\d+)/delete/$', views.ConsolePortDeleteView.as_view(), name='consoleport_delete'), url(r'^console-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='consoleport_trace', kwargs={'model': ConsolePort}), @@ -173,9 +171,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/console-server-ports/add/$', views.ConsoleServerPortCreateView.as_view(), name='consoleserverport_add'), url(r'^devices/(?P\d+)/console-server-ports/disconnect/$', views.ConsoleServerPortBulkDisconnectView.as_view(), name='consoleserverport_bulk_disconnect'), url(r'^devices/(?P\d+)/console-server-ports/delete/$', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'), - # url(r'^console-server-ports/(?P\d+)/connect/$', views.ConsoleServerPortConnectView.as_view(), name='consoleserverport_connect'), url(r'^console-server-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'termination_a_type': ConsoleServerPort}), - url(r'^console-server-ports/(?P\d+)/disconnect/$', views.ConsoleServerPortDisconnectView.as_view(), name='consoleserverport_disconnect'), url(r'^console-server-ports/(?P\d+)/edit/$', views.ConsoleServerPortEditView.as_view(), name='consoleserverport_edit'), url(r'^console-server-ports/(?P\d+)/delete/$', views.ConsoleServerPortDeleteView.as_view(), name='consoleserverport_delete'), url(r'^console-server-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='consoleserverport_trace', kwargs={'model': ConsoleServerPort}), @@ -185,9 +181,7 @@ urlpatterns = [ url(r'^devices/power-ports/add/$', views.DeviceBulkAddPowerPortView.as_view(), name='device_bulk_add_powerport'), url(r'^devices/(?P\d+)/power-ports/add/$', views.PowerPortCreateView.as_view(), name='powerport_add'), url(r'^devices/(?P\d+)/power-ports/delete/$', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'), - # url(r'^power-ports/(?P\d+)/connect/$', views.PowerPortConnectView.as_view(), name='powerport_connect'), url(r'^power-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='powerport_connect', kwargs={'termination_a_type': PowerPort}), - url(r'^power-ports/(?P\d+)/disconnect/$', views.PowerPortDisconnectView.as_view(), name='powerport_disconnect'), url(r'^power-ports/(?P\d+)/edit/$', views.PowerPortEditView.as_view(), name='powerport_edit'), url(r'^power-ports/(?P\d+)/delete/$', views.PowerPortDeleteView.as_view(), name='powerport_delete'), url(r'^power-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='powerport_trace', kwargs={'model': PowerPort}), @@ -197,9 +191,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/power-outlets/add/$', views.PowerOutletCreateView.as_view(), name='poweroutlet_add'), url(r'^devices/(?P\d+)/power-outlets/disconnect/$', views.PowerOutletBulkDisconnectView.as_view(), name='poweroutlet_bulk_disconnect'), url(r'^devices/(?P\d+)/power-outlets/delete/$', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'), - # url(r'^power-outlets/(?P\d+)/connect/$', views.PowerOutletConnectView.as_view(), name='poweroutlet_connect'), url(r'^power-outlets/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'termination_a_type': PowerOutlet}), - url(r'^power-outlets/(?P\d+)/disconnect/$', views.PowerOutletDisconnectView.as_view(), name='poweroutlet_disconnect'), url(r'^power-outlets/(?P\d+)/edit/$', views.PowerOutletEditView.as_view(), name='poweroutlet_edit'), url(r'^power-outlets/(?P\d+)/delete/$', views.PowerOutletDeleteView.as_view(), name='poweroutlet_delete'), url(r'^power-outlets/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='poweroutlet_trace', kwargs={'model': PowerOutlet}), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 60b998a6f..c628ce02e 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1103,101 +1103,6 @@ class ConsolePortCreateView(PermissionRequiredMixin, ComponentCreateView): template_name = 'dcim/device_component_add.html' -class ConsolePortConnectView(PermissionRequiredMixin, View): - permission_required = 'dcim.change_consoleport' - - def get(self, request, pk): - - consoleport = get_object_or_404(ConsolePort, pk=pk) - form = forms.ConsolePortConnectionForm(instance=consoleport, initial={ - 'site': request.GET.get('site'), - 'rack': request.GET.get('rack'), - 'console_server': request.GET.get('console_server'), - 'connection_status': CONNECTION_STATUS_CONNECTED, - }) - - return render(request, 'dcim/consoleport_connect.html', { - 'consoleport': consoleport, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': consoleport.device.pk}), - }) - - def post(self, request, pk): - - consoleport = get_object_or_404(ConsolePort, pk=pk) - form = forms.ConsolePortConnectionForm(request.POST, instance=consoleport) - - if form.is_valid(): - - consoleport = form.save() - msg = 'Connected {} {} to {} {}'.format( - consoleport.device.get_absolute_url(), - escape(consoleport.device), - escape(consoleport.name), - consoleport.connected_endpoint.device.get_absolute_url(), - escape(consoleport.connected_endpoint.device), - escape(consoleport.connected_endpoint.name), - ) - messages.success(request, mark_safe(msg)) - - return redirect('dcim:device', pk=consoleport.device.pk) - - return render(request, 'dcim/consoleport_connect.html', { - 'consoleport': consoleport, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': consoleport.device.pk}), - }) - - -class ConsolePortDisconnectView(PermissionRequiredMixin, View): - permission_required = 'dcim.change_consoleport' - - def get(self, request, pk): - - consoleport = get_object_or_404(ConsolePort, pk=pk) - form = ConfirmationForm() - - if not consoleport.connected_endpoint: - messages.warning( - request, "Cannot disconnect console port {}: It is not connected to anything.".format(consoleport) - ) - return redirect('dcim:device', pk=consoleport.device.pk) - - return render(request, 'dcim/consoleport_disconnect.html', { - 'consoleport': consoleport, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': consoleport.device.pk}), - }) - - def post(self, request, pk): - - consoleport = get_object_or_404(ConsolePort, pk=pk) - form = ConfirmationForm(request.POST) - - if form.is_valid(): - consoleserverport = consoleport.connected_endpoint - consoleport.connected_endpoint = None - consoleport.connection_status = None - consoleport.save() - msg = 'Disconnected {} {} from {} {}'.format( - consoleport.device.get_absolute_url(), - escape(consoleport.device), - escape(consoleport.name), - consoleserverport.device.get_absolute_url(), - escape(consoleserverport.device), - escape(consoleserverport.name), - ) - messages.success(request, mark_safe(msg)) - - return redirect('dcim:device', pk=consoleport.device.pk) - - return render(request, 'dcim/consoleport_disconnect.html', { - 'consoleport': consoleport, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': consoleport.device.pk}), - }) - - class ConsolePortEditView(PermissionRequiredMixin, ObjectEditView): permission_required = 'dcim.change_consoleport' model = ConsolePort @@ -1237,106 +1142,6 @@ class ConsoleServerPortCreateView(PermissionRequiredMixin, ComponentCreateView): template_name = 'dcim/device_component_add.html' -class ConsoleServerPortConnectView(PermissionRequiredMixin, View): - permission_required = 'dcim.change_consoleserverport' - - def get(self, request, pk): - - consoleserverport = get_object_or_404(ConsoleServerPort, pk=pk) - form = forms.ConsoleServerPortConnectionForm(initial={ - 'site': request.GET.get('site'), - 'rack': request.GET.get('rack'), - 'device': request.GET.get('device'), - 'connection_status': CONNECTION_STATUS_CONNECTED, - }) - - return render(request, 'dcim/consoleserverport_connect.html', { - 'consoleserverport': consoleserverport, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': consoleserverport.device.pk}), - }) - - def post(self, request, pk): - - consoleserverport = get_object_or_404(ConsoleServerPort, pk=pk) - form = forms.ConsoleServerPortConnectionForm(request.POST) - - if form.is_valid(): - - consoleport = form.cleaned_data['port'] - consoleport.connected_endpoint = consoleserverport - consoleport.connection_status = form.cleaned_data['connection_status'] - consoleport.save() - msg = 'Connected {} {} to {} {}'.format( - consoleport.device.get_absolute_url(), - escape(consoleport.device), - escape(consoleport.name), - consoleserverport.device.get_absolute_url(), - escape(consoleserverport.device), - escape(consoleserverport.name), - ) - messages.success(request, mark_safe(msg)) - - return redirect('dcim:device', pk=consoleserverport.device.pk) - - return render(request, 'dcim/consoleserverport_connect.html', { - 'consoleserverport': consoleserverport, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': consoleserverport.device.pk}), - }) - - -class ConsoleServerPortDisconnectView(PermissionRequiredMixin, View): - permission_required = 'dcim.change_consoleserverport' - - def get(self, request, pk): - - consoleserverport = get_object_or_404(ConsoleServerPort, pk=pk) - form = ConfirmationForm() - - if not hasattr(consoleserverport, 'connected_endpoint'): - messages.warning( - request, - "Cannot disconnect console server port {}: Nothing is connected to it.".format(consoleserverport) - ) - return redirect('dcim:device', pk=consoleserverport.device.pk) - - return render(request, 'dcim/consoleserverport_disconnect.html', { - 'consoleserverport': consoleserverport, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': consoleserverport.device.pk}), - }) - - def post(self, request, pk): - - consoleserverport = get_object_or_404(ConsoleServerPort, pk=pk) - form = ConfirmationForm(request.POST) - - if form.is_valid(): - - consoleport = consoleserverport.connected_endpoint - consoleport.connected_endpoint = None - consoleport.connection_status = None - consoleport.save() - msg = 'Disconnected {} {} from {} {}'.format( - consoleport.device.get_absolute_url(), - escape(consoleport.device), - escape(consoleport.name), - consoleserverport.device.get_absolute_url(), - escape(consoleserverport.device), - escape(consoleserverport.name), - ) - messages.success(request, mark_safe(msg)) - - return redirect('dcim:device', pk=consoleserverport.device.pk) - - return render(request, 'dcim/consoleserverport_disconnect.html', { - 'consoleserverport': consoleserverport, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': consoleserverport.device.pk}), - }) - - class ConsoleServerPortEditView(PermissionRequiredMixin, ObjectEditView): permission_required = 'dcim.change_consoleserverport' model = ConsoleServerPort @@ -1389,102 +1194,6 @@ class PowerPortCreateView(PermissionRequiredMixin, ComponentCreateView): template_name = 'dcim/device_component_add.html' -class PowerPortConnectView(PermissionRequiredMixin, View): - permission_required = 'dcim.change_powerport' - - def get(self, request, pk): - - powerport = get_object_or_404(PowerPort, pk=pk) - form = forms.PowerPortConnectionForm(instance=powerport, initial={ - 'site': request.GET.get('site'), - 'rack': request.GET.get('rack'), - 'pdu': request.GET.get('pdu'), - 'connection_status': CONNECTION_STATUS_CONNECTED, - }) - - return render(request, 'dcim/powerport_connect.html', { - 'powerport': powerport, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': powerport.device.pk}), - }) - - def post(self, request, pk): - - powerport = get_object_or_404(PowerPort, pk=pk) - form = forms.PowerPortConnectionForm(request.POST, instance=powerport) - - if form.is_valid(): - - powerport = form.save() - msg = 'Connected {} {} to {} {}'.format( - powerport.device.get_absolute_url(), - escape(powerport.device), - escape(powerport.name), - powerport.connected_endpoint.device.get_absolute_url(), - escape(powerport.connected_endpoint.device), - escape(powerport.connected_endpoint.name), - ) - messages.success(request, mark_safe(msg)) - - return redirect('dcim:device', pk=powerport.device.pk) - - return render(request, 'dcim/powerport_connect.html', { - 'powerport': powerport, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': powerport.device.pk}), - }) - - -class PowerPortDisconnectView(PermissionRequiredMixin, View): - permission_required = 'dcim.change_powerport' - - def get(self, request, pk): - - powerport = get_object_or_404(PowerPort, pk=pk) - form = ConfirmationForm() - - if not powerport.connected_endpoint: - messages.warning( - request, "Cannot disconnect power port {}: It is not connected to an outlet.".format(powerport) - ) - return redirect('dcim:device', pk=powerport.device.pk) - - return render(request, 'dcim/powerport_disconnect.html', { - 'powerport': powerport, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': powerport.device.pk}), - }) - - def post(self, request, pk): - - powerport = get_object_or_404(PowerPort, pk=pk) - form = ConfirmationForm(request.POST) - - if form.is_valid(): - - poweroutlet = powerport.connected_endpoint - powerport.connected_endpoint = None - powerport.connection_status = None - powerport.save() - msg = 'Disconnected {} {} from {} {}'.format( - powerport.device.get_absolute_url(), - escape(powerport.device), - escape(powerport.name), - poweroutlet.device.get_absolute_url(), - escape(poweroutlet.device), - escape(poweroutlet.name), - ) - messages.success(request, mark_safe(msg)) - - return redirect('dcim:device', pk=powerport.device.pk) - - return render(request, 'dcim/powerport_disconnect.html', { - 'powerport': powerport, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': powerport.device.pk}), - }) - - class PowerPortEditView(PermissionRequiredMixin, ObjectEditView): permission_required = 'dcim.change_powerport' model = PowerPort @@ -1524,104 +1233,6 @@ class PowerOutletCreateView(PermissionRequiredMixin, ComponentCreateView): template_name = 'dcim/device_component_add.html' -class PowerOutletConnectView(PermissionRequiredMixin, View): - permission_required = 'dcim.change_poweroutlet' - - def get(self, request, pk): - - poweroutlet = get_object_or_404(PowerOutlet, pk=pk) - form = forms.PowerOutletConnectionForm(initial={ - 'site': request.GET.get('site'), - 'rack': request.GET.get('rack'), - 'device': request.GET.get('device'), - 'connection_status': CONNECTION_STATUS_CONNECTED, - }) - - return render(request, 'dcim/poweroutlet_connect.html', { - 'poweroutlet': poweroutlet, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': poweroutlet.device.pk}), - }) - - def post(self, request, pk): - - poweroutlet = get_object_or_404(PowerOutlet, pk=pk) - form = forms.PowerOutletConnectionForm(request.POST) - - if form.is_valid(): - powerport = form.cleaned_data['port'] - powerport.connected_endpoint = poweroutlet - powerport.connection_status = form.cleaned_data['connection_status'] - powerport.save() - msg = 'Connected {} {} to {} {}'.format( - powerport.device.get_absolute_url(), - escape(powerport.device), - escape(powerport.name), - poweroutlet.device.get_absolute_url(), - escape(poweroutlet.device), - escape(poweroutlet.name), - ) - messages.success(request, mark_safe(msg)) - - return redirect('dcim:device', pk=poweroutlet.device.pk) - - return render(request, 'dcim/poweroutlet_connect.html', { - 'poweroutlet': poweroutlet, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': poweroutlet.device.pk}), - }) - - -class PowerOutletDisconnectView(PermissionRequiredMixin, View): - permission_required = 'dcim.change_poweroutlet' - - def get(self, request, pk): - - poweroutlet = get_object_or_404(PowerOutlet, pk=pk) - form = ConfirmationForm() - - if not hasattr(poweroutlet, 'connected_endpoint'): - messages.warning( - request, "Cannot disconnect power outlet {}: Nothing is connected to it.".format(poweroutlet) - ) - return redirect('dcim:device', pk=poweroutlet.device.pk) - - return render(request, 'dcim/poweroutlet_disconnect.html', { - 'poweroutlet': poweroutlet, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': poweroutlet.device.pk}), - }) - - def post(self, request, pk): - - poweroutlet = get_object_or_404(PowerOutlet, pk=pk) - form = ConfirmationForm(request.POST) - - if form.is_valid(): - - powerport = poweroutlet.connected_endpoint - powerport.connected_endpoint = None - powerport.connection_status = None - powerport.save() - msg = 'Disconnected {} {} from {} {}'.format( - powerport.device.get_absolute_url(), - escape(powerport.device), - escape(powerport.name), - poweroutlet.device.get_absolute_url(), - escape(poweroutlet.device), - escape(poweroutlet.name), - ) - messages.success(request, mark_safe(msg)) - - return redirect('dcim:device', pk=poweroutlet.device.pk) - - return render(request, 'dcim/poweroutlet_disconnect.html', { - 'poweroutlet': poweroutlet, - 'form': form, - 'return_url': reverse('dcim:device', kwargs={'pk': poweroutlet.device.pk}), - }) - - class PowerOutletEditView(PermissionRequiredMixin, ObjectEditView): permission_required = 'dcim.change_poweroutlet' model = PowerOutlet diff --git a/netbox/templates/dcim/consoleport_connect.html b/netbox/templates/dcim/consoleport_connect.html deleted file mode 100644 index 5d8596fd5..000000000 --- a/netbox/templates/dcim/consoleport_connect.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends '_base.html' %} -{% load static from staticfiles %} -{% load form_helpers %} - -{% block content %} - - {% csrf_token %} - {% for field in form.hidden_fields %} - {{ field }} - {% endfor %} -
      -
      - {% if form.non_field_errors %} -
      -
      Errors
      -
      - {{ form.non_field_errors }} -
      -
      - {% endif %} -
      -
      {% block title %}Connect {{ consoleport.device }} {{ consoleport }}{% endblock %}
      -
      - -
      - -
      - {% render_field form.site %} - {% render_field form.rack %} - {% render_field form.console_server %} -
      -
      - {% render_field form.connected_endpoint %} - {% render_field form.connection_status %} -
      -
      -
      -
      - - Cancel -
      -
      -
      -
      - -{% endblock %} - -{% block javascript %} - -{% endblock %} diff --git a/netbox/templates/dcim/consoleport_disconnect.html b/netbox/templates/dcim/consoleport_disconnect.html deleted file mode 100644 index f83329832..000000000 --- a/netbox/templates/dcim/consoleport_disconnect.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends 'utilities/confirmation_form.html' %} -{% load form_helpers %} - -{% block title %}Disconnect console port {{ consoleport }}?{% endblock %} - -{% block message %} -

      Are you sure you want to disconnect this console port from {{ consoleport.connected_endpoint.device }} {{ consoleport.connected_endpoint }}?

      -{% endblock %} diff --git a/netbox/templates/dcim/consoleserverport_connect.html b/netbox/templates/dcim/consoleserverport_connect.html deleted file mode 100644 index 989104329..000000000 --- a/netbox/templates/dcim/consoleserverport_connect.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends '_base.html' %} -{% load static from staticfiles %} -{% load form_helpers %} - -{% block content %} -
      - {% csrf_token %} - {% for field in form.hidden_fields %} - {{ field }} - {% endfor %} -
      -
      - {% if form.non_field_errors %} -
      -
      Errors
      -
      - {{ form.non_field_errors }} -
      -
      - {% endif %} -
      -
      {% block title %}Connect {{ consoleserverport.device }} {{ consoleserverport }}{% endblock %}
      -
      - -
      - -
      - {% render_field form.site %} - {% render_field form.rack %} - {% render_field form.device %} -
      -
      - {% render_field form.port %} - {% render_field form.connection_status %} -
      -
      -
      -
      - - Cancel -
      -
      -
      -
      -
      -{% endblock %} - -{% block javascript %} - -{% endblock %} diff --git a/netbox/templates/dcim/consoleserverport_disconnect.html b/netbox/templates/dcim/consoleserverport_disconnect.html deleted file mode 100644 index 8404f9e94..000000000 --- a/netbox/templates/dcim/consoleserverport_disconnect.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends 'utilities/confirmation_form.html' %} -{% load form_helpers %} - -{% block title %}Disconnect {{ consoleserverport.device }} {{ consoleserverport }}?{% endblock %} - -{% block message %} -

      Are you sure you want to disconnect {{ consoleserverport.connected_endpoint.device }} {{ consoleserverport.connected_endpoint }} from this port?

      -{% endblock %} diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html index eecfc6735..889472a88 100644 --- a/netbox/templates/dcim/inc/consoleport.html +++ b/netbox/templates/dcim/inc/consoleport.html @@ -41,7 +41,7 @@ {% endif %} - + {% else %} diff --git a/netbox/templates/dcim/inc/consoleserverport.html b/netbox/templates/dcim/inc/consoleserverport.html index 47345ef22..84725ffc2 100644 --- a/netbox/templates/dcim/inc/consoleserverport.html +++ b/netbox/templates/dcim/inc/consoleserverport.html @@ -48,7 +48,7 @@ {% endif %} - + {% else %} diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index 04b60a785..cb6a2a6e4 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -48,7 +48,7 @@ {% endif %} - + {% else %} diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index 3479505e2..8640ff0d1 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -41,9 +41,9 @@ {% endif %} - - - + + + {% else %} diff --git a/netbox/templates/dcim/interfaceconnection_delete.html b/netbox/templates/dcim/interfaceconnection_delete.html deleted file mode 100644 index 8cb08e1ad..000000000 --- a/netbox/templates/dcim/interfaceconnection_delete.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends 'utilities/confirmation_form.html' %} -{% load form_helpers %} - -{% block title %}Delete interface connection?{% endblock %} - -{% block message %} -

      Are you sure you want to delete the connection between these two interfaces?

      -
        -
      • {{ interfaceconnection.interface_a.device }}: {{ interfaceconnection.interface_a }}
        • -
      • {{ interfaceconnection.interface_b.device }}: {{ interfaceconnection.interface_b }}
        • -
      -{% endblock %} diff --git a/netbox/templates/dcim/interfaceconnection_edit.html b/netbox/templates/dcim/interfaceconnection_edit.html deleted file mode 100644 index 488c11472..000000000 --- a/netbox/templates/dcim/interfaceconnection_edit.html +++ /dev/null @@ -1,97 +0,0 @@ -{% extends '_base.html' %} -{% load static from staticfiles %} -{% load form_helpers %} - -{% block title %}Connect Interfaces{% endblock %} - -{% block content %} -

      Connect Interfaces

      -
      - {% csrf_token %} -
      -
      - {% if form.non_field_errors %} -
      -
      Errors
      -
      - {{ form.non_field_errors }} -
      -
      - {% endif %} -
      -
      -
      -
      -
      -
      - A Side -
      -
      -
      - -
      -

      {{ device.site }}

      -
      -
      -
      - -
      -

      {{ device.rack|default:"None" }}

      -
      -
      -
      - -
      -

      {{ device }}

      -
      -
      - {% render_field form.interface_a %} -
      -
      -
      -
      - -
      -
      -
      -
      - B Side -
      -
      - -
      - -
      - {% render_field form.site_b %} - {% render_field form.rack_b %} - {% render_field form.device_b %} -
      -
      - {% render_field form.interface_b %} -
      -
      -
      -
      -
      -
      - {% render_field form.connection_status %} -
      -
      -
      -
      - - - Cancel -
      -
      -
      -{% endblock %} - -{% block javascript %} - -{% endblock %} diff --git a/netbox/templates/dcim/poweroutlet_connect.html b/netbox/templates/dcim/poweroutlet_connect.html deleted file mode 100644 index 6c7cef449..000000000 --- a/netbox/templates/dcim/poweroutlet_connect.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends '_base.html' %} -{% load static from staticfiles %} -{% load form_helpers %} - -{% block content %} -
      - {% csrf_token %} - {% for field in form.hidden_fields %} - {{ field }} - {% endfor %} -
      -
      - {% if form.non_field_errors %} -
      -
      Errors
      -
      - {{ form.non_field_errors }} -
      -
      - {% endif %} -
      -
      {% block title %}Connect {{ poweroutlet.device }} {{ poweroutlet }}{% endblock %}
      -
      - -
      - -
      - {% render_field form.site %} - {% render_field form.rack %} - {% render_field form.device %} -
      -
      - {% render_field form.port %} - {% render_field form.connection_status %} -
      -
      -
      -
      - - Cancel -
      -
      -
      -
      -
      -{% endblock %} - -{% block javascript %} - -{% endblock %} diff --git a/netbox/templates/dcim/poweroutlet_disconnect.html b/netbox/templates/dcim/poweroutlet_disconnect.html deleted file mode 100644 index d315c75ee..000000000 --- a/netbox/templates/dcim/poweroutlet_disconnect.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends 'utilities/confirmation_form.html' %} -{% load form_helpers %} - -{% block title %}Disconnect {{ poweroutlet.device }} {{ poweroutlet }}?{% endblock %} - -{% block message %} -

      Are you sure you want to disconnect {{ poweroutlet.connected_endpoint.device }} {{ poweroutlet.connected_endpoint }} from this port?

      -{% endblock %} diff --git a/netbox/templates/dcim/powerport_connect.html b/netbox/templates/dcim/powerport_connect.html deleted file mode 100644 index 70cb8d426..000000000 --- a/netbox/templates/dcim/powerport_connect.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends '_base.html' %} -{% load static from staticfiles %} -{% load form_helpers %} - -{% block content %} -
      - {% csrf_token %} - {% for field in form.hidden_fields %} - {{ field }} - {% endfor %} -
      -
      - {% if form.non_field_errors %} -
      -
      Errors
      -
      - {{ form.non_field_errors }} -
      -
      - {% endif %} -
      -
      {% block title %}Connect {{ powerport.device }} {{ powerport }}{% endblock %}
      -
      - -
      - -
      - {% render_field form.site %} - {% render_field form.rack %} - {% render_field form.pdu %} -
      -
      - {% render_field form.connected_endpoint %} - {% render_field form.connection_status %} -
      -
      -
      -
      - - Cancel -
      -
      -
      -
      -
      -{% endblock %} - -{% block javascript %} - -{% endblock %} diff --git a/netbox/templates/dcim/powerport_disconnect.html b/netbox/templates/dcim/powerport_disconnect.html deleted file mode 100644 index 6953b1e2f..000000000 --- a/netbox/templates/dcim/powerport_disconnect.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends 'utilities/confirmation_form.html' %} -{% load form_helpers %} - -{% block title %}Disconnect power port {{ powerport }}?{% endblock %} - -{% block message %} -

      Are you sure you want to disconnect this power port from {{ powerport.connected_endpoint.device }} {{ powerport.connected_endpoint }}?

      -{% endblock %} From 4e9ace39ce54321e6a7caf4fd93d1aa6f0350e15 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 31 Oct 2018 16:01:46 -0400 Subject: [PATCH 069/191] Optimized queryset for InterfaceConnectionsListView --- netbox/dcim/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index c628ce02e..6c419f66c 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1723,7 +1723,7 @@ class PowerConnectionsListView(ObjectListView): class InterfaceConnectionsListView(ObjectListView): queryset = Interface.objects.select_related( - '_connected_interface', '_connected_circuittermination' + 'device', '_connected_interface__device' ).filter( # Avoid duplicate connections by only selecting the lower PK in a connected pair _connected_interface__isnull=False, From cd243a90d087b40f87d95bdb5a1951011a054ce5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 31 Oct 2018 16:12:36 -0400 Subject: [PATCH 070/191] connected_endpoint must be read-only on termination serializers --- netbox/circuits/api/serializers.py | 6 ++++-- netbox/dcim/api/serializers.py | 6 ++---- netbox/dcim/tests/test_api.py | 4 ---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/netbox/circuits/api/serializers.py b/netbox/circuits/api/serializers.py index 33f571c7e..340755b8a 100644 --- a/netbox/circuits/api/serializers.py +++ b/netbox/circuits/api/serializers.py @@ -3,7 +3,7 @@ from taggit_serializer.serializers import TaggitSerializer, TagListSerializerFie from circuits.constants import CIRCUIT_STATUS_CHOICES from circuits.models import Provider, Circuit, CircuitTermination, CircuitType -from dcim.api.serializers import NestedCableSerializer, NestedSiteSerializer +from dcim.api.serializers import NestedCableSerializer, NestedInterfaceSerializer, NestedSiteSerializer from extras.api.customfields import CustomFieldModelSerializer from tenancy.api.serializers import NestedTenantSerializer from utilities.api import ChoiceField, ValidatedModelSerializer, WritableNestedSerializer @@ -85,12 +85,14 @@ class NestedCircuitSerializer(WritableNestedSerializer): class CircuitTerminationSerializer(ValidatedModelSerializer): circuit = NestedCircuitSerializer() site = NestedSiteSerializer() + connected_endpoint = NestedInterfaceSerializer(read_only=True) cable = NestedCableSerializer(read_only=True) class Meta: model = CircuitTermination fields = [ - 'id', 'circuit', 'term_side', 'site', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'cable', + 'id', 'circuit', 'term_side', 'site', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', + 'connected_endpoint', 'cable', ] diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 8a2ff2122..63362a71d 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -584,14 +584,13 @@ class NestedConsoleServerPortSerializer(WritableNestedSerializer): class ConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): device = NestedDeviceSerializer() - connected_endpoint = NestedConsoleServerPortSerializer(required=False, allow_null=True) + connected_endpoint = NestedConsoleServerPortSerializer(read_only=True) cable = NestedCableSerializer(read_only=True) tags = TagListSerializerField(required=False) class Meta: model = ConsolePort fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags'] - read_only_fields = ['connected_endpoint'] class NestedConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): @@ -633,14 +632,13 @@ class NestedPowerOutletSerializer(WritableNestedSerializer): class PowerPortSerializer(TaggitSerializer, ValidatedModelSerializer): device = NestedDeviceSerializer() - connected_endpoint = NestedPowerOutletSerializer(required=False, allow_null=True) + connected_endpoint = NestedPowerOutletSerializer(read_only=True) cable = NestedCableSerializer(read_only=True) tags = TagListSerializerField(required=False) class Meta: model = PowerPort fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags'] - read_only_fields = ['connected_endpoint'] class NestedPowerPortSerializer(TaggitSerializer, ValidatedModelSerializer): diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index f165b39a7..86616389c 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -2003,7 +2003,6 @@ class ConsolePortTest(APITestCase): data = { 'device': self.device.pk, 'name': 'Test Console Port X', - 'connected_endpoint': consoleserverport.pk, } url = reverse('dcim-api:consoleport-detail', kwargs={'pk': self.consoleport1.pk}) @@ -2013,7 +2012,6 @@ class ConsolePortTest(APITestCase): self.assertEqual(ConsolePort.objects.count(), 3) consoleport1 = ConsolePort.objects.get(pk=response.data['id']) self.assertEqual(consoleport1.name, data['name']) - self.assertEqual(consoleport1.connected_endpoint_id, data['connected_endpoint']) def test_delete_consoleport(self): @@ -2229,7 +2227,6 @@ class PowerPortTest(APITestCase): data = { 'device': self.device.pk, 'name': 'Test Power Port X', - 'connected_endpoint': poweroutlet.pk, } url = reverse('dcim-api:powerport-detail', kwargs={'pk': self.powerport1.pk}) @@ -2239,7 +2236,6 @@ class PowerPortTest(APITestCase): self.assertEqual(PowerPort.objects.count(), 3) powerport1 = PowerPort.objects.get(pk=response.data['id']) self.assertEqual(powerport1.name, data['name']) - self.assertEqual(powerport1.connected_endpoint_id, data['connected_endpoint']) def test_delete_powerport(self): From 55c632ace7cbbec8bd885701152350c601b42948 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 31 Oct 2018 17:05:25 -0400 Subject: [PATCH 071/191] Introduce CableBulkImportView --- netbox/dcim/forms.py | 545 ++++++----------------------- netbox/dcim/urls.py | 6 +- netbox/dcim/views.py | 47 ++- netbox/templates/inc/nav_menu.html | 5 + 4 files changed, 130 insertions(+), 473 deletions(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index d6d5be7b4..78d7973b2 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -4,6 +4,7 @@ from django import forms from django.contrib.auth.models import User from django.contrib.contenttypes.models import ContentType from django.contrib.postgres.forms.array import SimpleArrayField +from django.core.exceptions import ObjectDoesNotExist from django.db.models import Count, Q from mptt.forms import TreeNodeChoiceField from natsort import natsorted @@ -1271,157 +1272,6 @@ class ConsolePortCreateForm(ComponentForm): tags = TagField(required=False) -class ConsoleConnectionCSVForm(forms.ModelForm): - console_server = FlexibleModelChoiceField( - queryset=Device.objects.all(), - to_field_name='name', - help_text='Console server name or ID', - error_messages={ - 'invalid_choice': 'Console server not found', - } - ) - connected_endpoint = forms.CharField( - help_text='Console server port' - ) - device = FlexibleModelChoiceField( - queryset=Device.objects.all(), - to_field_name='name', - help_text='Device name or ID', - error_messages={ - 'invalid_choice': 'Device not found', - } - ) - console_port = forms.CharField( - help_text='Console port name' - ) - connection_status = CSVChoiceField( - choices=CONNECTION_STATUS_CHOICES, - help_text='Connection status' - ) - - class Meta: - model = ConsolePort - fields = ['console_server', 'connected_endpoint', 'device', 'console_port', 'connection_status'] - - def clean_console_port(self): - - console_port_name = self.cleaned_data.get('console_port') - if not self.cleaned_data.get('device') or not console_port_name: - return None - - try: - # Retrieve console port by name - consoleport = ConsolePort.objects.get( - device=self.cleaned_data['device'], name=console_port_name - ) - # Check if the console port is already connected - if consoleport.connected_endpoint is not None: - raise forms.ValidationError("{} {} is already connected".format( - self.cleaned_data['device'], console_port_name - )) - except ConsolePort.DoesNotExist: - raise forms.ValidationError("Invalid console port ({} {})".format( - self.cleaned_data['device'], console_port_name - )) - - self.instance = consoleport - return consoleport - - def clean_connected_endpoint(self): - - consoleserverport_name = self.cleaned_data.get('connected_endpoint') - if not self.cleaned_data.get('console_server') or not consoleserverport_name: - return None - - try: - # Retrieve console server port by name - consoleserverport = ConsoleServerPort.objects.get( - device=self.cleaned_data['console_server'], name=consoleserverport_name - ) - # Check if the console server port is already connected - if ConsolePort.objects.filter(connected_endpoint=consoleserverport).count(): - raise forms.ValidationError("{} {} is already connected".format( - self.cleaned_data['console_server'], consoleserverport_name - )) - except ConsoleServerPort.DoesNotExist: - raise forms.ValidationError("Invalid console server port ({} {})".format( - self.cleaned_data['console_server'], consoleserverport_name - )) - - return consoleserverport - - -class ConsolePortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): - site = forms.ModelChoiceField( - queryset=Site.objects.all(), - required=False, - widget=forms.Select( - attrs={'filter-for': 'rack'} - ) - ) - rack = ChainedModelChoiceField( - queryset=Rack.objects.all(), - chains=( - ('site', 'site'), - ), - label='Rack', - required=False, - widget=APISelect( - api_url='/api/dcim/racks/?site_id={{site}}', - attrs={'filter-for': 'console_server', 'nullable': 'true'} - ) - ) - console_server = ChainedModelChoiceField( - queryset=Device.objects.all(), - chains=( - ('site', 'site'), - ('rack', 'rack'), - ), - label='Console Server', - required=False, - widget=APISelect( - api_url='/api/dcim/devices/?site_id={{site}}&rack_id={{rack}}', - display_field='display_name', - attrs={'filter-for': 'connected_endpoint'} - ) - ) - livesearch = forms.CharField( - required=False, - label='Console Server', - widget=Livesearch( - query_key='q', - query_url='dcim-api:device-list', - field_to_update='console_server', - ) - ) - connected_endpoint = ChainedModelChoiceField( - queryset=ConsoleServerPort.objects.all(), - chains=( - ('device', 'console_server'), - ), - label='Port', - widget=APISelect( - api_url='/api/dcim/console-server-ports/?device_id={{console_server}}', - disabled_indicator='cable', - ) - ) - - class Meta: - model = ConsolePort - fields = ['site', 'rack', 'console_server', 'livesearch', 'connected_endpoint', 'connection_status'] - labels = { - 'connected_endpoint': 'Port', - 'connection_status': 'Status', - } - - def __init__(self, *args, **kwargs): - - super(ConsolePortConnectionForm, self).__init__(*args, **kwargs) - - if not self.instance.pk: - raise RuntimeError("ConsolePortConnectionForm must be initialized with an existing ConsolePort instance.") - - # # Console server ports # @@ -1442,76 +1292,6 @@ class ConsoleServerPortCreateForm(ComponentForm): tags = TagField(required=False) -class ConsoleServerPortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.Form): - site = forms.ModelChoiceField( - queryset=Site.objects.all(), - required=False, - widget=forms.Select( - attrs={'filter-for': 'rack'} - ) - ) - rack = ChainedModelChoiceField( - queryset=Rack.objects.all(), - chains=( - ('site', 'site'), - ), - label='Rack', - required=False, - widget=APISelect( - api_url='/api/dcim/racks/?site_id={{site}}', - attrs={'filter-for': 'device', 'nullable': 'true'} - ) - ) - device = ChainedModelChoiceField( - queryset=Device.objects.all(), - chains=( - ('site', 'site'), - ('rack', 'rack'), - ), - label='Device', - required=False, - widget=APISelect( - api_url='/api/dcim/devices/?site_id={{site}}&rack_id={{rack}}', - display_field='display_name', - attrs={'filter-for': 'port'} - ) - ) - livesearch = forms.CharField( - required=False, - label='Device', - widget=Livesearch( - query_key='q', - query_url='dcim-api:device-list', - field_to_update='device' - ) - ) - port = ChainedModelChoiceField( - queryset=ConsolePort.objects.all(), - chains=( - ('device', 'device'), - ), - label='Port', - widget=APISelect( - api_url='/api/dcim/console-ports/?device_id={{device}}', - disabled_indicator='cable' - ) - ) - connection_status = forms.BooleanField( - required=False, - initial=CONNECTION_STATUS_CONNECTED, - label='Status', - widget=forms.Select( - choices=CONNECTION_STATUS_CHOICES - ) - ) - - class Meta: - fields = ['site', 'rack', 'device', 'livesearch', 'port', 'connection_status'] - labels = { - 'connection_status': 'Status', - } - - class ConsoleServerPortBulkRenameForm(BulkRenameForm): pk = forms.ModelMultipleChoiceField(queryset=ConsoleServerPort.objects.all(), widget=forms.MultipleHiddenInput) @@ -1540,157 +1320,6 @@ class PowerPortCreateForm(ComponentForm): tags = TagField(required=False) -class PowerConnectionCSVForm(forms.ModelForm): - pdu = FlexibleModelChoiceField( - queryset=Device.objects.all(), - to_field_name='name', - help_text='PDU name or ID', - error_messages={ - 'invalid_choice': 'PDU not found.', - } - ) - connected_endpoint = forms.CharField( - help_text='Power outlet name' - ) - device = FlexibleModelChoiceField( - queryset=Device.objects.all(), - to_field_name='name', - help_text='Device name or ID', - error_messages={ - 'invalid_choice': 'Device not found', - } - ) - power_port = forms.CharField( - help_text='Power port name' - ) - connection_status = CSVChoiceField( - choices=CONNECTION_STATUS_CHOICES, - help_text='Connection status' - ) - - class Meta: - model = PowerPort - fields = ['pdu', 'connected_endpoint', 'device', 'power_port', 'connection_status'] - - def clean_power_port(self): - - power_port_name = self.cleaned_data.get('power_port') - if not self.cleaned_data.get('device') or not power_port_name: - return None - - try: - # Retrieve power port by name - powerport = PowerPort.objects.get( - device=self.cleaned_data['device'], name=power_port_name - ) - # Check if the power port is already connected - if powerport.connected_endpoint is not None: - raise forms.ValidationError("{} {} is already connected".format( - self.cleaned_data['device'], power_port_name - )) - except PowerPort.DoesNotExist: - raise forms.ValidationError("Invalid power port ({} {})".format( - self.cleaned_data['device'], power_port_name - )) - - self.instance = powerport - return powerport - - def clean_connected_endpoint(self): - - poweroutlet_name = self.cleaned_data.get('connected_endpoint') - if not self.cleaned_data.get('pdu') or not poweroutlet_name: - return None - - try: - # Retrieve power outlet by name - poweroutlet = PowerOutlet.objects.get( - device=self.cleaned_data['pdu'], name=poweroutlet_name - ) - # Check if the power outlet is already connected - if PowerPort.objects.filter(connected_endpoint=poweroutlet).count(): - raise forms.ValidationError("{} {} is already connected".format( - self.cleaned_data['pdu'], poweroutlet_name - )) - except PowerOutlet.DoesNotExist: - raise forms.ValidationError("Invalid power outlet ({} {})".format( - self.cleaned_data['pdu'], poweroutlet_name - )) - - return poweroutlet - - -class PowerPortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): - site = forms.ModelChoiceField( - queryset=Site.objects.all(), - required=False, - widget=forms.Select( - attrs={'filter-for': 'rack'} - ) - ) - rack = ChainedModelChoiceField( - queryset=Rack.objects.all(), - chains=( - ('site', 'site'), - ), - label='Rack', - required=False, - widget=APISelect( - api_url='/api/dcim/racks/?site_id={{site}}', - attrs={'filter-for': 'pdu', 'nullable': 'true'} - ) - ) - pdu = ChainedModelChoiceField( - queryset=Device.objects.all(), - chains=( - ('site', 'site'), - ('rack', 'rack'), - ), - label='PDU', - required=False, - widget=APISelect( - api_url='/api/dcim/devices/?site_id={{site}}&rack_id={{rack}}', - display_field='display_name', - attrs={'filter-for': 'connected_endpoint'} - ) - ) - livesearch = forms.CharField( - required=False, - label='PDU', - widget=Livesearch( - query_key='q', - query_url='dcim-api:device-list', - field_to_update='pdu' - ) - ) - connected_endpoint = ChainedModelChoiceField( - queryset=PowerOutlet.objects.all(), - chains=( - ('device', 'pdu'), - ), - label='Outlet', - widget=APISelect( - api_url='/api/dcim/power-outlets/?device_id={{pdu}}', - disabled_indicator='cable' - ) - ) - - class Meta: - model = PowerPort - fields = ['site', 'rack', 'pdu', 'livesearch', 'connected_endpoint', 'connection_status'] - labels = { - 'connected_endpoint': 'Outlet', - 'connection_status': 'Status', - } - - def __init__(self, *args, **kwargs): - - super(PowerPortConnectionForm, self).__init__(*args, **kwargs) - - if not self.instance.pk: - raise RuntimeError("PowerPortConnectionForm must be initialized with an existing PowerPort instance.") - - # # Power outlets # @@ -1711,76 +1340,6 @@ class PowerOutletCreateForm(ComponentForm): tags = TagField(required=False) -class PowerOutletConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.Form): - site = forms.ModelChoiceField( - queryset=Site.objects.all(), - required=False, - widget=forms.Select( - attrs={'filter-for': 'rack'} - ) - ) - rack = ChainedModelChoiceField( - queryset=Rack.objects.all(), - chains=( - ('site', 'site'), - ), - label='Rack', - required=False, - widget=APISelect( - api_url='/api/dcim/racks/?site_id={{site}}', - attrs={'filter-for': 'device', 'nullable': 'true'} - ) - ) - device = ChainedModelChoiceField( - queryset=Device.objects.all(), - chains=( - ('site', 'site'), - ('rack', 'rack'), - ), - label='Device', - required=False, - widget=APISelect( - api_url='/api/dcim/devices/?site_id={{site}}&rack_id={{rack}}', - display_field='display_name', - attrs={'filter-for': 'port'} - ) - ) - livesearch = forms.CharField( - required=False, - label='Device', - widget=Livesearch( - query_key='q', - query_url='dcim-api:device-list', - field_to_update='device' - ) - ) - port = ChainedModelChoiceField( - queryset=PowerPort.objects.all(), - chains=( - ('device', 'device'), - ), - label='Port', - widget=APISelect( - api_url='/api/dcim/power-ports/?device_id={{device}}', - disabled_indicator='cable' - ) - ) - connection_status = forms.BooleanField( - required=False, - initial=CONNECTION_STATUS_CONNECTED, - label='Status', - widget=forms.Select( - choices=CONNECTION_STATUS_CHOICES - ) - ) - - class Meta: - fields = ['site', 'rack', 'device', 'livesearch', 'port', 'connection_status'] - labels = { - 'connection_status': 'Status', - } - - class PowerOutletBulkRenameForm(BulkRenameForm): pk = forms.ModelMultipleChoiceField(queryset=PowerOutlet.objects.all(), widget=forms.MultipleHiddenInput) @@ -2199,6 +1758,108 @@ class CableForm(BootstrapMixin, forms.ModelForm): fields = ('type', 'status', 'label', 'color', 'length', 'length_unit') +class CableCSVForm(forms.ModelForm): + + # Termination A + side_a_device = FlexibleModelChoiceField( + queryset=Device.objects.all(), + to_field_name='name', + help_text='Console server name or ID', + error_messages={ + 'invalid_choice': 'Side A device not found', + } + ) + side_a_type = forms.ModelChoiceField( + queryset=ContentType.objects.all(), + limit_choices_to={'model__in': CABLE_TERMINATION_TYPES}, + to_field_name='model' + ) + side_a_name = forms.CharField() + + # Termination B + side_b_device = FlexibleModelChoiceField( + queryset=Device.objects.all(), + to_field_name='name', + help_text='Console server name or ID', + error_messages={ + 'invalid_choice': 'Side B device not found', + } + ) + side_b_type = forms.ModelChoiceField( + queryset=ContentType.objects.all(), + limit_choices_to={'model__in': CABLE_TERMINATION_TYPES}, + to_field_name='model' + ) + side_b_name = forms.CharField() + + # Cable attributes + status = CSVChoiceField( + choices=CONNECTION_STATUS_CHOICES, + required=False, + help_text='Connection status' + ) + + class Meta: + model = Cable + fields = [ + 'side_a_device', 'side_a_type', 'side_a_name', 'side_b_device', 'side_b_type', 'side_b_name', 'status', + 'label', + ] + + # TODO: Merge the clean() methods for either end + def clean_side_a_name(self): + + device = self.cleaned_data.get('side_a_device') + content_type = self.cleaned_data.get('side_a_type') + name = self.cleaned_data.get('side_a_name') + if not device or not content_type or not name: + return None + + model = content_type.model_class() + try: + termination_object = model.objects.get( + device=device, + name=name + ) + if termination_object.cable is not None: + raise forms.ValidationError( + "Side A: {} {} is already connected".format(device, termination_object) + ) + except ObjectDoesNotExist: + raise forms.ValidationError( + "A side termination not found: {} {}".format(device, name) + ) + + self.instance.termination_a = termination_object + return termination_object + + def clean_side_b_name(self): + + device = self.cleaned_data.get('side_b_device') + content_type = self.cleaned_data.get('side_b_type') + name = self.cleaned_data.get('side_b_name') + if not device or not content_type or not name: + return None + + model = content_type.model_class() + try: + termination_object = model.objects.get( + device=device, + name=name + ) + if termination_object.cable is not None: + raise forms.ValidationError( + "Side B: {} {} is already connected".format(device, termination_object) + ) + except ObjectDoesNotExist: + raise forms.ValidationError( + "B side termination not found: {} {}".format(device, name) + ) + + self.instance.termination_b = termination_object + return termination_object + + class CableFilterForm(BootstrapMixin, forms.Form): model = Cable q = forms.CharField(required=False, label='Search') diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index c06bc4a30..8a49da199 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -251,17 +251,15 @@ urlpatterns = [ # Cables url(r'^cables/$', views.CableListView.as_view(), name='cable_list'), + url(r'^cables/import/$', views.CableBulkImportView.as_view(), name='cable_import'), url(r'^cables/(?P\d+)/$', views.CableView.as_view(), name='cable'), url(r'^cables/(?P\d+)/edit/$', views.CableEditView.as_view(), name='cable_edit'), url(r'^cables/(?P\d+)/delete/$', views.CableDeleteView.as_view(), name='cable_delete'), - # Console/power/interface connections + # Console/power/interface connections (read-only) url(r'^console-connections/$', views.ConsoleConnectionsListView.as_view(), name='console_connections_list'), - # url(r'^console-connections/import/$', views.ConsoleConnectionsBulkImportView.as_view(), name='console_connections_import'), url(r'^power-connections/$', views.PowerConnectionsListView.as_view(), name='power_connections_list'), - # url(r'^power-connections/import/$', views.PowerConnectionsBulkImportView.as_view(), name='power_connections_import'), url(r'^interface-connections/$', views.InterfaceConnectionsListView.as_view(), name='interface_connections_list'), - # url(r'^interface-connections/import/$', views.InterfaceConnectionsBulkImportView.as_view(), name='interface_connections_import'), # Virtual chassis url(r'^virtual-chassis/$', views.VirtualChassisListView.as_view(), name='virtualchassis_list'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 6c419f66c..6f1b3aea5 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1121,13 +1121,6 @@ class ConsolePortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): table = tables.ConsolePortTable -class ConsoleConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView): - permission_required = 'dcim.change_consoleport' - model_form = forms.ConsoleConnectionCSVForm - table = tables.ConsoleConnectionTable - default_return_url = 'dcim:console_connections_list' - - # # Console server ports # @@ -1212,13 +1205,6 @@ class PowerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): table = tables.PowerPortTable -class PowerConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView): - permission_required = 'dcim.change_powerport' - model_form = forms.PowerConnectionCSVForm - table = tables.PowerConnectionTable - default_return_url = 'dcim:power_connections_list' - - # # Power outlets # @@ -1645,6 +1631,21 @@ class CableView(View): }) +class CableTraceView(View): + """ + Trace a cable path beginning from the given termination. + """ + + def get(self, request, model, pk): + + obj = get_object_or_404(model, pk=pk) + + return render(request, 'dcim/cable_trace.html', { + 'obj': obj, + 'trace': obj.trace(), + }) + + class CableCreateView(PermissionRequiredMixin, ObjectEditView): permission_required = 'dcim.add_cable' model = Cable @@ -1674,19 +1675,11 @@ class CableDeleteView(PermissionRequiredMixin, ObjectDeleteView): default_return_url = 'dcim:cable_list' -class CableTraceView(View): - """ - Trace a cable path beginning from the given termination. - """ - - def get(self, request, model, pk): - - obj = get_object_or_404(model, pk=pk) - - return render(request, 'dcim/cable_trace.html', { - 'obj': obj, - 'trace': obj.trace(), - }) +class CableBulkImportView(PermissionRequiredMixin, BulkImportView): + permission_required = 'dcim.add_cable' + model_form = forms.CableCSVForm + table = tables.CableTable + default_return_url = 'dcim:cable_list' # diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html index ef6329564..64f68e7e2 100644 --- a/netbox/templates/inc/nav_menu.html +++ b/netbox/templates/inc/nav_menu.html @@ -180,6 +180,11 @@
    • Connections
    • + {% if perms.dcim.add_cable %} +
      + +
      + {% endif %} Cables
    • From 849db8fe449866419631b925ad005759a8453624 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 09:59:53 -0400 Subject: [PATCH 072/191] Finished CableCSVForm --- netbox/dcim/forms.py | 35 +++++++++++++++----- netbox/utilities/forms.py | 41 ++++++++++++++++++++++-- netbox/utilities/templatetags/helpers.py | 11 +++++-- 3 files changed, 74 insertions(+), 13 deletions(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 78d7973b2..1e68069aa 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1764,7 +1764,7 @@ class CableCSVForm(forms.ModelForm): side_a_device = FlexibleModelChoiceField( queryset=Device.objects.all(), to_field_name='name', - help_text='Console server name or ID', + help_text='Side A device name or ID', error_messages={ 'invalid_choice': 'Side A device not found', } @@ -1772,15 +1772,18 @@ class CableCSVForm(forms.ModelForm): side_a_type = forms.ModelChoiceField( queryset=ContentType.objects.all(), limit_choices_to={'model__in': CABLE_TERMINATION_TYPES}, - to_field_name='model' + to_field_name='model', + help_text='Side A type' + ) + side_a_name = forms.CharField( + help_text='Side A component' ) - side_a_name = forms.CharField() # Termination B side_b_device = FlexibleModelChoiceField( queryset=Device.objects.all(), to_field_name='name', - help_text='Console server name or ID', + help_text='Side B device name or ID', error_messages={ 'invalid_choice': 'Side B device not found', } @@ -1788,9 +1791,12 @@ class CableCSVForm(forms.ModelForm): side_b_type = forms.ModelChoiceField( queryset=ContentType.objects.all(), limit_choices_to={'model__in': CABLE_TERMINATION_TYPES}, - to_field_name='model' + to_field_name='model', + help_text='Side B type' + ) + side_b_name = forms.CharField( + help_text='Side B component' ) - side_b_name = forms.CharField() # Cable attributes status = CSVChoiceField( @@ -1798,13 +1804,26 @@ class CableCSVForm(forms.ModelForm): required=False, help_text='Connection status' ) + type = CSVChoiceField( + choices=CABLE_TYPE_CHOICES, + required=False, + help_text='Cable type' + ) + length_unit = CSVChoiceField( + choices=LENGTH_UNIT_CHOICES, + required=False, + help_text='Length unit' + ) class Meta: model = Cable fields = [ - 'side_a_device', 'side_a_type', 'side_a_name', 'side_b_device', 'side_b_type', 'side_b_name', 'status', - 'label', + 'side_a_device', 'side_a_type', 'side_a_name', 'side_b_device', 'side_b_type', 'side_b_name', 'type', + 'status', 'label', 'color', 'length', 'length_unit', ] + help_texts = { + 'color': 'RGB color in hexadecimal (e.g. 00ff00)' + } # TODO: Merge the clean() methods for either end def clean_side_a_name(self): diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index 57e89ac1d..b9b04a337 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -149,6 +149,43 @@ def add_blank_choice(choices): return ((None, '---------'),) + tuple(choices) +def unpack_grouped_choices(choices): + """ + Unpack a grouped choices hierarchy into a flat list of two-tuples. For example: + + choices = ( + ('Foo', ( + (1, 'A'), + (2, 'B') + )), + ('Bar', ( + (3, 'C'), + (4, 'D') + )) + ) + + becomes: + + choices = ( + (1, 'A'), + (2, 'B'), + (3, 'C'), + (4, 'D') + ) + """ + unpacked_choices = [] + for key, value in choices: + if key == 1300: + breakme = True + if isinstance(value, (list, tuple)): + # Entered an optgroup + for optgroup_key, optgroup_value in value: + unpacked_choices.append((optgroup_key, optgroup_value)) + else: + unpacked_choices.append((key, value)) + return unpacked_choices + + def utf8_encoder(data): for line in data: yield line.encode('utf-8') @@ -353,8 +390,8 @@ class CSVChoiceField(forms.ChoiceField): def __init__(self, choices, *args, **kwargs): super(CSVChoiceField, self).__init__(choices=choices, *args, **kwargs) - self.choices = [(label, label) for value, label in choices] - self.choice_values = {label: value for value, label in choices} + self.choices = [(label, label) for value, label in unpack_grouped_choices(choices)] + self.choice_values = {label: value for value, label in unpack_grouped_choices(choices)} def clean(self, value): value = super(CSVChoiceField, self).clean(value) diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py index 555cbe03f..0d5063ae0 100644 --- a/netbox/utilities/templatetags/helpers.py +++ b/netbox/utilities/templatetags/helpers.py @@ -5,6 +5,9 @@ from django import template from django.utils.safestring import mark_safe from markdown import markdown +from utilities.forms import unpack_grouped_choices + + register = template.Library() @@ -113,14 +116,16 @@ def example_choices(field, arg=3): """ examples = [] if hasattr(field, 'queryset'): - choices = [(obj.pk, getattr(obj, field.to_field_name)) for obj in field.queryset[:arg + 1]] + choices = [ + (obj.pk, getattr(obj, field.to_field_name)) for obj in field.queryset[:arg + 1] + ] else: choices = field.choices - for id, label in choices: + for value, label in unpack_grouped_choices(choices): if len(examples) == arg: examples.append('etc.') break - if not id or not label: + if not value or not label: continue examples.append(label) return ', '.join(examples) or 'None' From 3bc6fc5e24763999262bd9e0125a2f94675c1a79 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 10:04:43 -0400 Subject: [PATCH 073/191] Added changelog view for Cable --- netbox/dcim/urls.py | 3 ++- netbox/templates/dcim/cable.html | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 8a49da199..583948b0e 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -5,7 +5,7 @@ from ipam.views import ServiceCreateView from secrets.views import secret_add from . import views from .models import ( - ConsolePort, ConsoleServerPort, Device, DeviceRole, DeviceType, FrontPort, Interface, Manufacturer, Platform, + Cable, ConsolePort, ConsoleServerPort, Device, DeviceRole, DeviceType, FrontPort, Interface, Manufacturer, Platform, PowerPort, PowerOutlet, Rack, RackGroup, RackReservation, RackRole, RearPort, Region, Site, VirtualChassis, ) @@ -255,6 +255,7 @@ urlpatterns = [ url(r'^cables/(?P\d+)/$', views.CableView.as_view(), name='cable'), url(r'^cables/(?P\d+)/edit/$', views.CableEditView.as_view(), name='cable_edit'), url(r'^cables/(?P\d+)/delete/$', views.CableDeleteView.as_view(), name='cable_delete'), + url(r'^cables/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='cable_changelog', kwargs={'model': Cable}), # Console/power/interface connections (read-only) url(r'^console-connections/$', views.ConsoleConnectionsListView.as_view(), name='console_connections_list'), diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html index 95b27c8a3..c11f9e686 100644 --- a/netbox/templates/dcim/cable.html +++ b/netbox/templates/dcim/cable.html @@ -23,6 +23,14 @@ {% endif %}

      • {% block title %}Cable {{ cable }}{% endblock %}

      + {% endblock %} {% block content %} From 5e7fccb64e2a28e31406a4a0961dd6d18a872eee Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 10:14:47 -0400 Subject: [PATCH 074/191] Add blank choice to ColorSelect widget --- netbox/utilities/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index b9b04a337..e4a8062f0 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -209,7 +209,7 @@ class ColorSelect(forms.Select): option_template_name = 'widgets/colorselect_option.html' def __init__(self, *args, **kwargs): - kwargs['choices'] = COLOR_CHOICES + kwargs['choices'] = add_blank_choice(COLOR_CHOICES) super(ColorSelect, self).__init__(*args, **kwargs) From ad03a0925b187fe204af57e465f86ad18f99783d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 10:18:37 -0400 Subject: [PATCH 075/191] Fixed cable type filtering --- netbox/utilities/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index e4a8062f0..844580c57 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -587,7 +587,7 @@ class AnnotatedMultipleChoiceField(forms.MultipleChoiceField): def __init__(self, choices, annotate, annotate_field, *args, **kwargs): self.annotate = annotate self.annotate_field = annotate_field - self.static_choices = choices + self.static_choices = unpack_grouped_choices(choices) super(AnnotatedMultipleChoiceField, self).__init__(choices=self.annotate_choices, *args, **kwargs) From 79c110df39f5958c6f77e06b87d4b9dad68fe45f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 10:25:30 -0400 Subject: [PATCH 076/191] Create id_string on Cable to preserve access to pk after object deletion --- netbox/dcim/models.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 8f6e01554..995e46bb8 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2414,7 +2414,7 @@ class Cable(ChangeLoggedModel): ) def __str__(self): - return self.label if self.label else '#{}'.format(self.pk) + return self.label or self.id_string def get_absolute_url(self): return reverse('dcim:cable', args=[self.pk]) @@ -2427,6 +2427,15 @@ class Cable(ChangeLoggedModel): super(Cable, self).save(*args, **kwargs) + def __init__(self, *args, **kwargs): + + super(Cable, self).__init__(*args, **kwargs) + + # Create an ID string for use by __str__(). We have to save a copy of pk since it's nullified after .delete() + # is called. + self.id_string = '#{}'.format(self.pk) + + def get_path_endpoints(self): """ Traverse both ends of a cable path and return its connected endpoints. Note that one or both endpoints may be From 571a3e9677b83d76323ea7a9a6c9ed7597a051ca Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 10:51:38 -0400 Subject: [PATCH 077/191] Added cable column to console/power/interface connection tables --- netbox/dcim/tables.py | 22 +++++++++++++++++----- netbox/dcim/views.py | 6 +++--- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 39085cc45..d94fa6780 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -672,7 +672,7 @@ class CableTable(BaseTable): class ConsoleConnectionTable(BaseTable): console_server = tables.LinkColumn( - 'dcim:device', + viewname='dcim:device', accessor=Accessor('connected_endpoint.device'), args=[Accessor('connected_endpoint.device.pk')], verbose_name='Console server' @@ -680,15 +680,19 @@ class ConsoleConnectionTable(BaseTable): connected_endpoint = tables.Column(verbose_name='Port') device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device') name = tables.Column(verbose_name='Console port') + cable = tables.LinkColumn( + viewname='dcim:cable', + args=[Accessor('cable.pk')] + ) class Meta(BaseTable.Meta): model = ConsolePort - fields = ('console_server', 'connected_endpoint', 'device', 'name') + fields = ('console_server', 'connected_endpoint', 'device', 'name', 'cable') class PowerConnectionTable(BaseTable): pdu = tables.LinkColumn( - 'dcim:device', + viewname='dcim:device', accessor=Accessor('connected_endpoint.device'), args=[Accessor('connected_endpoint.device.pk')], verbose_name='PDU' @@ -696,10 +700,14 @@ class PowerConnectionTable(BaseTable): connected_endpoint = tables.Column(verbose_name='Outlet') device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device') name = tables.Column(verbose_name='Power Port') + cable = tables.LinkColumn( + viewname='dcim:cable', + args=[Accessor('cable.pk')] + ) class Meta(BaseTable.Meta): model = PowerPort - fields = ('pdu', 'connected_endpoint', 'device', 'name') + fields = ('pdu', 'connected_endpoint', 'device', 'name', 'cable') class InterfaceConnectionTable(BaseTable): @@ -727,10 +735,14 @@ class InterfaceConnectionTable(BaseTable): args=[Accessor('connected_endpoint.pk')], verbose_name='Interface B' ) + cable = tables.LinkColumn( + viewname='dcim:cable', + args=[Accessor('cable.pk')] + ) class Meta(BaseTable.Meta): model = Interface - fields = ('device_a', 'interface_a', 'device_b', 'interface_b') + fields = ('device_a', 'interface_a', 'device_b', 'interface_b', 'cable') # diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 6f1b3aea5..617f27854 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1692,7 +1692,7 @@ class ConsoleConnectionsListView(ObjectListView): ).filter( connected_endpoint__isnull=False ).order_by( - 'connected_endpoint__device__name', 'connected_endpoint__name' + 'cable', 'connected_endpoint__device__name', 'connected_endpoint__name' ) filter = filters.ConsoleConnectionFilter filter_form = forms.ConsoleConnectionFilterForm @@ -1706,7 +1706,7 @@ class PowerConnectionsListView(ObjectListView): ).filter( connected_endpoint__isnull=False ).order_by( - 'connected_endpoint__device__name', 'connected_endpoint__name' + 'cable', 'connected_endpoint__device__name', 'connected_endpoint__name' ) filter = filters.PowerConnectionFilter filter_form = forms.PowerConnectionFilterForm @@ -1716,7 +1716,7 @@ class PowerConnectionsListView(ObjectListView): class InterfaceConnectionsListView(ObjectListView): queryset = Interface.objects.select_related( - 'device', '_connected_interface__device' + 'device', 'cable', '_connected_interface__device' ).filter( # Avoid duplicate connections by only selecting the lower PK in a connected pair _connected_interface__isnull=False, From 903dfb6f07d0bf09c23deba2d787b557494bff1f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 11:44:02 -0400 Subject: [PATCH 078/191] Added validation to Cable model --- netbox/dcim/models.py | 53 +++++++++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 995e46bb8..bdfdddd9a 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2413,20 +2413,6 @@ class Cable(ChangeLoggedModel): ('termination_b_type', 'termination_b_id'), ) - def __str__(self): - return self.label or self.id_string - - def get_absolute_url(self): - return reverse('dcim:cable', args=[self.pk]) - - def save(self, *args, **kwargs): - - # Store the given length (if any) in meters for use in database ordering - if self.length and self.length_unit: - self._abs_length = to_meters(self.length, self.length_unit) - - super(Cable, self).save(*args, **kwargs) - def __init__(self, *args, **kwargs): super(Cable, self).__init__(*args, **kwargs) @@ -2435,6 +2421,45 @@ class Cable(ChangeLoggedModel): # is called. self.id_string = '#{}'.format(self.pk) + def __str__(self): + return self.label or self.id_string + + def get_absolute_url(self): + return reverse('dcim:cable', args=[self.pk]) + + def clean(self): + + # Check that termination types are compatible + type_a = self.termination_a_type.model + type_b = self.termination_b_type.model + if type_b not in COMPATIBLE_TERMINATION_TYPES.get(type_a): + raise ValidationError("Incompatible termination types: {} and {}".format( + self.termination_a_type, self.termination_b_type + )) + + # Check for an existing Cable connected to either termination object + if self.termination_a.cable is not None: + raise ValidationError("{} already has a cable attached (#{})".format( + self.termination_a, self.termination_a.cable_id + )) + if self.termination_b.cable is not None: + raise ValidationError("{} already has a cable attached (#{})".format( + self.termination_b, self.termination_b.cable_id + )) + + # Validate length and length_unit + if self.length and not self.length_unit: + raise ValidationError("Must specify a unit when setting a cable length") + if self.length_unit and self.length is None: + self.length_unit = None + + def save(self, *args, **kwargs): + + # Store the given length (if any) in meters for use in database ordering + if self.length and self.length_unit: + self._abs_length = to_meters(self.length, self.length_unit) + + super(Cable, self).save(*args, **kwargs) def get_path_endpoints(self): """ From 105f9365bf78e475e41084599ba797b0873c34cb Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 11:54:15 -0400 Subject: [PATCH 079/191] Fixed Cable model validation --- netbox/dcim/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index bdfdddd9a..9f56dd2f8 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2438,11 +2438,11 @@ class Cable(ChangeLoggedModel): )) # Check for an existing Cable connected to either termination object - if self.termination_a.cable is not None: + if self.termination_a.cable not in (None, self): raise ValidationError("{} already has a cable attached (#{})".format( self.termination_a, self.termination_a.cable_id )) - if self.termination_b.cable is not None: + if self.termination_b.cable not in (None, self): raise ValidationError("{} already has a cable attached (#{})".format( self.termination_b, self.termination_b.cable_id )) @@ -2451,7 +2451,7 @@ class Cable(ChangeLoggedModel): if self.length and not self.length_unit: raise ValidationError("Must specify a unit when setting a cable length") if self.length_unit and self.length is None: - self.length_unit = None + self.length_unit = '' def save(self, *args, **kwargs): From a5f0deaea30c689d62f8d37962471f723c615fb5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 11:54:34 -0400 Subject: [PATCH 080/191] Put length and length_unit fields on same line in form --- netbox/dcim/views.py | 1 + netbox/templates/dcim/cable_edit.html | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 netbox/templates/dcim/cable_edit.html diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 617f27854..8f973d064 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1666,6 +1666,7 @@ class CableEditView(PermissionRequiredMixin, ObjectEditView): permission_required = 'dcim.change_cable' model = Cable model_form = forms.CableForm + template_name = 'dcim/cable_edit.html' default_return_url = 'dcim:cable_list' diff --git a/netbox/templates/dcim/cable_edit.html b/netbox/templates/dcim/cable_edit.html new file mode 100644 index 000000000..17403a07d --- /dev/null +++ b/netbox/templates/dcim/cable_edit.html @@ -0,0 +1,23 @@ +{% extends 'utilities/obj_edit.html' %} +{% load form_helpers %} + +{% block form %} +
      +
      Cable
      +
      + {% render_field form.type %} + {% render_field form.status %} + {% render_field form.label %} + {% render_field form.color %} +
      + +
      + {{ form.length }} +
      +
      + {{ form.length_unit }} +
      +
      +
      +
      +{% endblock %} From 841ddd5d83bda29ed3432ca37f4298c82d55388a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 11:57:38 -0400 Subject: [PATCH 081/191] Add circuit termination as valid termination type for front/rear ports --- netbox/dcim/constants.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index 90e5afd90..3fd75bfc9 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -341,8 +341,8 @@ COMPATIBLE_TERMINATION_TYPES = { 'powerport': ['poweroutlet'], 'poweroutlet': ['powerport'], 'interface': ['interface', 'circuittermination', 'frontport', 'rearport'], - 'frontport': ['consoleport', 'consoleserverport', 'interface', 'frontport', 'rearport'], - 'rearport': ['consoleport', 'consoleserverport', 'interface', 'frontport', 'rearport'], + 'frontport': ['consoleport', 'consoleserverport', 'interface', 'frontport', 'rearport', 'circuittermination'], + 'rearport': ['consoleport', 'consoleserverport', 'interface', 'frontport', 'rearport', 'circuittermination'], 'circuittermination': ['interface', 'frontport', 'rearport'], } From 2af3685daebeb2a1007c36cc651e31e262e5e03b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 12:22:25 -0400 Subject: [PATCH 082/191] Added cables documentation --- docs/core-functionality/circuits.md | 2 +- docs/core-functionality/devices.md | 26 +++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/docs/core-functionality/circuits.md b/docs/core-functionality/circuits.md index e56c9d8c6..f41c94ec6 100644 --- a/docs/core-functionality/circuits.md +++ b/docs/core-functionality/circuits.md @@ -25,7 +25,7 @@ Circuit types are fully customizable. A circuit may have one or two terminations, annotated as the "A" and "Z" sides of the circuit. A single-termination circuit can be used when you don't know (or care) about the far end of a circuit (for example, an Internet access circuit which connects to a transit provider). A dual-termination circuit is useful for tracking circuits which connect two sites. -Each circuit termination is tied to a site, and optionally to a specific device and interface within that site. Each termination can be assigned a separate downstream and upstream speed independent from one another. Fields are also available to track cross-connect and patch panel details. +Each circuit termination is tied to a site, and may optionally be connected via a cable to a specific device interface or pass-through port. Each termination can be assigned a separate downstream and upstream speed independent from one another. Fields are also available to track cross-connect and patch panel details. !!! note A circuit represents a physical link, and cannot have more than two endpoints. When modeling a multi-point topology, each leg of the topology must be defined as a discrete circuit. diff --git a/docs/core-functionality/devices.md b/docs/core-functionality/devices.md index 1c66afdae..e51bf541c 100644 --- a/docs/core-functionality/devices.md +++ b/docs/core-functionality/devices.md @@ -93,9 +93,7 @@ Pass-through ports can also be used to model "bump in the wire" devices, such as Device bays represent the ability of a device to house child devices. For example, you might install four blade servers into a 2U chassis. The chassis would appear in the rack elevation as a 2U device with four device bays. Each server within it would be defined as a 0U device installed in one of the device bays. Child devices do not appear within rack elevations, but they are included in the "Non-Racked Devices" list within the rack view. ---- - -# Device Roles +## Device Roles Devices can be organized by functional roles. These roles are fully customizable. For example, you might create roles for core switches, distribution switches, and access switches. @@ -122,3 +120,25 @@ Inventory items represent hardware components installed within a device, such as A virtual chassis represents a set of devices which share a single control plane: a stack of switches which are managed as a single device, for example. Each device in the virtual chassis is assigned a position and (optionally) a priority. Exactly one device is designated the virtual chassis master: This device will typically be assigned a name, secrets, services, and other attributes related to its management. It's important to recognize the distinction between a virtual chassis and a chassis-based device. For instance, a virtual chassis is not used to model a chassis switch with removable line cards such as the Juniper EX9208, as its line cards are _not_ physically separate devices capable of operating independently. + +--- + +# Cables + +A cable represents a physical connection between two termination points, such as between a console port and a patch panel port, or between two network interfaces. Cables can be traced through pass-through ports to form a complete path between two endpoints. In the example below, three individual cables comprise a path between the two connected endpoints. + +``` +|<------------------------------------------ Cable Path ------------------------------------------->| + + Device A Patch Panel A Patch Panel B Device B ++-----------+ +-------------+ +-------------+ +-----------+ +| Interface | --- Cable --- | Front Port | | Front Port | --- Cable --- | Interface | ++-----------+ +-------------+ +-------------+ +-----------+ + +-------------+ +-------------+ + | Rear Port | --- Cable --- | Rear Port | + +-------------+ +-------------+ +``` + +All connections between device components in NetBox are represented using cables. However, defining the actual cable plant is optional: Components can be be directly connected using cables with no type or other attributes assigned. + +Cables are also used to associated ports and interfaces with circuit terminations. To do this, first create the circuit termination, then navigate the desired component and connect a cable between the two. From c3db7191d2fcb99cec5ff48e63294932d3cf433b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 13:19:24 -0400 Subject: [PATCH 083/191] Added bulk edit/delete views for cables --- netbox/dcim/forms.py | 48 +++++++++++++++++++++++++++ netbox/dcim/tables.py | 11 +++--- netbox/dcim/urls.py | 2 ++ netbox/dcim/views.py | 17 ++++++++++ netbox/templates/dcim/cable_list.html | 2 +- 5 files changed, 75 insertions(+), 5 deletions(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 1e68069aa..c16412927 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1879,6 +1879,54 @@ class CableCSVForm(forms.ModelForm): return termination_object +class CableBulkEditForm(BootstrapMixin, BulkEditForm): + pk = forms.ModelMultipleChoiceField( + queryset=Cable.objects.all(), + widget=forms.MultipleHiddenInput + ) + type = forms.ChoiceField( + choices=add_blank_choice(CABLE_TYPE_CHOICES), + required=False, + initial='' + ) + status = forms.ChoiceField( + choices=add_blank_choice(CONNECTION_STATUS_CHOICES), + required=False, + initial='' + ) + label = forms.CharField( + max_length=100, + required=False + ) + color = forms.CharField( + max_length=6, + required=False, + widget=ColorSelect() + ) + length = forms.IntegerField( + min_value=1, + required=False + ) + length_unit = forms.ChoiceField( + choices=add_blank_choice(LENGTH_UNIT_CHOICES), + required=False, + initial='' + ) + + class Meta: + nullable_fields = ['type', 'status', 'label', 'color', 'length'] + + def clean(self): + + # Validate length/unit + length = self.cleaned_data.get('length') + length_unit = self.cleaned_data.get('length_unit') + if length and not length_unit: + raise forms.ValidationError({ + 'length_unit': "Must specify a unit when setting length" + }) + + class CableFilterForm(BootstrapMixin, forms.Form): model = Cable q = forms.CharField(required=False, label='Search') diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index d94fa6780..3ffaded78 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -621,12 +621,13 @@ class DeviceBayTable(BaseTable): # class CableTable(BaseTable): - # django-tables2 adds CSS `class="label"` which causes rendering issues - pk = tables.LinkColumn( + pk = ToggleColumn() + id = tables.LinkColumn( viewname='dcim:cable', args=[Accessor('pk')], - verbose_name='PK' + verbose_name='ID' ) + # django-tables2 adds CSS `class="label"` which causes rendering issues label_ = tables.Column( accessor=Accessor('label'), verbose_name='Label' @@ -663,7 +664,9 @@ class CableTable(BaseTable): class Meta(BaseTable.Meta): model = Cable - fields = ('pk', 'label_', 'device_a', 'termination_a', 'device_b', 'termination_b', 'status', 'type', 'color') + fields = ( + 'pk', 'id', 'label_', 'device_a', 'termination_a', 'device_b', 'termination_b', 'status', 'type', 'color', + ) # diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 583948b0e..24c6d6a9a 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -252,6 +252,8 @@ urlpatterns = [ # Cables url(r'^cables/$', views.CableListView.as_view(), name='cable_list'), url(r'^cables/import/$', views.CableBulkImportView.as_view(), name='cable_import'), + url(r'^cables/edit/$', views.CableBulkEditView.as_view(), name='cable_bulk_edit'), + url(r'^cables/delete/$', views.CableBulkDeleteView.as_view(), name='cable_bulk_delete'), url(r'^cables/(?P\d+)/$', views.CableView.as_view(), name='cable'), url(r'^cables/(?P\d+)/edit/$', views.CableEditView.as_view(), name='cable_edit'), url(r'^cables/(?P\d+)/delete/$', views.CableDeleteView.as_view(), name='cable_delete'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 8f973d064..9f27f2e72 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1683,6 +1683,23 @@ class CableBulkImportView(PermissionRequiredMixin, BulkImportView): default_return_url = 'dcim:cable_list' +class CableBulkEditView(PermissionRequiredMixin, BulkEditView): + permission_required = 'dcim.change_cable' + queryset = Cable.objects.prefetch_related('termination_a', 'termination_b') + filter = filters.CableFilter + table = tables.CableTable + form = forms.CableBulkEditForm + default_return_url = 'dcim:cable_list' + + +class CableBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_cable' + queryset = Cable.objects.prefetch_related('termination_a', 'termination_b') + filter = filters.CableFilter + table = tables.CableTable + default_return_url = 'dcim:cable_list' + + # # Connections # diff --git a/netbox/templates/dcim/cable_list.html b/netbox/templates/dcim/cable_list.html index b942986e3..255a4b113 100644 --- a/netbox/templates/dcim/cable_list.html +++ b/netbox/templates/dcim/cable_list.html @@ -8,7 +8,7 @@

      {% block title %}Cables{% endblock %}

      - {% include 'responsive_table.html' %} + {% include 'utilities/obj_table.html' with bulk_edit_url='dcim:cable_bulk_edit' bulk_delete_url='dcim:cable_bulk_delete' %}
      {% include 'inc/search_panel.html' %} From 1119209fa0bd06c1407e9d33dab4b9985034e373 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 13:39:39 -0400 Subject: [PATCH 084/191] Added CSV export for cables --- netbox/dcim/models.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 9f56dd2f8..6e876c360 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2407,6 +2407,11 @@ class Cable(ChangeLoggedModel): objects = CableQuerySet.as_manager() + csv_headers = [ + 'termination_a_type', 'termination_a_id', 'termination_b_type', 'termination_b_id', 'type', 'status', 'label', + 'color', 'length', 'length_unit', + ] + class Meta: unique_together = ( ('termination_a_type', 'termination_a_id'), @@ -2461,6 +2466,20 @@ class Cable(ChangeLoggedModel): super(Cable, self).save(*args, **kwargs) + def to_csv(self): + return ( + '{}.{}'.format(self.termination_a_type.app_label, self.termination_a_type.model), + self.termination_a_id, + '{}.{}'.format(self.termination_b_type.app_label, self.termination_b_type.model), + self.termination_b_id, + self.get_type_display(), + self.get_status_display(), + self.label, + self.color, + self.length, + self.length_unit, + ) + def get_path_endpoints(self): """ Traverse both ends of a cable path and return its connected endpoints. Note that one or both endpoints may be From 623de7d210c0a3f55861f099f1a13bdb54612975 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 14:14:31 -0400 Subject: [PATCH 085/191] Fixed cable list display for circuit terminations --- netbox/circuits/models.py | 2 +- netbox/dcim/api/views.py | 4 +++- netbox/dcim/tables.py | 37 ++++++++++++++++++++++--------------- netbox/dcim/views.py | 2 +- 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/netbox/circuits/models.py b/netbox/circuits/models.py index 5572f1626..1aa5a7281 100644 --- a/netbox/circuits/models.py +++ b/netbox/circuits/models.py @@ -264,7 +264,7 @@ class CircuitTermination(CableTermination): unique_together = ['circuit', 'term_side'] def __str__(self): - return '{} (Side {})'.format(self.circuit, self.get_term_side_display()) + return 'Side {}'.format(self.get_term_side_display()) def log_change(self, user, request_id, action): """ diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 6c4dc6f2d..20dc4b52c 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -498,7 +498,9 @@ class InterfaceConnectionViewSet(ModelViewSet): # class CableViewSet(ModelViewSet): - queryset = Cable.objects.prefetch_related('termination_a__device', 'termination_b__device') + queryset = Cable.objects.prefetch_related( + 'termination_a', 'termination_b' + ) serializer_class = serializers.CableSerializer filter_class = filters.CableFilter diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 3ffaded78..e0acab111 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -170,6 +170,14 @@ VIRTUALCHASSIS_ACTIONS = """ {% endif %} """ +CABLE_TERMINATION_PARENT = """ +{% if value.device %} + {{ value.device }} +{% else %} + {{ value.circuit }} +{% endif %} +""" + CABLE_LENGTH = """ {% if record.length %}{{ record.length }}{{ record.length_unit }}{% else %}—{% endif %} """ @@ -632,29 +640,27 @@ class CableTable(BaseTable): accessor=Accessor('label'), verbose_name='Label' ) - device_a = tables.LinkColumn( - viewname='dcim:device', - accessor=Accessor('termination_a.device'), - args=[Accessor('termination_a.device.pk')], + termination_a_parent = tables.TemplateColumn( + template_code=CABLE_TERMINATION_PARENT, + accessor=Accessor('termination_a'), orderable=False, - verbose_name='Device A' + verbose_name='Termination A' ) termination_a = tables.Column( - accessor=Accessor('termination_a.name'), + accessor=Accessor('termination_a'), orderable=False, - verbose_name='Component' + verbose_name='' ) - device_b = tables.LinkColumn( - viewname='dcim:device', - accessor=Accessor('termination_b.device'), - args=[Accessor('termination_b.device.pk')], + termination_b_parent = tables.TemplateColumn( + template_code=CABLE_TERMINATION_PARENT, + accessor=Accessor('termination_b'), orderable=False, - verbose_name='Device B' + verbose_name='Termination B' ) termination_b = tables.Column( - accessor=Accessor('termination_b.name'), + accessor=Accessor('termination_b'), orderable=False, - verbose_name='Component' + verbose_name='' ) length = tables.TemplateColumn( template_code=CABLE_LENGTH, @@ -665,7 +671,8 @@ class CableTable(BaseTable): class Meta(BaseTable.Meta): model = Cable fields = ( - 'pk', 'id', 'label_', 'device_a', 'termination_a', 'device_b', 'termination_b', 'status', 'type', 'color', + 'pk', 'id', 'label_', 'termination_a_parent', 'termination_a', 'termination_b_parent', 'termination_b', + 'status', 'type', 'color', 'length', ) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 9f27f2e72..7be086229 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1612,7 +1612,7 @@ class DeviceBulkAddDeviceBayView(PermissionRequiredMixin, BulkComponentCreateVie class CableListView(ObjectListView): queryset = Cable.objects.prefetch_related( - 'termination_a__device', 'termination_b__device' + 'termination_a', 'termination_b' ) filter = filters.CableFilter filter_form = forms.CableFilterForm From 7ffb5f16ddf9102951839cca4b01f10e6cb73cfc Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 14:32:43 -0400 Subject: [PATCH 086/191] Fix color display for cables --- netbox/templates/dcim/cable.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html index c11f9e686..3bf99465f 100644 --- a/netbox/templates/dcim/cable.html +++ b/netbox/templates/dcim/cable.html @@ -56,7 +56,11 @@ Color -   + {% if cable.color %} +   + {% else %} + — + {% endif %} From 62da0778eefcb8f04b0bc592bbf059980e070dfe Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 14:54:36 -0400 Subject: [PATCH 087/191] Suppress print() output from migrations during testing --- netbox/circuits/migrations/0013_cables.py | 10 +++++++--- netbox/dcim/migrations/0066_cables.py | 21 +++++++++++++++------ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/netbox/circuits/migrations/0013_cables.py b/netbox/circuits/migrations/0013_cables.py index a24b4a5d8..4129b7d79 100644 --- a/netbox/circuits/migrations/0013_cables.py +++ b/netbox/circuits/migrations/0013_cables.py @@ -1,3 +1,5 @@ +import sys + from django.db import migrations, models import django.db.models.deletion @@ -18,7 +20,8 @@ def circuit_terminations_to_cables(apps, schema_editor): interface_type = ContentType.objects.get_for_model(Interface) # Create a new Cable instance from each console connection - print("\n Adding circuit terminations... ", end='', flush=True) + if 'test' not in sys.argv: + print("\n Adding circuit terminations... ", end='', flush=True) for circuittermination in CircuitTermination.objects.filter(interface__isnull=False): # Create the new Cable @@ -44,7 +47,8 @@ def circuit_terminations_to_cables(apps, schema_editor): ) cable_count = Cable.objects.filter(termination_a_type=circuittermination_type).count() - print("{} cables created".format(cable_count)) + if 'test' not in sys.argv: + print("{} cables created".format(cable_count)) class Migration(migrations.Migration): @@ -71,7 +75,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='circuittermination', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.Cable'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable'), ), # Copy CircuitTermination connections to Interfaces as Cables diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py index b9af2581a..413af629a 100644 --- a/netbox/dcim/migrations/0066_cables.py +++ b/netbox/dcim/migrations/0066_cables.py @@ -1,5 +1,8 @@ +import sys + from django.db import migrations, models import django.db.models.deletion + import utilities.fields @@ -17,7 +20,8 @@ def console_connections_to_cables(apps, schema_editor): consoleserverport_type = ContentType.objects.get_for_model(ConsoleServerPort) # Create a new Cable instance from each console connection - print("\n Adding console connections... ", end='', flush=True) + if 'test' not in sys.argv: + print("\n Adding console connections... ", end='', flush=True) for consoleport in ConsolePort.objects.filter(connected_endpoint__isnull=False): # Create the new Cable @@ -34,7 +38,8 @@ def console_connections_to_cables(apps, schema_editor): ConsoleServerPort.objects.filter(pk=consoleport.connected_endpoint_id).update(cable=cable) cable_count = Cable.objects.filter(termination_a_type=consoleport_type).count() - print("{} cables created".format(cable_count)) + if 'test' not in sys.argv: + print("{} cables created".format(cable_count)) def power_connections_to_cables(apps, schema_editor): @@ -51,7 +56,8 @@ def power_connections_to_cables(apps, schema_editor): poweroutlet_type = ContentType.objects.get_for_model(PowerOutlet) # Create a new Cable instance from each power connection - print(" Adding power connections... ", end='', flush=True) + if 'test' not in sys.argv: + print(" Adding power connections... ", end='', flush=True) for powerport in PowerPort.objects.filter(connected_endpoint__isnull=False): # Create the new Cable @@ -68,7 +74,8 @@ def power_connections_to_cables(apps, schema_editor): PowerOutlet.objects.filter(pk=powerport.connected_endpoint_id).update(cable=cable) cable_count = Cable.objects.filter(termination_a_type=powerport_type).count() - print("{} cables created".format(cable_count)) + if 'test' not in sys.argv: + print("{} cables created".format(cable_count)) def interface_connections_to_cables(apps, schema_editor): @@ -84,7 +91,8 @@ def interface_connections_to_cables(apps, schema_editor): interface_type = ContentType.objects.get_for_model(Interface) # Create a new Cable instance from each InterfaceConnection - print(" Adding interface connections... ", end='', flush=True) + if 'test' not in sys.argv: + print(" Adding interface connections... ", end='', flush=True) for conn in InterfaceConnection.objects.all(): # Create the new Cable @@ -109,7 +117,8 @@ def interface_connections_to_cables(apps, schema_editor): ) cable_count = Cable.objects.filter(termination_a_type=interface_type).count() - print("{} cables created".format(cable_count)) + if 'test' not in sys.argv: + print("{} cables created".format(cable_count)) class Migration(migrations.Migration): From 91ce6c242011aac952eec5f079604134ce3d7140 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 14:54:53 -0400 Subject: [PATCH 088/191] Cable migration for ExportTemplate --- .../0016_exporttemplate_add_cable.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 netbox/extras/migrations/0016_exporttemplate_add_cable.py diff --git a/netbox/extras/migrations/0016_exporttemplate_add_cable.py b/netbox/extras/migrations/0016_exporttemplate_add_cable.py new file mode 100644 index 000000000..b7c158e0e --- /dev/null +++ b/netbox/extras/migrations/0016_exporttemplate_add_cable.py @@ -0,0 +1,19 @@ +# Generated by Django 2.0.9 on 2018-11-01 18:39 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0015_remove_useraction'), + ] + + operations = [ + migrations.AlterField( + model_name='exporttemplate', + name='content_type', + field=models.ForeignKey(limit_choices_to={'model__in': ['provider', 'circuit', 'site', 'region', 'rack', 'rackgroup', 'manufacturer', 'devicetype', 'device', 'consoleport', 'powerport', 'interface', 'virtualchassis', 'aggregate', 'prefix', 'ipaddress', 'vlan', 'vrf', 'service', 'secret', 'tenant', 'cluster', 'virtualmachine']}, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'), + ), + ] From fa6c4db13b459adbfcc85c7158995b55e795da84 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Nov 2018 16:03:42 -0400 Subject: [PATCH 089/191] Closes #2104: Add 'status' field to Rack --- netbox/dcim/api/serializers.py | 5 +- netbox/dcim/constants.py | 16 ++++- netbox/dcim/filters.py | 9 +-- netbox/dcim/forms.py | 76 ++++++++++++++++++---- netbox/dcim/migrations/0068_rack_status.py | 18 +++++ netbox/dcim/models.py | 10 ++- netbox/dcim/tables.py | 18 +---- netbox/dcim/views.py | 2 +- netbox/templates/dcim/rack.html | 6 ++ netbox/templates/dcim/rack_edit.html | 1 + 10 files changed, 124 insertions(+), 37 deletions(-) create mode 100644 netbox/dcim/migrations/0068_rack_status.py diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 63362a71d..b43883f40 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -117,6 +117,7 @@ class RackSerializer(TaggitSerializer, CustomFieldModelSerializer): site = NestedSiteSerializer() group = NestedRackGroupSerializer(required=False, allow_null=True, default=None) tenant = NestedTenantSerializer(required=False, allow_null=True) + status = ChoiceField(choices=RACK_STATUS_CHOICES, required=False) role = NestedRackRoleSerializer(required=False, allow_null=True) type = ChoiceField(choices=RACK_TYPE_CHOICES, required=False, allow_null=True) width = ChoiceField(choices=RACK_WIDTH_CHOICES, required=False) @@ -125,8 +126,8 @@ class RackSerializer(TaggitSerializer, CustomFieldModelSerializer): class Meta: model = Rack fields = [ - 'id', 'name', 'facility_id', 'display_name', 'site', 'group', 'tenant', 'role', 'serial', 'type', 'width', - 'u_height', 'desc_units', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', + 'id', 'name', 'facility_id', 'display_name', 'site', 'group', 'tenant', 'status', 'role', 'serial', 'type', + 'width', 'u_height', 'desc_units', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', ] # Omit the UniqueTogetherValidator that would be automatically added to validate (group, facility_id). This # prevents facility_id from being interpreted as a required field. diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index 3fd75bfc9..4e2050d44 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -29,6 +29,20 @@ RACK_FACE_CHOICES = [ [RACK_FACE_REAR, 'Rear'], ] +# Rack statuses +RACK_STATUS_RESERVED = 0 +RACK_STATUS_AVAILABLE = 1 +RACK_STATUS_PLANNED = 2 +RACK_STATUS_ACTIVE = 3 +RACK_STATUS_DEPRECATED = 4 +RACK_STATUS_CHOICES = [ + [RACK_STATUS_ACTIVE, 'Active'], + [RACK_STATUS_PLANNED, 'Planned'], + [RACK_STATUS_RESERVED, 'Reserved'], + [RACK_STATUS_AVAILABLE, 'Available'], + [RACK_STATUS_DEPRECATED, 'Deprecated'], +] + # Parent/child device roles SUBDEVICE_ROLE_PARENT = True SUBDEVICE_ROLE_CHILD = False @@ -265,7 +279,7 @@ SITE_STATUS_CHOICES = [ [SITE_STATUS_RETIRED, 'Retired'], ] -# Bootstrap CSS classes for device statuses +# Bootstrap CSS classes for device/rack statuses STATUS_CLASSES = { 0: 'warning', 1: 'success', diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index a211fd60e..b7d69a338 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -8,10 +8,7 @@ from extras.filters import CustomFieldFilterSet from tenancy.models import Tenant from utilities.filters import NullableCharFieldFilter, NumericInFilter from virtualization.models import Cluster -from .constants import ( - DEVICE_STATUS_CHOICES, IFACE_FF_LAG, NONCONNECTABLE_IFACE_TYPES, SITE_STATUS_CHOICES, VIRTUAL_IFACE_TYPES, - WIRELESS_IFACE_TYPES, -) +from .constants import * from .models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, @@ -183,6 +180,10 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): to_field_name='slug', label='Tenant (slug)', ) + status = django_filters.MultipleChoiceFilter( + choices=RACK_STATUS_CHOICES, + null_value=None + ) role_id = django_filters.ModelMultipleChoiceFilter( queryset=RackRole.objects.all(), label='Role (ID)', diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index c16412927..6e6abfd15 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -306,8 +306,8 @@ class RackForm(BootstrapMixin, TenancyForm, CustomFieldForm): class Meta: model = Rack fields = [ - 'site', 'group', 'name', 'facility_id', 'tenant_group', 'tenant', 'role', 'serial', 'type', 'width', - 'u_height', 'desc_units', 'comments', 'tags', + 'site', 'group', 'name', 'facility_id', 'tenant_group', 'tenant', 'status', 'role', 'serial', 'type', + 'width', 'u_height', 'desc_units', 'comments', 'tags', ] help_texts = { 'site': "The site at which the rack exists", @@ -342,6 +342,11 @@ class RackCSVForm(forms.ModelForm): 'invalid_choice': 'Tenant not found.', } ) + status = CSVChoiceField( + choices=RACK_STATUS_CHOICES, + required=False, + help_text='Operational status' + ) role = forms.ModelChoiceField( queryset=RackRole.objects.all(), required=False, @@ -402,17 +407,56 @@ class RackCSVForm(forms.ModelForm): class RackBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm): - pk = forms.ModelMultipleChoiceField(queryset=Rack.objects.all(), widget=forms.MultipleHiddenInput) - site = forms.ModelChoiceField(queryset=Site.objects.all(), required=False, label='Site') - group = forms.ModelChoiceField(queryset=RackGroup.objects.all(), required=False, label='Group') - tenant = forms.ModelChoiceField(queryset=Tenant.objects.all(), required=False) - role = forms.ModelChoiceField(queryset=RackRole.objects.all(), required=False) - serial = forms.CharField(max_length=50, required=False, label='Serial Number') - type = forms.ChoiceField(choices=add_blank_choice(RACK_TYPE_CHOICES), required=False, label='Type') - width = forms.ChoiceField(choices=add_blank_choice(RACK_WIDTH_CHOICES), required=False, label='Width') - u_height = forms.IntegerField(required=False, label='Height (U)') - desc_units = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect, label='Descending units') - comments = CommentField(widget=SmallTextarea) + pk = forms.ModelMultipleChoiceField( + queryset=Rack.objects.all(), + widget=forms.MultipleHiddenInput + ) + site = forms.ModelChoiceField( + queryset=Site.objects.all(), + required=False + ) + group = forms.ModelChoiceField( + queryset=RackGroup.objects.all(), + required=False + ) + tenant = forms.ModelChoiceField( + queryset=Tenant.objects.all(), + required=False + ) + status = forms.ChoiceField( + choices=add_blank_choice(RACK_STATUS_CHOICES), + required=False, + initial='' + ) + role = forms.ModelChoiceField( + queryset=RackRole.objects.all(), + required=False + ) + serial = forms.CharField( + max_length=50, + required=False, + label='Serial Number' + ) + type = forms.ChoiceField( + choices=add_blank_choice(RACK_TYPE_CHOICES), + required=False + ) + width = forms.ChoiceField( + choices=add_blank_choice(RACK_WIDTH_CHOICES), + required=False + ) + u_height = forms.IntegerField( + required=False, + label='Height (U)' + ) + desc_units = forms.NullBooleanField( + required=False, + widget=BulkEditNullBooleanSelect, + label='Descending units' + ) + comments = CommentField( + widget=SmallTextarea + ) class Meta: nullable_fields = ['group', 'tenant', 'role', 'serial', 'comments'] @@ -435,6 +479,12 @@ class RackFilterForm(BootstrapMixin, CustomFieldFilterForm): to_field_name='slug', null_label='-- None --' ) + status = AnnotatedMultipleChoiceField( + choices=RACK_STATUS_CHOICES, + annotate=Rack.objects.all(), + annotate_field='status', + required=False + ) role = FilterChoiceField( queryset=RackRole.objects.annotate(filter_count=Count('racks')), to_field_name='slug', diff --git a/netbox/dcim/migrations/0068_rack_status.py b/netbox/dcim/migrations/0068_rack_status.py new file mode 100644 index 000000000..e190ff7df --- /dev/null +++ b/netbox/dcim/migrations/0068_rack_status.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.9 on 2018-11-01 19:44 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0067_device_type_remove_qualifiers'), + ] + + operations = [ + migrations.AddField( + model_name='rack', + name='status', + field=models.PositiveSmallIntegerField(default=3), + ), + ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 6e876c360..00e522082 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -464,6 +464,10 @@ class Rack(ChangeLoggedModel, CustomFieldModel): blank=True, null=True ) + status = models.PositiveSmallIntegerField( + choices=RACK_STATUS_CHOICES, + default=RACK_STATUS_ACTIVE + ) role = models.ForeignKey( to='dcim.RackRole', on_delete=models.PROTECT, @@ -514,7 +518,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel): tags = TaggableManager() csv_headers = [ - 'site', 'group_name', 'name', 'facility_id', 'tenant', 'role', 'type', 'serial', 'width', 'u_height', + 'site', 'group_name', 'name', 'facility_id', 'tenant', 'status', 'role', 'type', 'serial', 'width', 'u_height', 'desc_units', 'comments', ] @@ -571,6 +575,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel): self.name, self.facility_id, self.tenant.name if self.tenant else None, + self.get_status_display(), self.role.name if self.role else None, self.get_type_display() if self.type else None, self.serial, @@ -595,6 +600,9 @@ class Rack(ChangeLoggedModel, CustomFieldModel): return self.name return "" + def get_status_class(self): + return STATUS_CLASSES[self.status] + def get_rack_units(self, face=RACK_FACE_FRONT, exclude=None, remove_redundant=False): """ Return a list of rack units as dictionaries. Example: {'device': None, 'face': 0, 'id': 48, 'name': 'U48'} diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index e0acab111..d46a32f01 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -274,12 +274,13 @@ class RackTable(BaseTable): site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')]) group = tables.Column(accessor=Accessor('group.name'), verbose_name='Group') tenant = tables.TemplateColumn(template_code=COL_TENANT) + status = tables.TemplateColumn(STATUS_LABEL) role = tables.TemplateColumn(RACK_ROLE) u_height = tables.TemplateColumn("{{ record.u_height }}U", verbose_name='Height') class Meta(BaseTable.Meta): model = Rack - fields = ('pk', 'name', 'site', 'group', 'facility_id', 'tenant', 'role', 'u_height') + fields = ('pk', 'name', 'site', 'group', 'status', 'facility_id', 'tenant', 'role', 'u_height') class RackDetailTable(RackTable): @@ -291,24 +292,11 @@ class RackDetailTable(RackTable): class Meta(RackTable.Meta): fields = ( - 'pk', 'name', 'site', 'group', 'facility_id', 'tenant', 'role', 'u_height', 'device_count', + 'pk', 'name', 'site', 'group', 'status', 'facility_id', 'tenant', 'role', 'u_height', 'device_count', 'get_utilization', ) -class RackImportTable(BaseTable): - name = tables.LinkColumn('dcim:rack', args=[Accessor('pk')], verbose_name='Name') - site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')], verbose_name='Site') - group = tables.Column(accessor=Accessor('group.name'), verbose_name='Group') - facility_id = tables.Column(verbose_name='Facility ID') - tenant = tables.TemplateColumn(template_code=COL_TENANT) - u_height = tables.Column(verbose_name='Height (U)') - - class Meta(BaseTable.Meta): - model = Rack - fields = ('name', 'site', 'group', 'facility_id', 'tenant', 'u_height') - - # # Rack reservations # diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 7be086229..828271ac6 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -401,7 +401,7 @@ class RackDeleteView(PermissionRequiredMixin, ObjectDeleteView): class RackBulkImportView(PermissionRequiredMixin, BulkImportView): permission_required = 'dcim.add_rack' model_form = forms.RackCSVForm - table = tables.RackImportTable + table = tables.RackTable default_return_url = 'dcim:rack_list' diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index aaebe02da..52f841eb3 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -105,6 +105,12 @@ {% endif %} + + Status + + {{ rack.get_status_display }} + + Role diff --git a/netbox/templates/dcim/rack_edit.html b/netbox/templates/dcim/rack_edit.html index d500a1954..0326e9523 100644 --- a/netbox/templates/dcim/rack_edit.html +++ b/netbox/templates/dcim/rack_edit.html @@ -9,6 +9,7 @@ {% render_field form.name %} {% render_field form.facility_id %} {% render_field form.group %} + {% render_field form.status %} {% render_field form.role %} {% render_field form.serial %}
      From d4ec309d686b44f24053cf04fa897cb20a6b6cb6 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 08:59:51 -0400 Subject: [PATCH 090/191] Changelog for #2104 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96108d3c9..c259eeeaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ v2.5.0 (FUTURE) ## Enhancements * [#2000](https://github.com/digitalocean/netbox/issues/2000) - Dropped support for Python 2 +* [#2104](https://github.com/digitalocean/netbox/issues/2104) - Added a `status` field for racks * [#2292](https://github.com/digitalocean/netbox/issues/2292) - Removed the deprecated UserAction model * [#2367](https://github.com/digitalocean/netbox/issues/2367) - Removed deprecated RPCClient functionality From 4ffe1866c55522f49736d435d6a96cd9b7c29a20 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 09:17:51 -0400 Subject: [PATCH 091/191] Closes #1444: Add field to Rack model --- CHANGELOG.md | 1 + netbox/dcim/api/serializers.py | 5 +++-- netbox/dcim/filters.py | 4 +++- netbox/dcim/forms.py | 10 +++++++--- ...{0068_rack_status.py => 0068_rack_new_fields.py} | 9 +++++++-- netbox/dcim/models.py | 13 +++++++++++-- netbox/templates/dcim/rack.html | 10 ++++++++++ netbox/templates/dcim/rack_edit.html | 1 + 8 files changed, 43 insertions(+), 10 deletions(-) rename netbox/dcim/migrations/{0068_rack_status.py => 0068_rack_new_fields.py} (60%) diff --git a/CHANGELOG.md b/CHANGELOG.md index c259eeeaa..91a4059ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ v2.5.0 (FUTURE) ## Enhancements +* [#1444](https://github.com/digitalocean/netbox/issues/1444) - Added an `asset_tag` field for racks * [#2000](https://github.com/digitalocean/netbox/issues/2000) - Dropped support for Python 2 * [#2104](https://github.com/digitalocean/netbox/issues/2104) - Added a `status` field for racks * [#2292](https://github.com/digitalocean/netbox/issues/2292) - Removed the deprecated UserAction model diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index b43883f40..d1cb8bd39 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -126,8 +126,9 @@ class RackSerializer(TaggitSerializer, CustomFieldModelSerializer): class Meta: model = Rack fields = [ - 'id', 'name', 'facility_id', 'display_name', 'site', 'group', 'tenant', 'status', 'role', 'serial', 'type', - 'width', 'u_height', 'desc_units', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', + 'id', 'name', 'facility_id', 'display_name', 'site', 'group', 'tenant', 'status', 'role', 'serial', + 'asset_tag', 'type', 'width', 'u_height', 'desc_units', 'comments', 'tags', 'custom_fields', 'created', + 'last_updated', ] # Omit the UniqueTogetherValidator that would be automatically added to validate (group, facility_id). This # prevents facility_id from being interpreted as a required field. diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index b7d69a338..a6143065c 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -194,13 +194,14 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): to_field_name='slug', label='Role (slug)', ) + asset_tag = NullableCharFieldFilter() tag = django_filters.CharFilter( name='tags__slug', ) class Meta: model = Rack - fields = ['name', 'serial', 'type', 'width', 'u_height', 'desc_units'] + fields = ['name', 'serial', 'asset_tag', 'type', 'width', 'u_height', 'desc_units'] def search(self, queryset, name, value): if not value.strip(): @@ -209,6 +210,7 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): Q(name__icontains=value) | Q(facility_id__icontains=value) | Q(serial__icontains=value.strip()) | + Q(asset_tag__icontains=value.strip()) | Q(comments__icontains=value) ) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 6e6abfd15..770f3ab8a 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -306,8 +306,8 @@ class RackForm(BootstrapMixin, TenancyForm, CustomFieldForm): class Meta: model = Rack fields = [ - 'site', 'group', 'name', 'facility_id', 'tenant_group', 'tenant', 'status', 'role', 'serial', 'type', - 'width', 'u_height', 'desc_units', 'comments', 'tags', + 'site', 'group', 'name', 'facility_id', 'tenant_group', 'tenant', 'status', 'role', 'serial', 'asset_tag', + 'type', 'width', 'u_height', 'desc_units', 'comments', 'tags', ] help_texts = { 'site': "The site at which the rack exists", @@ -437,6 +437,10 @@ class RackBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditFor required=False, label='Serial Number' ) + asset_tag = forms.CharField( + max_length=50, + required=False + ) type = forms.ChoiceField( choices=add_blank_choice(RACK_TYPE_CHOICES), required=False @@ -459,7 +463,7 @@ class RackBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditFor ) class Meta: - nullable_fields = ['group', 'tenant', 'role', 'serial', 'comments'] + nullable_fields = ['group', 'tenant', 'role', 'serial', 'asset_tag', 'comments'] class RackFilterForm(BootstrapMixin, CustomFieldFilterForm): diff --git a/netbox/dcim/migrations/0068_rack_status.py b/netbox/dcim/migrations/0068_rack_new_fields.py similarity index 60% rename from netbox/dcim/migrations/0068_rack_status.py rename to netbox/dcim/migrations/0068_rack_new_fields.py index e190ff7df..b0a3e1958 100644 --- a/netbox/dcim/migrations/0068_rack_status.py +++ b/netbox/dcim/migrations/0068_rack_new_fields.py @@ -1,7 +1,7 @@ -# Generated by Django 2.0.9 on 2018-11-01 19:44 - from django.db import migrations, models +import utilities.fields + class Migration(migrations.Migration): @@ -15,4 +15,9 @@ class Migration(migrations.Migration): name='status', field=models.PositiveSmallIntegerField(default=3), ), + migrations.AddField( + model_name='rack', + name='asset_tag', + field=utilities.fields.NullableCharField(blank=True, max_length=50, null=True, unique=True), + ), ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 00e522082..da8ee29bc 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -480,6 +480,14 @@ class Rack(ChangeLoggedModel, CustomFieldModel): blank=True, verbose_name='Serial number' ) + asset_tag = NullableCharField( + max_length=50, + blank=True, + null=True, + unique=True, + verbose_name='Asset tag', + help_text='A unique tag used to identify this rack' + ) type = models.PositiveSmallIntegerField( choices=RACK_TYPE_CHOICES, blank=True, @@ -518,8 +526,8 @@ class Rack(ChangeLoggedModel, CustomFieldModel): tags = TaggableManager() csv_headers = [ - 'site', 'group_name', 'name', 'facility_id', 'tenant', 'status', 'role', 'type', 'serial', 'width', 'u_height', - 'desc_units', 'comments', + 'site', 'group_name', 'name', 'facility_id', 'tenant', 'status', 'role', 'type', 'serial', 'asset_tag', 'width', + 'u_height', 'desc_units', 'comments', ] class Meta: @@ -579,6 +587,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel): self.role.name if self.role else None, self.get_type_display() if self.type else None, self.serial, + self.asset_tag, self.width, self.u_height, self.desc_units, diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 52f841eb3..9427eb600 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -131,6 +131,16 @@ {% endif %} + + Asset Tag + + {% if rack.asset_tag %} + {{ rack.asset_tag }} + {% else %} + N/A + {% endif %} + + Devices diff --git a/netbox/templates/dcim/rack_edit.html b/netbox/templates/dcim/rack_edit.html index 0326e9523..798de0313 100644 --- a/netbox/templates/dcim/rack_edit.html +++ b/netbox/templates/dcim/rack_edit.html @@ -12,6 +12,7 @@ {% render_field form.status %} {% render_field form.role %} {% render_field form.serial %} + {% render_field form.asset_tag %}
      From c60c5502f6d9fd1b8c7a952844bcdf7574d3cb6e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 09:51:17 -0400 Subject: [PATCH 092/191] Closes #450: Add 'outer_width' and 'outer_depth' fields to Rack --- CHANGELOG.md | 1 + netbox/dcim/api/serializers.py | 7 +++-- netbox/dcim/constants.py | 7 ++++- netbox/dcim/filters.py | 5 +++- netbox/dcim/forms.py | 27 +++++++++++++++--- .../dcim/migrations/0068_rack_new_fields.py | 15 ++++++++++ netbox/dcim/models.py | 28 +++++++++++++++++-- netbox/templates/dcim/rack.html | 20 +++++++++++++ netbox/templates/dcim/rack_edit.html | 12 ++++++++ 9 files changed, 111 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91a4059ba..40be337fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ v2.5.0 (FUTURE) ## Enhancements +* [#450](https://github.com/digitalocean/netbox/issues/450) - Added `outer_width` and `outer_depth` fields to rack model * [#1444](https://github.com/digitalocean/netbox/issues/1444) - Added an `asset_tag` field for racks * [#2000](https://github.com/digitalocean/netbox/issues/2000) - Dropped support for Python 2 * [#2104](https://github.com/digitalocean/netbox/issues/2104) - Added a `status` field for racks diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index d1cb8bd39..e86a4549d 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -121,14 +121,15 @@ class RackSerializer(TaggitSerializer, CustomFieldModelSerializer): role = NestedRackRoleSerializer(required=False, allow_null=True) type = ChoiceField(choices=RACK_TYPE_CHOICES, required=False, allow_null=True) width = ChoiceField(choices=RACK_WIDTH_CHOICES, required=False) + outer_unit = ChoiceField(choices=RACK_DIMENSION_UNIT_CHOICES, required=False) tags = TagListSerializerField(required=False) class Meta: model = Rack fields = [ 'id', 'name', 'facility_id', 'display_name', 'site', 'group', 'tenant', 'status', 'role', 'serial', - 'asset_tag', 'type', 'width', 'u_height', 'desc_units', 'comments', 'tags', 'custom_fields', 'created', - 'last_updated', + 'asset_tag', 'type', 'width', 'u_height', 'desc_units', 'outer_width', 'outer_depth', 'outer_unit', + 'comments', 'tags', 'custom_fields', 'created', 'last_updated', ] # Omit the UniqueTogetherValidator that would be automatically added to validate (group, facility_id). This # prevents facility_id from being interpreted as a required field. @@ -504,7 +505,7 @@ class CableSerializer(ValidatedModelSerializer): termination_a = serializers.SerializerMethodField(read_only=True) termination_b = serializers.SerializerMethodField(read_only=True) status = ChoiceField(choices=CONNECTION_STATUS_CHOICES, required=False) - length_unit = ChoiceField(choices=LENGTH_UNIT_CHOICES, required=False) + length_unit = ChoiceField(choices=CABLE_LENGTH_UNIT_CHOICES, required=False) class Meta: model = Cable diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index 4e2050d44..161055879 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -362,11 +362,16 @@ COMPATIBLE_TERMINATION_TYPES = { LENGTH_UNIT_METER = 'm' LENGTH_UNIT_CENTIMETER = 'cm' +LENGTH_UNIT_MILLIMETER = 'mm' LENGTH_UNIT_FOOT = 'ft' LENGTH_UNIT_INCH = 'in' -LENGTH_UNIT_CHOICES = ( +CABLE_LENGTH_UNIT_CHOICES = ( (LENGTH_UNIT_METER, 'Meters'), (LENGTH_UNIT_CENTIMETER, 'Centimeters'), (LENGTH_UNIT_FOOT, 'Feet'), (LENGTH_UNIT_INCH, 'Inches'), ) +RACK_DIMENSION_UNIT_CHOICES = ( + (LENGTH_UNIT_MILLIMETER, 'Millimeters'), + (LENGTH_UNIT_INCH, 'Inches'), +) diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index a6143065c..df2428e23 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -201,7 +201,10 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): class Meta: model = Rack - fields = ['name', 'serial', 'asset_tag', 'type', 'width', 'u_height', 'desc_units'] + fields = [ + 'name', 'serial', 'asset_tag', 'type', 'width', 'u_height', 'desc_units', 'outer_width', 'outer_depth', + 'outer_unit', + ] def search(self, queryset, name, value): if not value.strip(): diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 770f3ab8a..3fd6f85c5 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -307,7 +307,7 @@ class RackForm(BootstrapMixin, TenancyForm, CustomFieldForm): model = Rack fields = [ 'site', 'group', 'name', 'facility_id', 'tenant_group', 'tenant', 'status', 'role', 'serial', 'asset_tag', - 'type', 'width', 'u_height', 'desc_units', 'comments', 'tags', + 'type', 'width', 'u_height', 'desc_units', 'outer_width', 'outer_depth', 'outer_unit', 'comments', 'tags', ] help_texts = { 'site': "The site at which the rack exists", @@ -368,6 +368,11 @@ class RackCSVForm(forms.ModelForm): ), help_text='Rail-to-rail width (in inches)' ) + outer_unit = CSVChoiceField( + choices=RACK_DIMENSION_UNIT_CHOICES, + required=False, + help_text='Unit for outer dimensions' + ) class Meta: model = Rack @@ -458,12 +463,26 @@ class RackBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditFor widget=BulkEditNullBooleanSelect, label='Descending units' ) + outer_width = forms.IntegerField( + required=False, + min_value=1 + ) + outer_depth = forms.IntegerField( + required=False, + min_value=1 + ) + outer_unit = forms.ChoiceField( + choices=add_blank_choice(RACK_DIMENSION_UNIT_CHOICES), + required=False + ) comments = CommentField( widget=SmallTextarea ) class Meta: - nullable_fields = ['group', 'tenant', 'role', 'serial', 'asset_tag', 'comments'] + nullable_fields = [ + 'group', 'tenant', 'role', 'serial', 'asset_tag', 'outer_width', 'outer_depth', 'outer_unit', 'comments', + ] class RackFilterForm(BootstrapMixin, CustomFieldFilterForm): @@ -1864,7 +1883,7 @@ class CableCSVForm(forms.ModelForm): help_text='Cable type' ) length_unit = CSVChoiceField( - choices=LENGTH_UNIT_CHOICES, + choices=CABLE_LENGTH_UNIT_CHOICES, required=False, help_text='Length unit' ) @@ -1962,7 +1981,7 @@ class CableBulkEditForm(BootstrapMixin, BulkEditForm): required=False ) length_unit = forms.ChoiceField( - choices=add_blank_choice(LENGTH_UNIT_CHOICES), + choices=add_blank_choice(CABLE_LENGTH_UNIT_CHOICES), required=False, initial='' ) diff --git a/netbox/dcim/migrations/0068_rack_new_fields.py b/netbox/dcim/migrations/0068_rack_new_fields.py index b0a3e1958..e577b1a52 100644 --- a/netbox/dcim/migrations/0068_rack_new_fields.py +++ b/netbox/dcim/migrations/0068_rack_new_fields.py @@ -20,4 +20,19 @@ class Migration(migrations.Migration): name='asset_tag', field=utilities.fields.NullableCharField(blank=True, max_length=50, null=True, unique=True), ), + migrations.AddField( + model_name='rack', + name='outer_depth', + field=models.PositiveSmallIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='rack', + name='outer_unit', + field=models.CharField(blank=True, max_length=2), + ), + migrations.AddField( + model_name='rack', + name='outer_width', + field=models.PositiveSmallIntegerField(blank=True, null=True), + ), ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index da8ee29bc..0bfd6abe9 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -510,6 +510,19 @@ class Rack(ChangeLoggedModel, CustomFieldModel): verbose_name='Descending units', help_text='Units are numbered top-to-bottom' ) + outer_width = models.PositiveSmallIntegerField( + blank=True, + null=True + ) + outer_depth = models.PositiveSmallIntegerField( + blank=True, + null=True + ) + outer_unit = models.CharField( + choices=RACK_DIMENSION_UNIT_CHOICES, + max_length=2, + blank=True + ) comments = models.TextField( blank=True ) @@ -527,7 +540,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel): csv_headers = [ 'site', 'group_name', 'name', 'facility_id', 'tenant', 'status', 'role', 'type', 'serial', 'asset_tag', 'width', - 'u_height', 'desc_units', 'comments', + 'u_height', 'desc_units', 'outer_width', 'outer_depth', 'outer_unit', 'comments', ] class Meta: @@ -545,6 +558,14 @@ class Rack(ChangeLoggedModel, CustomFieldModel): def clean(self): + # Validate outer dimensions and unit + if self.outer_width and not self.outer_unit: + raise ValidationError("Must specify a unit when setting an outer width") + if self.outer_depth and not self.outer_unit: + raise ValidationError("Must specify a unit when setting an outer depth") + if self.outer_unit and self.outer_width is None and self.outer_depth is None: + self.length_unit = '' + if self.pk: # Validate that Rack is tall enough to house the installed Devices top_device = Device.objects.filter(rack=self).exclude(position__isnull=True).order_by('-position').first() @@ -591,6 +612,9 @@ class Rack(ChangeLoggedModel, CustomFieldModel): self.width, self.u_height, self.desc_units, + self.outer_width, + self.outer_depth, + self.outer_unit, self.comments, ) @@ -2410,7 +2434,7 @@ class Cable(ChangeLoggedModel): null=True ) length_unit = models.CharField( - choices=LENGTH_UNIT_CHOICES, + choices=CABLE_LENGTH_UNIT_CHOICES, max_length=2, blank=True ) diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 9427eb600..2e17d04e7 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -172,6 +172,26 @@ Height {{ rack.u_height }}U ({% if rack.desc_units %}descending{% else %}ascending{% endif %}) + + Outer Width + + {% if rack.outer_width %} + {{ rack.outer_width }}{{ rack.outer_unit }} + {% else %} + — + {% endif %} + + + + Outer Depth + + {% if rack.outer_depth %} + {{ rack.outer_depth }}{{ rack.outer_unit }} + {% else %} + — + {% endif %} + +
      {% include 'inc/custom_fields_panel.html' with obj=rack %} diff --git a/netbox/templates/dcim/rack_edit.html b/netbox/templates/dcim/rack_edit.html index 798de0313..cd1192c19 100644 --- a/netbox/templates/dcim/rack_edit.html +++ b/netbox/templates/dcim/rack_edit.html @@ -28,6 +28,18 @@ {% render_field form.type %} {% render_field form.width %} {% render_field form.u_height %} +
      + +
      + {{ form.outer_width }} +
      +
      + {{ form.outer_depth }} +
      +
      + {{ form.outer_unit }} +
      +
      {% render_field form.desc_units %} From 43446cc642b6f202956c96555ce242ab17a2b7e5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 10:02:44 -0400 Subject: [PATCH 093/191] Added more detail to v2.5.0 release notes --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40be337fb..cc10c7c50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ v2.5.0 (FUTURE) * As promised, Python 2 support has been completed removed. Python 3.5 or higher is now required to run NetBox. * The UserAction model, which was deprecated by the new change logging feature in NetBox v2.4, has been removed. If you need to archive user activity, do so prior to upgrading to NetBox v2.5, as the database migration will remove all data associated with this model. +## New Features + +### Patch Panels and Cables ([#81](https://github.com/digitalocean/netbox/issues/20)) + +NetBox now supports modeling physical cables for console, power, and interface connections. The new pass-through port component type has also been introduced to model patch panels and similar devices. + ## Enhancements * [#450](https://github.com/digitalocean/netbox/issues/450) - Added `outer_width` and `outer_depth` fields to rack model @@ -16,7 +22,11 @@ v2.5.0 (FUTURE) ## API Changes +* The `/extras/recent-activity/` endpoint (replaced by change logging in v2.4) has been removed * The `rpc_client` field has been removed from dcim.Platform (see #2367) +* Introduced a new API endpoint for cables at `/dcim/cables/` +* New endpoints for front and rear pass-through ports (and their templates) in parallel with existing device components +* New fields for dcim.Rack: `status`, `asset_tag`, `outer_width`, `outer_depth`, `outer_unit` --- From af95ba48aa6d0b93cbea37d743213c4892dd6b96 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 10:45:31 -0400 Subject: [PATCH 094/191] Replaced is_console_server, is_pdu, and is_network_device filters on Device and DeviceType --- CHANGELOG.md | 8 +++ netbox/dcim/filters.py | 115 ++++++++++++++++++++++++++++++++++++----- netbox/dcim/forms.py | 32 ++++++++++-- 3 files changed, 137 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc10c7c50..a769c5e0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,14 @@ NetBox now supports modeling physical cables for console, power, and interface c * Introduced a new API endpoint for cables at `/dcim/cables/` * New endpoints for front and rear pass-through ports (and their templates) in parallel with existing device components * New fields for dcim.Rack: `status`, `asset_tag`, `outer_width`, `outer_depth`, `outer_unit` +* The following boolean filters on dcim.Device and dcim.DeviceType have been renamed: + * `is_console_server`: `console_server_ports` + * `is_pdu`: `power_outlets` + * `is_network_device`: `interfaces` +* The following new boolean filters have been introduced for dcim.Device and dcim.DeviceType: + * `console_ports` + * `power_ports` + * `pass_through_ports` --- diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index df2428e23..6def9d4c2 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -309,6 +309,30 @@ class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet): to_field_name='slug', label='Manufacturer (slug)', ) + console_ports = django_filters.CharFilter( + method='_console_ports', + label='Has console ports', + ) + console_server_ports = django_filters.CharFilter( + method='_console_server_ports', + label='Has console server ports', + ) + power_ports = django_filters.CharFilter( + method='_power_ports', + label='Has power ports', + ) + power_outlets = django_filters.CharFilter( + method='_power_outlets', + label='Has power outlets', + ) + interfaces = django_filters.CharFilter( + method='_interfaces', + label='Has interfaces', + ) + pass_through_ports = django_filters.CharFilter( + method='_pass_through_ports', + label='Has pass-through ports', + ) tag = django_filters.CharFilter( name='tags__slug', ) @@ -329,6 +353,33 @@ class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet): Q(comments__icontains=value) ) + def _console_ports(self, queryset, name, value): + value = value.strip() + return queryset.exclude(console_port_templates__isnull=bool(value)) + + def _console_server_ports(self, queryset, name, value): + value = value.strip() + return queryset.exclude(cs_port_templates__isnull=bool(value)) + + def _power_ports(self, queryset, name, value): + value = value.strip() + return queryset.exclude(power_port_templates__isnull=bool(value)) + + def _power_outlets(self, queryset, name, value): + value = value.strip() + return queryset.exclude(power_outlet_templates__isnull=bool(value)) + + def _interfaces(self, queryset, name, value): + value = value.strip() + return queryset.exclude(interface_templates__isnull=bool(value)) + + def _pass_through_ports(self, queryset, name, value): + value = value.strip() + return queryset.exclude( + front_port_templates__isnull=bool(value), + rear_port_templates__isnull=bool(value) + ) + class DeviceTypeComponentFilterSet(django_filters.FilterSet): devicetype_id = django_filters.ModelMultipleChoiceFilter( @@ -511,19 +562,30 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): name='device_type__is_full_depth', label='Is full depth', ) - # TODO: Replace these filters - # is_console_server = django_filters.BooleanFilter( - # name='device_type__is_console_server', - # label='Is a console server', - # ) - # is_pdu = django_filters.BooleanFilter( - # name='device_type__is_pdu', - # label='Is a PDU', - # ) - # is_network_device = django_filters.BooleanFilter( - # name='device_type__is_network_device', - # label='Is a network device', - # ) + console_ports = django_filters.CharFilter( + method='_console_ports', + label='Has console ports', + ) + console_server_ports = django_filters.CharFilter( + method='_console_server_ports', + label='Has console server ports', + ) + power_ports = django_filters.CharFilter( + method='_power_ports', + label='Has power ports', + ) + power_outlets = django_filters.CharFilter( + method='_power_outlets', + label='Has power outlets', + ) + interfaces = django_filters.CharFilter( + method='_interfaces', + label='Has interfaces', + ) + pass_through_ports = django_filters.CharFilter( + method='_pass_through_ports', + label='Has pass-through ports', + ) mac_address = django_filters.CharFilter( method='_mac_address', label='MAC address', @@ -578,6 +640,33 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): Q(primary_ip6__isnull=False) ) + def _console_ports(self, queryset, name, value): + value = value.strip() + return queryset.exclude(consoleports__isnull=bool(value)) + + def _console_server_ports(self, queryset, name, value): + value = value.strip() + return queryset.exclude(consoleserverports__isnull=bool(value)) + + def _power_ports(self, queryset, name, value): + value = value.strip() + return queryset.exclude(powerports__isnull=bool(value)) + + def _power_outlets(self, queryset, name, value): + value = value.strip() + return queryset.exclude(poweroutlets__isnull=bool(value)) + + def _interfaces(self, queryset, name, value): + value = value.strip() + return queryset.exclude(interfaces__isnull=bool(value)) + + def _pass_through_ports(self, queryset, name, value): + value = value.strip() + return queryset.exclude( + frontports__isnull=bool(value), + rearports__isnull=bool(value) + ) + class DeviceComponentFilterSet(django_filters.FilterSet): device_id = django_filters.ModelChoiceFilter( diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 3fd6f85c5..d4f1a6c55 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -661,12 +661,34 @@ class DeviceTypeFilterForm(BootstrapMixin, CustomFieldFilterForm): queryset=Manufacturer.objects.annotate(filter_count=Count('device_types')), to_field_name='slug' ) + console_ports = forms.BooleanField( + required=False, + label='Has console ports' + ) + console_server_ports = forms.BooleanField( + required=False, + label='Has console server ports' + ) + power_ports = forms.BooleanField( + required=False, + label='Has power ports' + ) + power_outlets = forms.BooleanField( + required=False, + label='Has power outlets' + ) + interfaces = forms.BooleanField( + required=False, + label='Has interfaces' + ) + pass_through_ports = forms.BooleanField( + required=False, + label='Has pass-through ports' + ) subdevice_role = forms.NullBooleanField( - required=False, label='Subdevice role', widget=forms.Select(choices=( - ('', '---------'), - (SUBDEVICE_ROLE_PARENT, 'Parent'), - (SUBDEVICE_ROLE_CHILD, 'Child'), - )) + required=False, + label='Subdevice role', + widget=forms.Select(choices=add_blank_choice(SUBDEVICE_ROLE_CHOICES)) ) From 16d8308fa8c72f2b29b3c06eaa90fe825197c747 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 11:04:21 -0400 Subject: [PATCH 095/191] Deprecated CableTermination.get_connected_cable() --- netbox/dcim/models.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 0bfd6abe9..9f103497c 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -131,17 +131,6 @@ class CableTermination(models.Model): return path + next_segment - # TODO: Deprecate in favor of obj.cable - def get_connected_cable(self): - """ - Return the connected cable if one exists; else None. Assign the far end of the connection on the Cable instance. - """ - cable = Cable.objects.get_for_termination(self) - if cable is None: - return None - cable.far_end = cable.termination_b if cable.termination_a == self else cable.termination_a - return cable - # # Regions @@ -2550,13 +2539,15 @@ class Cable(ChangeLoggedModel): return termination # Find the cable (if any) attached to the peer port - next_cable = peer_port.get_connected_cable() + next_cable = peer_port.cable # If no cable exists, return None if next_cable is None: return None + far_end = next_cable.termination_b if next_cable.termination_a == peer_port else next_cable.terimation_a + # Return the far side termination of the cable - return trace_cable(next_cable.far_end, position) + return trace_cable(far_end, position) return trace_cable(self.termination_a), trace_cable(self.termination_b) From cefec1be6001228066d8f9e9430f4d0478b2a6fb Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 11:15:09 -0400 Subject: [PATCH 096/191] Show connected circuit termination on interface view --- netbox/dcim/views.py | 2 +- netbox/templates/dcim/interface.html | 181 ++++++++++++++------------- 2 files changed, 92 insertions(+), 91 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 828271ac6..446bbfffe 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1286,8 +1286,8 @@ class InterfaceView(View): return render(request, 'dcim/interface.html', { 'interface': interface, - # TODO: Also handle connected CircuitTerminations 'connected_interface': interface._connected_interface, + 'connected_circuittermination': interface._connected_circuittermination, 'ipaddress_table': ipaddress_table, 'vlan_table': vlan_table, }) diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index 4493eefc9..ed5313c7d 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -122,80 +122,102 @@ {% if interface.is_connectable %}
      - Connected Interface + Connection
      - {% if connected_interface %} + {% if interface.cable %} + {% if connected_interface %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% elif connected_circuittermination %} + {% with ct=connected_circuittermination %} + + + + + + + + + {% endwith %} + {% endif %} - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      Device + {{ connected_interface.device }} +
      Name + {{ connected_interface.name }} +
      Type{{ connected_interface.get_form_factor_display }}
      Enabled + {% if connected_interface.enabled %} + + {% else %} + + {% endif %} +
      LAG + {% if connected_interface.lag%} + {{ connected_interface.lag }} + {% else %} + None + {% endif %} +
      Description + {% if connected_interface.description %} + {{ connected_interface.description }} + {% else %} + N/A + {% endif %} +
      MTU + {% if connected_interface.mtu %} + {{ connected_interface.mtu }} + {% else %} + N/A + {% endif %} +
      MAC Address + {% if connected_interface.mac_address %} + {{ connected_interface.mac_address }} + {% else %} + N/A + {% endif %} +
      802.1Q Mode{{ connected_interface.get_mode_display }}
      Circuit{{ ct.circuit }}
      Side{{ ct.term_side }}
      {% if connected_interface.device %}Device{% else %}Virtual Machine{% endif %}Cable - {{ connected_interface.parent }} + {{ interface.cable }} + + +
      Name - {{ connected_interface.name }} -
      Type{{ connected_interface.get_form_factor_display }}
      Enabled - {% if connected_interface.enabled %} - - {% else %} - - {% endif %} -
      LAG - {% if connected_interface.lag%} - {{ connected_interface.lag }} - {% else %} - None - {% endif %} -
      Description - {% if connected_interface.description %} - {{ connected_interface.description }} - {% else %} - N/A - {% endif %} -
      MTU - {% if connected_interface.mtu %} - {{ connected_interface.mtu }} - {% else %} - N/A - {% endif %} -
      MAC Address - {% if connected_interface.mac_address %} - {{ connected_interface.mac_address }} - {% else %} - N/A - {% endif %} -
      802.1Q Mode{{ connected_interface.get_mode_display }}
      Connection Status @@ -209,31 +231,10 @@
      {% else %}
      - No connected interface + Not connected
      {% endif %}
      -
      -
      - Circuit Termination -
      - - {% if interface.circuit_termination %} - - - - - - - - - {% else %} - - - - {% endif %} -
      Circuit{{ interface.circuit_termination.circuit }}
      Side{{ interface.circuit_termination.term_side }}
      None
      -
      {% endif %} {% if interface.is_lag %}
      From cf9c8f35a030f3a171ea339f72cb72e069cfd7cb Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 11:27:26 -0400 Subject: [PATCH 097/191] Normalize ordering of cables by PK --- netbox/dcim/migrations/0066_cables.py | 1 + netbox/dcim/models.py | 1 + 2 files changed, 2 insertions(+) diff --git a/netbox/dcim/migrations/0066_cables.py b/netbox/dcim/migrations/0066_cables.py index 413af629a..cb8818b07 100644 --- a/netbox/dcim/migrations/0066_cables.py +++ b/netbox/dcim/migrations/0066_cables.py @@ -135,6 +135,7 @@ class Migration(migrations.Migration): # Create the Cable model migrations.CreateModel( name='Cable', + options={'ordering': ['pk']}, fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), ('created', models.DateField(auto_now_add=True, null=True)), diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 9f103497c..9ed94b45c 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2443,6 +2443,7 @@ class Cable(ChangeLoggedModel): ] class Meta: + ordering = ['pk'] unique_together = ( ('termination_a_type', 'termination_a_id'), ('termination_b_type', 'termination_b_id'), From 3ea2978df467409cbc033fee662ccd9e8df5b32b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 11:55:52 -0400 Subject: [PATCH 098/191] Standardized naming of reverse relationships from component templates to DeviceType --- netbox/dcim/filters.py | 12 +++---- netbox/dcim/forms.py | 2 +- .../dcim/migrations/0065_front_rear_ports.py | 32 +++++++++++++++---- netbox/dcim/models.py | 30 ++++++++--------- netbox/templates/dcim/devicetype.html | 20 ++++++------ 5 files changed, 58 insertions(+), 38 deletions(-) diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 6def9d4c2..5321e00b7 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -355,19 +355,19 @@ class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet): def _console_ports(self, queryset, name, value): value = value.strip() - return queryset.exclude(console_port_templates__isnull=bool(value)) + return queryset.exclude(consoleport_templates__isnull=bool(value)) def _console_server_ports(self, queryset, name, value): value = value.strip() - return queryset.exclude(cs_port_templates__isnull=bool(value)) + return queryset.exclude(consoleserverport_templates__isnull=bool(value)) def _power_ports(self, queryset, name, value): value = value.strip() - return queryset.exclude(power_port_templates__isnull=bool(value)) + return queryset.exclude(powerport_templates__isnull=bool(value)) def _power_outlets(self, queryset, name, value): value = value.strip() - return queryset.exclude(power_outlet_templates__isnull=bool(value)) + return queryset.exclude(poweroutlet_templates__isnull=bool(value)) def _interfaces(self, queryset, name, value): value = value.strip() @@ -376,8 +376,8 @@ class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet): def _pass_through_ports(self, queryset, name, value): value = value.strip() return queryset.exclude( - front_port_templates__isnull=bool(value), - rear_port_templates__isnull=bool(value) + frontport_templates__isnull=bool(value), + rearport_templates__isnull=bool(value) ) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index d4f1a6c55..56407e961 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -807,7 +807,7 @@ class FrontPortTemplateCreateForm(ComponentForm): # Determine which rear port positions are occupied. These will be excluded from the list of available mappings. occupied_port_positions = [ (front_port.rear_port_id, front_port.rear_port_position) - for front_port in self.parent.front_port_templates.all() + for front_port in self.parent.frontport_templates.all() ] # Populate rear port choices diff --git a/netbox/dcim/migrations/0065_front_rear_ports.py b/netbox/dcim/migrations/0065_front_rear_ports.py index 2e893c4b3..d647ff8f2 100644 --- a/netbox/dcim/migrations/0065_front_rear_ports.py +++ b/netbox/dcim/migrations/0065_front_rear_ports.py @@ -1,5 +1,3 @@ -# Generated by Django 2.0.8 on 2018-10-03 17:26 - import django.core.validators from django.db import migrations, models import django.db.models.deletion @@ -68,22 +66,22 @@ class Migration(migrations.Migration): migrations.AddField( model_name='rearporttemplate', name='device_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rear_port_templates', to='dcim.DeviceType'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rearport_templates', to='dcim.DeviceType'), ), migrations.AddField( model_name='frontporttemplate', name='device_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_port_templates', to='dcim.DeviceType'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='frontport_templates', to='dcim.DeviceType'), ), migrations.AddField( model_name='frontporttemplate', name='rear_port', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_port_templates', to='dcim.RearPortTemplate'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='frontport_templates', to='dcim.RearPortTemplate'), ), migrations.AddField( model_name='frontport', name='rear_port', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='front_ports', to='dcim.RearPort'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='frontports', to='dcim.RearPort'), ), migrations.AddField( model_name='frontport', @@ -106,4 +104,26 @@ class Migration(migrations.Migration): name='frontport', unique_together={('device', 'name'), ('rear_port', 'rear_port_position')}, ), + + # Rename reverse relationships of component templates to DeviceType + migrations.AlterField( + model_name='consoleporttemplate', + name='device_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='consoleport_templates', to='dcim.DeviceType'), + ), + migrations.AlterField( + model_name='consoleserverporttemplate', + name='device_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='consoleserverport_templates', to='dcim.DeviceType'), + ), + migrations.AlterField( + model_name='poweroutlettemplate', + name='device_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='poweroutlet_templates', to='dcim.DeviceType'), + ), + migrations.AlterField( + model_name='powerporttemplate', + name='device_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='powerport_templates', to='dcim.DeviceType'), + ), ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 9ed94b45c..be70591a7 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -965,7 +965,7 @@ class ConsolePortTemplate(ComponentTemplateModel): device_type = models.ForeignKey( to='dcim.DeviceType', on_delete=models.CASCADE, - related_name='console_port_templates' + related_name='consoleport_templates' ) name = models.CharField( max_length=50 @@ -986,7 +986,7 @@ class ConsoleServerPortTemplate(ComponentTemplateModel): device_type = models.ForeignKey( to='dcim.DeviceType', on_delete=models.CASCADE, - related_name='cs_port_templates' + related_name='consoleserverport_templates' ) name = models.CharField( max_length=50 @@ -1007,7 +1007,7 @@ class PowerPortTemplate(ComponentTemplateModel): device_type = models.ForeignKey( to='dcim.DeviceType', on_delete=models.CASCADE, - related_name='power_port_templates' + related_name='powerport_templates' ) name = models.CharField( max_length=50 @@ -1028,7 +1028,7 @@ class PowerOutletTemplate(ComponentTemplateModel): device_type = models.ForeignKey( to='dcim.DeviceType', on_delete=models.CASCADE, - related_name='power_outlet_templates' + related_name='poweroutlet_templates' ) name = models.CharField( max_length=50 @@ -1080,7 +1080,7 @@ class FrontPortTemplate(ComponentTemplateModel): device_type = models.ForeignKey( to='dcim.DeviceType', on_delete=models.CASCADE, - related_name='front_port_templates' + related_name='frontport_templates' ) name = models.CharField( max_length=64 @@ -1091,7 +1091,7 @@ class FrontPortTemplate(ComponentTemplateModel): rear_port = models.ForeignKey( to='dcim.RearPortTemplate', on_delete=models.CASCADE, - related_name='front_port_templates' + related_name='frontport_templates' ) rear_port_position = models.PositiveSmallIntegerField( default=1, @@ -1132,7 +1132,7 @@ class RearPortTemplate(ComponentTemplateModel): device_type = models.ForeignKey( to='dcim.DeviceType', on_delete=models.CASCADE, - related_name='rear_port_templates' + related_name='rearport_templates' ) name = models.CharField( max_length=64 @@ -1552,19 +1552,19 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): if is_new: ConsolePort.objects.bulk_create( [ConsolePort(device=self, name=template.name) for template in - self.device_type.console_port_templates.all()] + self.device_type.consoleport_templates.all()] ) ConsoleServerPort.objects.bulk_create( [ConsoleServerPort(device=self, name=template.name) for template in - self.device_type.cs_port_templates.all()] + self.device_type.consoleserverport_templates.all()] ) PowerPort.objects.bulk_create( [PowerPort(device=self, name=template.name) for template in - self.device_type.power_port_templates.all()] + self.device_type.powerport_templates.all()] ) PowerOutlet.objects.bulk_create( [PowerOutlet(device=self, name=template.name) for template in - self.device_type.power_outlet_templates.all()] + self.device_type.poweroutlet_templates.all()] ) Interface.objects.bulk_create( [Interface(device=self, name=template.name, form_factor=template.form_factor, @@ -1576,7 +1576,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): name=template.name, type=template.type, positions=template.positions - ) for template in self.device_type.rear_port_templates.all() + ) for template in self.device_type.rearport_templates.all() ]) FrontPort.objects.bulk_create([ FrontPort( @@ -1585,7 +1585,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): type=template.type, rear_port=RearPort.objects.get(device=self, name=template.rear_port.name), rear_port_position=template.rear_port_position, - ) for template in self.device_type.front_port_templates.all() + ) for template in self.device_type.frontport_templates.all() ]) DeviceBay.objects.bulk_create( [DeviceBay(device=self, name=template.name) for template in @@ -2120,7 +2120,7 @@ class FrontPort(CableTermination, ComponentModel): rear_port = models.ForeignKey( to='dcim.RearPort', on_delete=models.CASCADE, - related_name='front_ports' + related_name='frontports' ) rear_port_position = models.PositiveSmallIntegerField( default=1, @@ -2546,7 +2546,7 @@ class Cable(ChangeLoggedModel): if next_cable is None: return None - far_end = next_cable.termination_b if next_cable.termination_a == peer_port else next_cable.terimation_a + far_end = next_cable.termination_b if next_cable.termination_a == peer_port else next_cable.termination_a # Return the far side termination of the cable return trace_cable(far_end, position) diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 082726ef6..89225e7e6 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -136,7 +136,7 @@
      -{% if devicetype.console_port_templates.exists or devicetype.power_port_templates.exists %} +{% if devicetype.consoleport_templates.exists or devicetype.powerport_templates.exists %}
      {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' add_url='dcim:devicetype_add_consoleport' delete_url='dcim:devicetype_delete_consoleport' %} @@ -153,13 +153,20 @@
      {% endif %} -{% if devicetype.cs_port_templates.exists %} +{% if devicetype.consoleserverport_templates.exists %}
      {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' add_url='dcim:devicetype_add_consoleserverport' delete_url='dcim:devicetype_delete_consoleserverport' %}
      {% endif %} +{% if devicetype.poweroutlet_templates.exists %} +
      +
      + {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' add_url='dcim:devicetype_add_poweroutlet' delete_url='dcim:devicetype_delete_poweroutlet' %} +
      +
      +{% endif %} {% if devicetype.interface_templates.exists %}
      @@ -167,14 +174,7 @@
      {% endif %} -{% if devicetype.power_outlet_templates.exists %} -
      -
      - {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' add_url='dcim:devicetype_add_poweroutlet' delete_url='dcim:devicetype_delete_poweroutlet' %} -
      -
      -{% endif %} -{% if devicetype.front_port_templates.exists or devicetype.rear_port_templates.exists %} +{% if devicetype.frontport_templates.exists or devicetype.rearport_templates.exists %}
      {% include 'dcim/inc/devicetype_component_table.html' with table=front_port_table title='Front Ports' add_url='dcim:devicetype_add_frontport' delete_url='dcim:devicetype_delete_frontport' %} From bb5c0989f3a512c58aff5c7008ae8c132dc14647 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 13:09:27 -0400 Subject: [PATCH 099/191] Fixed compatability with Django REST Framework v3.9.0 --- netbox/utilities/api.py | 7 +++++++ requirements.txt | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py index a474725e5..1b25f9ae9 100644 --- a/netbox/utilities/api.py +++ b/netbox/utilities/api.py @@ -165,6 +165,13 @@ class WritableNestedSerializer(ModelSerializer): """ Returns a nested representation of an object on read, but accepts only a primary key on write. """ + def run_validators(self, value): + # DRF v3.8.2: Skip running validators on the data, since we only accept an integer PK instead of a dict. For + # more context, see: + # https://github.com/encode/django-rest-framework/pull/5922/commits/2227bc47f8b287b66775948ffb60b2d9378ac84f + # https://github.com/encode/django-rest-framework/issues/6053 + return + def to_internal_value(self, data): if data is None: return None diff --git a/requirements.txt b/requirements.txt index 8fc83c4d7..4d1c3567e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ django-tables2==1.21.2 django-taggit==0.22.2 django-taggit-serializer==0.1.7 django-timezone-field==2.1 -djangorestframework==3.8.1 +djangorestframework==3.8.2 drf-yasg[validation]==1.9.2 graphviz==0.8.4 Markdown==2.6.11 From 29d546a3f1f1e31be29410c3fa6da23639e7942d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 13:46:28 -0400 Subject: [PATCH 100/191] Upgraded django-filter to 2.0.0 --- netbox/circuits/api/views.py | 8 +- netbox/circuits/filters.py | 30 +++++--- netbox/dcim/api/views.py | 64 ++++++++-------- netbox/dcim/filters.py | 115 ++++++++++++++++------------- netbox/extras/api/views.py | 12 +-- netbox/extras/filters.py | 32 ++++---- netbox/ipam/api/views.py | 18 ++--- netbox/ipam/filters.py | 82 ++++++++++++-------- netbox/secrets/api/views.py | 4 +- netbox/secrets/filters.py | 11 ++- netbox/tenancy/api/views.py | 4 +- netbox/tenancy/filters.py | 9 ++- netbox/virtualization/api/views.py | 10 +-- netbox/virtualization/filters.py | 42 ++++++----- requirements.txt | 4 +- 15 files changed, 248 insertions(+), 197 deletions(-) diff --git a/netbox/circuits/api/views.py b/netbox/circuits/api/views.py index 95229fe9e..229abd705 100644 --- a/netbox/circuits/api/views.py +++ b/netbox/circuits/api/views.py @@ -29,7 +29,7 @@ class CircuitsFieldChoicesViewSet(FieldChoicesViewSet): class ProviderViewSet(CustomFieldModelViewSet): queryset = Provider.objects.prefetch_related('tags') serializer_class = serializers.ProviderSerializer - filter_class = filters.ProviderFilter + filterset_class = filters.ProviderFilter @action(detail=True) def graphs(self, request, pk=None): @@ -49,7 +49,7 @@ class ProviderViewSet(CustomFieldModelViewSet): class CircuitTypeViewSet(ModelViewSet): queryset = CircuitType.objects.all() serializer_class = serializers.CircuitTypeSerializer - filter_class = filters.CircuitTypeFilter + filterset_class = filters.CircuitTypeFilter # @@ -59,7 +59,7 @@ class CircuitTypeViewSet(ModelViewSet): class CircuitViewSet(CustomFieldModelViewSet): queryset = Circuit.objects.select_related('type', 'tenant', 'provider').prefetch_related('tags') serializer_class = serializers.CircuitSerializer - filter_class = filters.CircuitFilter + filterset_class = filters.CircuitFilter # @@ -69,4 +69,4 @@ class CircuitViewSet(CustomFieldModelViewSet): class CircuitTerminationViewSet(ModelViewSet): queryset = CircuitTermination.objects.select_related('circuit', 'site') serializer_class = serializers.CircuitTerminationSerializer - filter_class = filters.CircuitTerminationFilter + filterset_class = filters.CircuitTerminationFilter diff --git a/netbox/circuits/filters.py b/netbox/circuits/filters.py index 59c510808..d1c86f9cf 100644 --- a/netbox/circuits/filters.py +++ b/netbox/circuits/filters.py @@ -10,24 +10,27 @@ from .models import Provider, Circuit, CircuitTermination, CircuitType class ProviderFilter(CustomFieldFilterSet, django_filters.FilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', ) site_id = django_filters.ModelMultipleChoiceFilter( - name='circuits__terminations__site', + field_name='circuits__terminations__site', queryset=Site.objects.all(), label='Site', ) site = django_filters.ModelMultipleChoiceFilter( - name='circuits__terminations__site__slug', + field_name='circuits__terminations__site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: @@ -54,7 +57,10 @@ class CircuitTypeFilter(django_filters.FilterSet): class CircuitFilter(CustomFieldFilterSet, django_filters.FilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', @@ -64,7 +70,7 @@ class CircuitFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Provider (ID)', ) provider = django_filters.ModelMultipleChoiceFilter( - name='provider__slug', + field_name='provider__slug', queryset=Provider.objects.all(), to_field_name='slug', label='Provider (slug)', @@ -74,7 +80,7 @@ class CircuitFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Circuit type (ID)', ) type = django_filters.ModelMultipleChoiceFilter( - name='type__slug', + field_name='type__slug', queryset=CircuitType.objects.all(), to_field_name='slug', label='Circuit type (slug)', @@ -88,24 +94,24 @@ class CircuitFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant__slug', + field_name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', ) site_id = django_filters.ModelMultipleChoiceFilter( - name='terminations__site', + field_name='terminations__site', queryset=Site.objects.all(), label='Site (ID)', ) site = django_filters.ModelMultipleChoiceFilter( - name='terminations__site__slug', + field_name='terminations__site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: @@ -138,7 +144,7 @@ class CircuitTerminationFilter(django_filters.FilterSet): label='Site (ID)', ) site = django_filters.ModelMultipleChoiceFilter( - name='site__slug', + field_name='site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 20dc4b52c..6a0b29d96 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -86,7 +86,7 @@ class CableTraceMixin(object): class RegionViewSet(ModelViewSet): queryset = Region.objects.all() serializer_class = serializers.RegionSerializer - filter_class = filters.RegionFilter + filterset_class = filters.RegionFilter # @@ -96,7 +96,7 @@ class RegionViewSet(ModelViewSet): class SiteViewSet(CustomFieldModelViewSet): queryset = Site.objects.select_related('region', 'tenant').prefetch_related('tags') serializer_class = serializers.SiteSerializer - filter_class = filters.SiteFilter + filterset_class = filters.SiteFilter @action(detail=True) def graphs(self, request, pk=None): @@ -116,7 +116,7 @@ class SiteViewSet(CustomFieldModelViewSet): class RackGroupViewSet(ModelViewSet): queryset = RackGroup.objects.select_related('site') serializer_class = serializers.RackGroupSerializer - filter_class = filters.RackGroupFilter + filterset_class = filters.RackGroupFilter # @@ -126,7 +126,7 @@ class RackGroupViewSet(ModelViewSet): class RackRoleViewSet(ModelViewSet): queryset = RackRole.objects.all() serializer_class = serializers.RackRoleSerializer - filter_class = filters.RackRoleFilter + filterset_class = filters.RackRoleFilter # @@ -136,7 +136,7 @@ class RackRoleViewSet(ModelViewSet): class RackViewSet(CustomFieldModelViewSet): queryset = Rack.objects.select_related('site', 'group__site', 'tenant').prefetch_related('tags') serializer_class = serializers.RackSerializer - filter_class = filters.RackFilter + filterset_class = filters.RackFilter @action(detail=True) def units(self, request, pk=None): @@ -166,7 +166,7 @@ class RackViewSet(CustomFieldModelViewSet): class RackReservationViewSet(ModelViewSet): queryset = RackReservation.objects.select_related('rack', 'user', 'tenant') serializer_class = serializers.RackReservationSerializer - filter_class = filters.RackReservationFilter + filterset_class = filters.RackReservationFilter # Assign user from request def perform_create(self, serializer): @@ -180,7 +180,7 @@ class RackReservationViewSet(ModelViewSet): class ManufacturerViewSet(ModelViewSet): queryset = Manufacturer.objects.all() serializer_class = serializers.ManufacturerSerializer - filter_class = filters.ManufacturerFilter + filterset_class = filters.ManufacturerFilter # @@ -190,7 +190,7 @@ class ManufacturerViewSet(ModelViewSet): class DeviceTypeViewSet(CustomFieldModelViewSet): queryset = DeviceType.objects.select_related('manufacturer').prefetch_related('tags') serializer_class = serializers.DeviceTypeSerializer - filter_class = filters.DeviceTypeFilter + filterset_class = filters.DeviceTypeFilter # @@ -200,49 +200,49 @@ class DeviceTypeViewSet(CustomFieldModelViewSet): class ConsolePortTemplateViewSet(ModelViewSet): queryset = ConsolePortTemplate.objects.select_related('device_type__manufacturer') serializer_class = serializers.ConsolePortTemplateSerializer - filter_class = filters.ConsolePortTemplateFilter + filterset_class = filters.ConsolePortTemplateFilter class ConsoleServerPortTemplateViewSet(ModelViewSet): queryset = ConsoleServerPortTemplate.objects.select_related('device_type__manufacturer') serializer_class = serializers.ConsoleServerPortTemplateSerializer - filter_class = filters.ConsoleServerPortTemplateFilter + filterset_class = filters.ConsoleServerPortTemplateFilter class PowerPortTemplateViewSet(ModelViewSet): queryset = PowerPortTemplate.objects.select_related('device_type__manufacturer') serializer_class = serializers.PowerPortTemplateSerializer - filter_class = filters.PowerPortTemplateFilter + filterset_class = filters.PowerPortTemplateFilter class PowerOutletTemplateViewSet(ModelViewSet): queryset = PowerOutletTemplate.objects.select_related('device_type__manufacturer') serializer_class = serializers.PowerOutletTemplateSerializer - filter_class = filters.PowerOutletTemplateFilter + filterset_class = filters.PowerOutletTemplateFilter class InterfaceTemplateViewSet(ModelViewSet): queryset = InterfaceTemplate.objects.select_related('device_type__manufacturer') serializer_class = serializers.InterfaceTemplateSerializer - filter_class = filters.InterfaceTemplateFilter + filterset_class = filters.InterfaceTemplateFilter class FrontPortTemplateViewSet(ModelViewSet): queryset = FrontPortTemplate.objects.select_related('device_type__manufacturer') serializer_class = serializers.FrontPortTemplateSerializer - filter_class = filters.FrontPortTemplateFilter + filterset_class = filters.FrontPortTemplateFilter class RearPortTemplateViewSet(ModelViewSet): queryset = RearPortTemplate.objects.select_related('device_type__manufacturer') serializer_class = serializers.RearPortTemplateSerializer - filter_class = filters.RearPortTemplateFilter + filterset_class = filters.RearPortTemplateFilter class DeviceBayTemplateViewSet(ModelViewSet): queryset = DeviceBayTemplate.objects.select_related('device_type__manufacturer') serializer_class = serializers.DeviceBayTemplateSerializer - filter_class = filters.DeviceBayTemplateFilter + filterset_class = filters.DeviceBayTemplateFilter # @@ -252,7 +252,7 @@ class DeviceBayTemplateViewSet(ModelViewSet): class DeviceRoleViewSet(ModelViewSet): queryset = DeviceRole.objects.all() serializer_class = serializers.DeviceRoleSerializer - filter_class = filters.DeviceRoleFilter + filterset_class = filters.DeviceRoleFilter # @@ -262,7 +262,7 @@ class DeviceRoleViewSet(ModelViewSet): class PlatformViewSet(ModelViewSet): queryset = Platform.objects.all() serializer_class = serializers.PlatformSerializer - filter_class = filters.PlatformFilter + filterset_class = filters.PlatformFilter # @@ -276,7 +276,7 @@ class DeviceViewSet(CustomFieldModelViewSet): ).prefetch_related( 'primary_ip4__nat_outside', 'primary_ip6__nat_outside', 'tags', ) - filter_class = filters.DeviceFilter + filterset_class = filters.DeviceFilter def get_serializer_class(self): """ @@ -372,7 +372,7 @@ class ConsolePortViewSet(CableTraceMixin, ModelViewSet): 'tags' ) serializer_class = serializers.ConsolePortSerializer - filter_class = filters.ConsolePortFilter + filterset_class = filters.ConsolePortFilter class ConsoleServerPortViewSet(CableTraceMixin, ModelViewSet): @@ -382,7 +382,7 @@ class ConsoleServerPortViewSet(CableTraceMixin, ModelViewSet): 'tags' ) serializer_class = serializers.ConsoleServerPortSerializer - filter_class = filters.ConsoleServerPortFilter + filterset_class = filters.ConsoleServerPortFilter class PowerPortViewSet(CableTraceMixin, ModelViewSet): @@ -392,7 +392,7 @@ class PowerPortViewSet(CableTraceMixin, ModelViewSet): 'tags' ) serializer_class = serializers.PowerPortSerializer - filter_class = filters.PowerPortFilter + filterset_class = filters.PowerPortFilter class PowerOutletViewSet(CableTraceMixin, ModelViewSet): @@ -402,7 +402,7 @@ class PowerOutletViewSet(CableTraceMixin, ModelViewSet): 'tags' ) serializer_class = serializers.PowerOutletSerializer - filter_class = filters.PowerOutletFilter + filterset_class = filters.PowerOutletFilter class InterfaceViewSet(CableTraceMixin, ModelViewSet): @@ -412,7 +412,7 @@ class InterfaceViewSet(CableTraceMixin, ModelViewSet): 'tags' ) serializer_class = serializers.InterfaceSerializer - filter_class = filters.InterfaceFilter + filterset_class = filters.InterfaceFilter @action(detail=True) def graphs(self, request, pk=None): @@ -432,7 +432,7 @@ class FrontPortViewSet(ModelViewSet): 'tags' ) serializer_class = serializers.FrontPortSerializer - filter_class = filters.FrontPortFilter + filterset_class = filters.FrontPortFilter class RearPortViewSet(ModelViewSet): @@ -442,19 +442,19 @@ class RearPortViewSet(ModelViewSet): 'tags' ) serializer_class = serializers.RearPortSerializer - filter_class = filters.RearPortFilter + filterset_class = filters.RearPortFilter class DeviceBayViewSet(ModelViewSet): queryset = DeviceBay.objects.select_related('installed_device').prefetch_related('tags') serializer_class = serializers.DeviceBaySerializer - filter_class = filters.DeviceBayFilter + filterset_class = filters.DeviceBayFilter class InventoryItemViewSet(ModelViewSet): queryset = InventoryItem.objects.select_related('device', 'manufacturer').prefetch_related('tags') serializer_class = serializers.InventoryItemSerializer - filter_class = filters.InventoryItemFilter + filterset_class = filters.InventoryItemFilter # @@ -468,7 +468,7 @@ class ConsoleConnectionViewSet(ListModelMixin, GenericViewSet): connected_endpoint__isnull=False ) serializer_class = serializers.ConsolePortSerializer - filter_class = filters.ConsoleConnectionFilter + filterset_class = filters.ConsoleConnectionFilter class PowerConnectionViewSet(ListModelMixin, GenericViewSet): @@ -478,7 +478,7 @@ class PowerConnectionViewSet(ListModelMixin, GenericViewSet): connected_endpoint__isnull=False ) serializer_class = serializers.PowerPortSerializer - filter_class = filters.PowerConnectionFilter + filterset_class = filters.PowerConnectionFilter class InterfaceConnectionViewSet(ModelViewSet): @@ -490,7 +490,7 @@ class InterfaceConnectionViewSet(ModelViewSet): Q(_connected_circuittermination__isnull=False) ) serializer_class = serializers.InterfaceConnectionSerializer - filter_class = filters.InterfaceConnectionFilter + filterset_class = filters.InterfaceConnectionFilter # @@ -502,7 +502,7 @@ class CableViewSet(ModelViewSet): 'termination_a', 'termination_b' ) serializer_class = serializers.CableSerializer - filter_class = filters.CableFilter + filterset_class = filters.CableFilter # diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 5321e00b7..710ebb47d 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -27,7 +27,7 @@ class RegionFilter(django_filters.FilterSet): label='Parent region (ID)', ) parent = django_filters.ModelMultipleChoiceFilter( - name='parent__slug', + field_name='parent__slug', queryset=Region.objects.all(), to_field_name='slug', label='Parent region (slug)', @@ -48,7 +48,10 @@ class RegionFilter(django_filters.FilterSet): class SiteFilter(CustomFieldFilterSet, django_filters.FilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', @@ -62,7 +65,7 @@ class SiteFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Region (ID)', ) region = django_filters.ModelMultipleChoiceFilter( - name='region__slug', + field_name='region__slug', queryset=Region.objects.all(), to_field_name='slug', label='Region (slug)', @@ -72,13 +75,13 @@ class SiteFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant__slug', + field_name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: @@ -116,7 +119,7 @@ class RackGroupFilter(django_filters.FilterSet): label='Site (ID)', ) site = django_filters.ModelMultipleChoiceFilter( - name='site__slug', + field_name='site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', @@ -144,7 +147,10 @@ class RackRoleFilter(django_filters.FilterSet): class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', @@ -155,7 +161,7 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Site (ID)', ) site = django_filters.ModelMultipleChoiceFilter( - name='site__slug', + field_name='site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', @@ -165,7 +171,7 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Group (ID)', ) group = django_filters.ModelMultipleChoiceFilter( - name='group__slug', + field_name='group__slug', queryset=RackGroup.objects.all(), to_field_name='slug', label='Group', @@ -175,7 +181,7 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant__slug', + field_name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', @@ -189,14 +195,14 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Role (ID)', ) role = django_filters.ModelMultipleChoiceFilter( - name='role__slug', + field_name='role__slug', queryset=RackRole.objects.all(), to_field_name='slug', label='Role (slug)', ) asset_tag = NullableCharFieldFilter() tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: @@ -219,7 +225,10 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): class RackReservationFilter(django_filters.FilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', @@ -229,23 +238,23 @@ class RackReservationFilter(django_filters.FilterSet): label='Rack (ID)', ) site_id = django_filters.ModelMultipleChoiceFilter( - name='rack__site', + field_name='rack__site', queryset=Site.objects.all(), label='Site (ID)', ) site = django_filters.ModelMultipleChoiceFilter( - name='rack__site__slug', + field_name='rack__site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', ) group_id = django_filters.ModelMultipleChoiceFilter( - name='rack__group', + field_name='rack__group', queryset=RackGroup.objects.all(), label='Group (ID)', ) group = django_filters.ModelMultipleChoiceFilter( - name='rack__group__slug', + field_name='rack__group__slug', queryset=RackGroup.objects.all(), to_field_name='slug', label='Group', @@ -255,7 +264,7 @@ class RackReservationFilter(django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant__slug', + field_name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', @@ -265,7 +274,7 @@ class RackReservationFilter(django_filters.FilterSet): label='User (ID)', ) user = django_filters.ModelMultipleChoiceFilter( - name='user', + field_name='user', queryset=User.objects.all(), to_field_name='username', label='User (name)', @@ -294,7 +303,10 @@ class ManufacturerFilter(django_filters.FilterSet): class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', @@ -304,7 +316,7 @@ class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Manufacturer (ID)', ) manufacturer = django_filters.ModelMultipleChoiceFilter( - name='manufacturer__slug', + field_name='manufacturer__slug', queryset=Manufacturer.objects.all(), to_field_name='slug', label='Manufacturer (slug)', @@ -334,7 +346,7 @@ class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Has pass-through ports', ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: @@ -384,7 +396,7 @@ class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet): class DeviceTypeComponentFilterSet(django_filters.FilterSet): devicetype_id = django_filters.ModelMultipleChoiceFilter( queryset=DeviceType.objects.all(), - name='device_type_id', + field_name='device_type_id', label='Device type (ID)', ) @@ -454,12 +466,12 @@ class DeviceRoleFilter(django_filters.FilterSet): class PlatformFilter(django_filters.FilterSet): manufacturer_id = django_filters.ModelMultipleChoiceFilter( - name='manufacturer', + field_name='manufacturer', queryset=Manufacturer.objects.all(), label='Manufacturer (ID)', ) manufacturer = django_filters.ModelMultipleChoiceFilter( - name='manufacturer__slug', + field_name='manufacturer__slug', queryset=Manufacturer.objects.all(), to_field_name='slug', label='Manufacturer (slug)', @@ -471,18 +483,21 @@ class PlatformFilter(django_filters.FilterSet): class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', ) manufacturer_id = django_filters.ModelMultipleChoiceFilter( - name='device_type__manufacturer', + field_name='device_type__manufacturer', queryset=Manufacturer.objects.all(), label='Manufacturer (ID)', ) manufacturer = django_filters.ModelMultipleChoiceFilter( - name='device_type__manufacturer__slug', + field_name='device_type__manufacturer__slug', queryset=Manufacturer.objects.all(), to_field_name='slug', label='Manufacturer (slug)', @@ -492,12 +507,12 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Device type (ID)', ) role_id = django_filters.ModelMultipleChoiceFilter( - name='device_role_id', + field_name='device_role_id', queryset=DeviceRole.objects.all(), label='Role (ID)', ) role = django_filters.ModelMultipleChoiceFilter( - name='device_role__slug', + field_name='device_role__slug', queryset=DeviceRole.objects.all(), to_field_name='slug', label='Role (slug)', @@ -507,7 +522,7 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant__slug', + field_name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', @@ -517,7 +532,7 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Platform (ID)', ) platform = django_filters.ModelMultipleChoiceFilter( - name='platform__slug', + field_name='platform__slug', queryset=Platform.objects.all(), to_field_name='slug', label='Platform (slug)', @@ -529,18 +544,18 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Site (ID)', ) site = django_filters.ModelMultipleChoiceFilter( - name='site__slug', + field_name='site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site name (slug)', ) rack_group_id = django_filters.ModelMultipleChoiceFilter( - name='rack__group', + field_name='rack__group', queryset=RackGroup.objects.all(), label='Rack group (ID)', ) rack_id = django_filters.ModelMultipleChoiceFilter( - name='rack', + field_name='rack', queryset=Rack.objects.all(), label='Rack (ID)', ) @@ -549,7 +564,7 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): label='VM cluster (ID)', ) model = django_filters.ModelMultipleChoiceFilter( - name='device_type__slug', + field_name='device_type__slug', queryset=DeviceType.objects.all(), to_field_name='slug', label='Device model (slug)', @@ -559,7 +574,7 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): null_value=None ) is_full_depth = django_filters.BooleanFilter( - name='device_type__is_full_depth', + field_name='device_type__is_full_depth', label='Is full depth', ) console_ports = django_filters.CharFilter( @@ -595,12 +610,12 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Has a primary IP', ) virtual_chassis_id = django_filters.ModelMultipleChoiceFilter( - name='virtual_chassis', + field_name='virtual_chassis', queryset=VirtualChassis.objects.all(), label='Virtual chassis (ID)', ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: @@ -679,7 +694,7 @@ class DeviceComponentFilterSet(django_filters.FilterSet): label='Device (name)', ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) @@ -718,12 +733,12 @@ class InterfaceFilter(django_filters.FilterSet): """ device = django_filters.CharFilter( method='filter_device', - name='name', + field_name='name', label='Device', ) device_id = django_filters.NumberFilter( method='filter_device', - name='pk', + field_name='pk', label='Device (ID)', ) type = django_filters.CharFilter( @@ -731,7 +746,7 @@ class InterfaceFilter(django_filters.FilterSet): label='Interface type', ) lag_id = django_filters.ModelMultipleChoiceFilter( - name='lag', + field_name='lag', queryset=Interface.objects.all(), label='LAG interface (ID)', ) @@ -740,7 +755,7 @@ class InterfaceFilter(django_filters.FilterSet): label='MAC address', ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: @@ -811,7 +826,7 @@ class InventoryItemFilter(DeviceComponentFilterSet): label='Manufacturer (ID)', ) manufacturer = django_filters.ModelMultipleChoiceFilter( - name='manufacturer__slug', + field_name='manufacturer__slug', queryset=Manufacturer.objects.all(), to_field_name='slug', label='Manufacturer (slug)', @@ -841,29 +856,29 @@ class VirtualChassisFilter(django_filters.FilterSet): label='Search', ) site_id = django_filters.ModelMultipleChoiceFilter( - name='master__site', + field_name='master__site', queryset=Site.objects.all(), label='Site (ID)', ) site = django_filters.ModelMultipleChoiceFilter( - name='master__site__slug', + field_name='master__site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site name (slug)', ) tenant_id = django_filters.ModelMultipleChoiceFilter( - name='master__tenant', + field_name='master__tenant', queryset=Tenant.objects.all(), label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='master__tenant__slug', + field_name='master__tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py index 1a91d069b..aebbb3620 100644 --- a/netbox/extras/api/views.py +++ b/netbox/extras/api/views.py @@ -69,7 +69,7 @@ class CustomFieldModelViewSet(ModelViewSet): class GraphViewSet(ModelViewSet): queryset = Graph.objects.all() serializer_class = serializers.GraphSerializer - filter_class = filters.GraphFilter + filterset_class = filters.GraphFilter # @@ -79,7 +79,7 @@ class GraphViewSet(ModelViewSet): class ExportTemplateViewSet(ModelViewSet): queryset = ExportTemplate.objects.all() serializer_class = serializers.ExportTemplateSerializer - filter_class = filters.ExportTemplateFilter + filterset_class = filters.ExportTemplateFilter # @@ -89,7 +89,7 @@ class ExportTemplateViewSet(ModelViewSet): class TopologyMapViewSet(ModelViewSet): queryset = TopologyMap.objects.select_related('site') serializer_class = serializers.TopologyMapSerializer - filter_class = filters.TopologyMapFilter + filterset_class = filters.TopologyMapFilter @action(detail=True) def render(self, request, pk): @@ -118,7 +118,7 @@ class TopologyMapViewSet(ModelViewSet): class TagViewSet(ModelViewSet): queryset = Tag.objects.annotate(tagged_items=Count('taggit_taggeditem_items')) serializer_class = serializers.TagSerializer - filter_class = filters.TagFilter + filterset_class = filters.TagFilter # @@ -139,7 +139,7 @@ class ConfigContextViewSet(ModelViewSet): 'regions', 'sites', 'roles', 'platforms', 'tenant_groups', 'tenants', ) serializer_class = serializers.ConfigContextSerializer - filter_class = filters.ConfigContextFilter + filterset_class = filters.ConfigContextFilter # @@ -228,4 +228,4 @@ class ObjectChangeViewSet(ReadOnlyModelViewSet): """ queryset = ObjectChange.objects.select_related('user') serializer_class = serializers.ObjectChangeSerializer - filter_class = filters.ObjectChangeFilter + filterset_class = filters.ObjectChangeFilter diff --git a/netbox/extras/filters.py b/netbox/extras/filters.py index b73eb8981..c7ad882f3 100644 --- a/netbox/extras/filters.py +++ b/netbox/extras/filters.py @@ -22,7 +22,7 @@ class CustomFieldFilter(django_filters.Filter): def filter(self, queryset, value): # Skip filter on empty value - if not value.strip(): + if value is None or not value.strip(): return queryset # Selection fields get special treatment (values must be integers) @@ -68,7 +68,7 @@ class CustomFieldFilterSet(django_filters.FilterSet): obj_type = ContentType.objects.get_for_model(self._meta.model) custom_fields = CustomField.objects.filter(obj_type=obj_type).exclude(filter_logic=CF_FILTER_DISABLED) for cf in custom_fields: - self.filters['cf_{}'.format(cf.name)] = CustomFieldFilter(name=cf.name, custom_field=cf) + self.filters['cf_{}'.format(cf.name)] = CustomFieldFilter(field_name=cf.name, custom_field=cf) class GraphFilter(django_filters.FilterSet): @@ -106,12 +106,12 @@ class TagFilter(django_filters.FilterSet): class TopologyMapFilter(django_filters.FilterSet): site_id = django_filters.ModelMultipleChoiceFilter( - name='site', + field_name='site', queryset=Site.objects.all(), label='Site', ) site = django_filters.ModelMultipleChoiceFilter( - name='site__slug', + field_name='site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', @@ -128,67 +128,67 @@ class ConfigContextFilter(django_filters.FilterSet): label='Search', ) region_id = django_filters.ModelMultipleChoiceFilter( - name='regions', + field_name='regions', queryset=Region.objects.all(), label='Region', ) region = django_filters.ModelMultipleChoiceFilter( - name='regions__slug', + field_name='regions__slug', queryset=Region.objects.all(), to_field_name='slug', label='Region (slug)', ) site_id = django_filters.ModelMultipleChoiceFilter( - name='sites', + field_name='sites', queryset=Site.objects.all(), label='Site', ) site = django_filters.ModelMultipleChoiceFilter( - name='sites__slug', + field_name='sites__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', ) role_id = django_filters.ModelMultipleChoiceFilter( - name='roles', + field_name='roles', queryset=DeviceRole.objects.all(), label='Role', ) role = django_filters.ModelMultipleChoiceFilter( - name='roles__slug', + field_name='roles__slug', queryset=DeviceRole.objects.all(), to_field_name='slug', label='Role (slug)', ) platform_id = django_filters.ModelMultipleChoiceFilter( - name='platforms', + field_name='platforms', queryset=Platform.objects.all(), label='Platform', ) platform = django_filters.ModelMultipleChoiceFilter( - name='platforms__slug', + field_name='platforms__slug', queryset=Platform.objects.all(), to_field_name='slug', label='Platform (slug)', ) tenant_group_id = django_filters.ModelMultipleChoiceFilter( - name='tenant_groups', + field_name='tenant_groups', queryset=TenantGroup.objects.all(), label='Tenant group', ) tenant_group = django_filters.ModelMultipleChoiceFilter( - name='tenant_groups__slug', + field_name='tenant_groups__slug', queryset=TenantGroup.objects.all(), to_field_name='slug', label='Tenant group (slug)', ) tenant_id = django_filters.ModelMultipleChoiceFilter( - name='tenants', + field_name='tenants', queryset=Tenant.objects.all(), label='Tenant', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenants__slug', + field_name='tenants__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py index bf0e4d371..814339f61 100644 --- a/netbox/ipam/api/views.py +++ b/netbox/ipam/api/views.py @@ -33,7 +33,7 @@ class IPAMFieldChoicesViewSet(FieldChoicesViewSet): class VRFViewSet(CustomFieldModelViewSet): queryset = VRF.objects.select_related('tenant').prefetch_related('tags') serializer_class = serializers.VRFSerializer - filter_class = filters.VRFFilter + filterset_class = filters.VRFFilter # @@ -43,7 +43,7 @@ class VRFViewSet(CustomFieldModelViewSet): class RIRViewSet(ModelViewSet): queryset = RIR.objects.all() serializer_class = serializers.RIRSerializer - filter_class = filters.RIRFilter + filterset_class = filters.RIRFilter # @@ -53,7 +53,7 @@ class RIRViewSet(ModelViewSet): class AggregateViewSet(CustomFieldModelViewSet): queryset = Aggregate.objects.select_related('rir').prefetch_related('tags') serializer_class = serializers.AggregateSerializer - filter_class = filters.AggregateFilter + filterset_class = filters.AggregateFilter # @@ -63,7 +63,7 @@ class AggregateViewSet(CustomFieldModelViewSet): class RoleViewSet(ModelViewSet): queryset = Role.objects.all() serializer_class = serializers.RoleSerializer - filter_class = filters.RoleFilter + filterset_class = filters.RoleFilter # @@ -73,7 +73,7 @@ class RoleViewSet(ModelViewSet): class PrefixViewSet(CustomFieldModelViewSet): queryset = Prefix.objects.select_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role').prefetch_related('tags') serializer_class = serializers.PrefixSerializer - filter_class = filters.PrefixFilter + filterset_class = filters.PrefixFilter @action(detail=True, url_path='available-prefixes', methods=['get', 'post']) def available_prefixes(self, request, pk=None): @@ -246,7 +246,7 @@ class IPAddressViewSet(CustomFieldModelViewSet): 'nat_outside', 'tags', ) serializer_class = serializers.IPAddressSerializer - filter_class = filters.IPAddressFilter + filterset_class = filters.IPAddressFilter # @@ -256,7 +256,7 @@ class IPAddressViewSet(CustomFieldModelViewSet): class VLANGroupViewSet(ModelViewSet): queryset = VLANGroup.objects.select_related('site') serializer_class = serializers.VLANGroupSerializer - filter_class = filters.VLANGroupFilter + filterset_class = filters.VLANGroupFilter # @@ -266,7 +266,7 @@ class VLANGroupViewSet(ModelViewSet): class VLANViewSet(CustomFieldModelViewSet): queryset = VLAN.objects.select_related('site', 'group', 'tenant', 'role').prefetch_related('tags') serializer_class = serializers.VLANSerializer - filter_class = filters.VLANFilter + filterset_class = filters.VLANFilter # @@ -276,4 +276,4 @@ class VLANViewSet(CustomFieldModelViewSet): class ServiceViewSet(ModelViewSet): queryset = Service.objects.select_related('device').prefetch_related('tags') serializer_class = serializers.ServiceSerializer - filter_class = filters.ServiceFilter + filterset_class = filters.ServiceFilter diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py index 5351d0861..9749d0630 100644 --- a/netbox/ipam/filters.py +++ b/netbox/ipam/filters.py @@ -14,7 +14,10 @@ from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLAN class VRFFilter(CustomFieldFilterSet, django_filters.FilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', @@ -24,13 +27,13 @@ class VRFFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant__slug', + field_name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) def search(self, queryset, name, value): @@ -48,7 +51,10 @@ class VRFFilter(CustomFieldFilterSet, django_filters.FilterSet): class RIRFilter(django_filters.FilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) class Meta: model = RIR @@ -56,7 +62,10 @@ class RIRFilter(django_filters.FilterSet): class AggregateFilter(CustomFieldFilterSet, django_filters.FilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', @@ -66,13 +75,13 @@ class AggregateFilter(CustomFieldFilterSet, django_filters.FilterSet): label='RIR (ID)', ) rir = django_filters.ModelMultipleChoiceFilter( - name='rir__slug', + field_name='rir__slug', queryset=RIR.objects.all(), to_field_name='slug', label='RIR (slug)', ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: @@ -99,7 +108,10 @@ class RoleFilter(django_filters.FilterSet): class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', @@ -125,7 +137,7 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet): label='VRF', ) vrf = django_filters.ModelMultipleChoiceFilter( - name='vrf__rd', + field_name='vrf__rd', queryset=VRF.objects.all(), to_field_name='rd', label='VRF (RD)', @@ -135,7 +147,7 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant__slug', + field_name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', @@ -145,7 +157,7 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Site (ID)', ) site = django_filters.ModelMultipleChoiceFilter( - name='site__slug', + field_name='site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', @@ -155,7 +167,7 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet): label='VLAN (ID)', ) vlan_vid = django_filters.NumberFilter( - name='vlan__vid', + field_name='vlan__vid', label='VLAN number (1-4095)', ) role_id = django_filters.ModelMultipleChoiceFilter( @@ -163,7 +175,7 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Role (ID)', ) role = django_filters.ModelMultipleChoiceFilter( - name='role__slug', + field_name='role__slug', queryset=Role.objects.all(), to_field_name='slug', label='Role (slug)', @@ -173,7 +185,7 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet): null_value=None ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: @@ -232,7 +244,10 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet): class IPAddressFilter(CustomFieldFilterSet, django_filters.FilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', @@ -254,7 +269,7 @@ class IPAddressFilter(CustomFieldFilterSet, django_filters.FilterSet): label='VRF', ) vrf = django_filters.ModelMultipleChoiceFilter( - name='vrf__rd', + field_name='vrf__rd', queryset=VRF.objects.all(), to_field_name='rd', label='VRF (RD)', @@ -264,28 +279,28 @@ class IPAddressFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant__slug', + field_name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', ) device = django_filters.CharFilter( method='filter_device', - name='name', + field_name='name', label='Device', ) device_id = django_filters.NumberFilter( method='filter_device', - name='pk', + field_name='pk', label='Device (ID)', ) virtual_machine_id = django_filters.ModelMultipleChoiceFilter( - name='interface__virtual_machine', + field_name='interface__virtual_machine', queryset=VirtualMachine.objects.all(), label='Virtual machine (ID)', ) virtual_machine = django_filters.ModelMultipleChoiceFilter( - name='interface__virtual_machine__name', + field_name='interface__virtual_machine__name', queryset=VirtualMachine.objects.all(), to_field_name='name', label='Virtual machine (name)', @@ -302,7 +317,7 @@ class IPAddressFilter(CustomFieldFilterSet, django_filters.FilterSet): choices=IPADDRESS_ROLE_CHOICES ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: @@ -359,7 +374,7 @@ class VLANGroupFilter(django_filters.FilterSet): label='Site (ID)', ) site = django_filters.ModelMultipleChoiceFilter( - name='site__slug', + field_name='site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', @@ -371,7 +386,10 @@ class VLANGroupFilter(django_filters.FilterSet): class VLANFilter(CustomFieldFilterSet, django_filters.FilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', @@ -381,7 +399,7 @@ class VLANFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Site (ID)', ) site = django_filters.ModelMultipleChoiceFilter( - name='site__slug', + field_name='site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', @@ -391,7 +409,7 @@ class VLANFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Group (ID)', ) group = django_filters.ModelMultipleChoiceFilter( - name='group__slug', + field_name='group__slug', queryset=VLANGroup.objects.all(), to_field_name='slug', label='Group', @@ -401,7 +419,7 @@ class VLANFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant__slug', + field_name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', @@ -411,7 +429,7 @@ class VLANFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Role (ID)', ) role = django_filters.ModelMultipleChoiceFilter( - name='role__slug', + field_name='role__slug', queryset=Role.objects.all(), to_field_name='slug', label='Role (slug)', @@ -421,7 +439,7 @@ class VLANFilter(CustomFieldFilterSet, django_filters.FilterSet): null_value=None ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: @@ -449,7 +467,7 @@ class ServiceFilter(django_filters.FilterSet): label='Device (ID)', ) device = django_filters.ModelMultipleChoiceFilter( - name='device__name', + field_name='device__name', queryset=Device.objects.all(), to_field_name='name', label='Device (name)', @@ -459,13 +477,13 @@ class ServiceFilter(django_filters.FilterSet): label='Virtual machine (ID)', ) virtual_machine = django_filters.ModelMultipleChoiceFilter( - name='virtual_machine__name', + field_name='virtual_machine__name', queryset=VirtualMachine.objects.all(), to_field_name='name', label='Virtual machine (name)', ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: diff --git a/netbox/secrets/api/views.py b/netbox/secrets/api/views.py index 2c23493b7..970e1e20d 100644 --- a/netbox/secrets/api/views.py +++ b/netbox/secrets/api/views.py @@ -35,7 +35,7 @@ class SecretRoleViewSet(ModelViewSet): queryset = SecretRole.objects.all() serializer_class = serializers.SecretRoleSerializer permission_classes = [IsAuthenticated] - filter_class = filters.SecretRoleFilter + filterset_class = filters.SecretRoleFilter # @@ -49,7 +49,7 @@ class SecretViewSet(ModelViewSet): 'role__users', 'role__groups', 'tags', ) serializer_class = serializers.SecretSerializer - filter_class = filters.SecretFilter + filterset_class = filters.SecretFilter master_key = None diff --git a/netbox/secrets/filters.py b/netbox/secrets/filters.py index 1a0a28f06..79ae3a115 100644 --- a/netbox/secrets/filters.py +++ b/netbox/secrets/filters.py @@ -15,7 +15,10 @@ class SecretRoleFilter(django_filters.FilterSet): class SecretFilter(CustomFieldFilterSet, django_filters.FilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', @@ -25,7 +28,7 @@ class SecretFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Role (ID)', ) role = django_filters.ModelMultipleChoiceFilter( - name='role__slug', + field_name='role__slug', queryset=SecretRole.objects.all(), to_field_name='slug', label='Role (slug)', @@ -35,13 +38,13 @@ class SecretFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Device (ID)', ) device = django_filters.ModelMultipleChoiceFilter( - name='device__name', + field_name='device__name', queryset=Device.objects.all(), to_field_name='name', label='Device (name)', ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: diff --git a/netbox/tenancy/api/views.py b/netbox/tenancy/api/views.py index b47a0cd63..af3e318fc 100644 --- a/netbox/tenancy/api/views.py +++ b/netbox/tenancy/api/views.py @@ -20,7 +20,7 @@ class TenancyFieldChoicesViewSet(FieldChoicesViewSet): class TenantGroupViewSet(ModelViewSet): queryset = TenantGroup.objects.all() serializer_class = serializers.TenantGroupSerializer - filter_class = filters.TenantGroupFilter + filterset_class = filters.TenantGroupFilter # @@ -30,4 +30,4 @@ class TenantGroupViewSet(ModelViewSet): class TenantViewSet(CustomFieldModelViewSet): queryset = Tenant.objects.select_related('group').prefetch_related('tags') serializer_class = serializers.TenantSerializer - filter_class = filters.TenantFilter + filterset_class = filters.TenantFilter diff --git a/netbox/tenancy/filters.py b/netbox/tenancy/filters.py index 4b92cd6f5..e2bfd6632 100644 --- a/netbox/tenancy/filters.py +++ b/netbox/tenancy/filters.py @@ -14,7 +14,10 @@ class TenantGroupFilter(django_filters.FilterSet): class TenantFilter(CustomFieldFilterSet, django_filters.FilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', @@ -24,13 +27,13 @@ class TenantFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Group (ID)', ) group = django_filters.ModelMultipleChoiceFilter( - name='group__slug', + field_name='group__slug', queryset=TenantGroup.objects.all(), to_field_name='slug', label='Group (slug)', ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py index 5f44287d5..3b0c02b22 100644 --- a/netbox/virtualization/api/views.py +++ b/netbox/virtualization/api/views.py @@ -23,19 +23,19 @@ class VirtualizationFieldChoicesViewSet(FieldChoicesViewSet): class ClusterTypeViewSet(ModelViewSet): queryset = ClusterType.objects.all() serializer_class = serializers.ClusterTypeSerializer - filter_class = filters.ClusterTypeFilter + filterset_class = filters.ClusterTypeFilter class ClusterGroupViewSet(ModelViewSet): queryset = ClusterGroup.objects.all() serializer_class = serializers.ClusterGroupSerializer - filter_class = filters.ClusterGroupFilter + filterset_class = filters.ClusterGroupFilter class ClusterViewSet(CustomFieldModelViewSet): queryset = Cluster.objects.select_related('type', 'group').prefetch_related('tags') serializer_class = serializers.ClusterSerializer - filter_class = filters.ClusterFilter + filterset_class = filters.ClusterFilter # @@ -46,7 +46,7 @@ class VirtualMachineViewSet(CustomFieldModelViewSet): queryset = VirtualMachine.objects.select_related( 'cluster__site', 'role', 'tenant', 'platform', 'primary_ip4', 'primary_ip6' ).prefetch_related('tags') - filter_class = filters.VirtualMachineFilter + filterset_class = filters.VirtualMachineFilter def get_serializer_class(self): """ @@ -67,7 +67,7 @@ class InterfaceViewSet(ModelViewSet): virtual_machine__isnull=False ).select_related('virtual_machine').prefetch_related('tags') serializer_class = serializers.InterfaceSerializer - filter_class = filters.InterfaceFilter + filterset_class = filters.InterfaceFilter def get_serializer_class(self): request = self.get_serializer_context()['request'] diff --git a/netbox/virtualization/filters.py b/netbox/virtualization/filters.py index 268094be7..cc61569f5 100644 --- a/netbox/virtualization/filters.py +++ b/netbox/virtualization/filters.py @@ -26,7 +26,10 @@ class ClusterGroupFilter(django_filters.FilterSet): class ClusterFilter(CustomFieldFilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', @@ -36,7 +39,7 @@ class ClusterFilter(CustomFieldFilterSet): label='Parent group (ID)', ) group = django_filters.ModelMultipleChoiceFilter( - name='group__slug', + field_name='group__slug', queryset=ClusterGroup.objects.all(), to_field_name='slug', label='Parent group (slug)', @@ -46,7 +49,7 @@ class ClusterFilter(CustomFieldFilterSet): label='Cluster type (ID)', ) type = django_filters.ModelMultipleChoiceFilter( - name='type__slug', + field_name='type__slug', queryset=ClusterType.objects.all(), to_field_name='slug', label='Cluster type (slug)', @@ -56,13 +59,13 @@ class ClusterFilter(CustomFieldFilterSet): label='Site (ID)', ) site = django_filters.ModelMultipleChoiceFilter( - name='site__slug', + field_name='site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: @@ -79,7 +82,10 @@ class ClusterFilter(CustomFieldFilterSet): class VirtualMachineFilter(CustomFieldFilterSet): - id__in = NumericInFilter(name='id', lookup_expr='in') + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) q = django_filters.CharFilter( method='search', label='Search', @@ -89,23 +95,23 @@ class VirtualMachineFilter(CustomFieldFilterSet): null_value=None ) cluster_group_id = django_filters.ModelMultipleChoiceFilter( - name='cluster__group', + field_name='cluster__group', queryset=ClusterGroup.objects.all(), label='Cluster group (ID)', ) cluster_group = django_filters.ModelMultipleChoiceFilter( - name='cluster__group__slug', + field_name='cluster__group__slug', queryset=ClusterGroup.objects.all(), to_field_name='slug', label='Cluster group (slug)', ) cluster_type_id = django_filters.ModelMultipleChoiceFilter( - name='cluster__type', + field_name='cluster__type', queryset=ClusterType.objects.all(), label='Cluster type (ID)', ) cluster_type = django_filters.ModelMultipleChoiceFilter( - name='cluster__type__slug', + field_name='cluster__type__slug', queryset=ClusterType.objects.all(), to_field_name='slug', label='Cluster type (slug)', @@ -115,12 +121,12 @@ class VirtualMachineFilter(CustomFieldFilterSet): label='Cluster (ID)', ) site_id = django_filters.ModelMultipleChoiceFilter( - name='cluster__site', + field_name='cluster__site', queryset=Site.objects.all(), label='Site (ID)', ) site = django_filters.ModelMultipleChoiceFilter( - name='cluster__site__slug', + field_name='cluster__site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', @@ -130,7 +136,7 @@ class VirtualMachineFilter(CustomFieldFilterSet): label='Role (ID)', ) role = django_filters.ModelMultipleChoiceFilter( - name='role__slug', + field_name='role__slug', queryset=DeviceRole.objects.all(), to_field_name='slug', label='Role (slug)', @@ -140,7 +146,7 @@ class VirtualMachineFilter(CustomFieldFilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant__slug', + field_name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', @@ -150,13 +156,13 @@ class VirtualMachineFilter(CustomFieldFilterSet): label='Platform (ID)', ) platform = django_filters.ModelMultipleChoiceFilter( - name='platform__slug', + field_name='platform__slug', queryset=Platform.objects.all(), to_field_name='slug', label='Platform (slug)', ) tag = django_filters.CharFilter( - name='tags__slug', + field_name='tags__slug', ) class Meta: @@ -174,12 +180,12 @@ class VirtualMachineFilter(CustomFieldFilterSet): class InterfaceFilter(django_filters.FilterSet): virtual_machine_id = django_filters.ModelMultipleChoiceFilter( - name='virtual_machine', + field_name='virtual_machine', queryset=VirtualMachine.objects.all(), label='Virtual machine (ID)', ) virtual_machine = django_filters.ModelMultipleChoiceFilter( - name='virtual_machine__name', + field_name='virtual_machine__name', queryset=VirtualMachine.objects.all(), to_field_name='name', label='Virtual machine', diff --git a/requirements.txt b/requirements.txt index 4d1c3567e..25f84c9f0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ Django>=2.0,<2.1 django-cors-headers==2.4.0 django-debug-toolbar==1.9.1 -django-filter==1.1.0 +django-filter==2.0.0 django-mptt==0.9.1 django-tables2==1.21.2 django-taggit==0.22.2 django-taggit-serializer==0.1.7 django-timezone-field==2.1 -djangorestframework==3.8.2 +djangorestframework==3.9.0 drf-yasg[validation]==1.9.2 graphviz==0.8.4 Markdown==2.6.11 From 516faac73f74f775a33c008e3e14d48d0a398dd9 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 13:48:44 -0400 Subject: [PATCH 101/191] Fixed deprecation warnings from DRF 3.9 --- netbox/circuits/api/urls.py | 2 +- netbox/dcim/api/urls.py | 10 +++++----- netbox/extras/api/urls.py | 4 ++-- netbox/ipam/api/urls.py | 2 +- netbox/secrets/api/urls.py | 6 +++--- netbox/tenancy/api/urls.py | 2 +- netbox/virtualization/api/urls.py | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/netbox/circuits/api/urls.py b/netbox/circuits/api/urls.py index a5e19907f..b9d1b439b 100644 --- a/netbox/circuits/api/urls.py +++ b/netbox/circuits/api/urls.py @@ -15,7 +15,7 @@ router = routers.DefaultRouter() router.APIRootView = CircuitsRootView # Field choices -router.register(r'_choices', views.CircuitsFieldChoicesViewSet, base_name='field-choice') +router.register(r'_choices', views.CircuitsFieldChoicesViewSet, basename='field-choice') # Providers router.register(r'providers', views.ProviderViewSet) diff --git a/netbox/dcim/api/urls.py b/netbox/dcim/api/urls.py index 67f648733..006a61bad 100644 --- a/netbox/dcim/api/urls.py +++ b/netbox/dcim/api/urls.py @@ -15,7 +15,7 @@ router = routers.DefaultRouter() router.APIRootView = DCIMRootView # Field choices -router.register(r'_choices', views.DCIMFieldChoicesViewSet, base_name='field-choice') +router.register(r'_choices', views.DCIMFieldChoicesViewSet, basename='field-choice') # Sites router.register(r'regions', views.RegionViewSet) @@ -58,9 +58,9 @@ router.register(r'device-bays', views.DeviceBayViewSet) router.register(r'inventory-items', views.InventoryItemViewSet) # Connections -router.register(r'console-connections', views.ConsoleConnectionViewSet, base_name='consoleconnections') -router.register(r'power-connections', views.PowerConnectionViewSet, base_name='powerconnections') -router.register(r'interface-connections', views.InterfaceConnectionViewSet, base_name='interfaceconnections') +router.register(r'console-connections', views.ConsoleConnectionViewSet, basename='consoleconnections') +router.register(r'power-connections', views.PowerConnectionViewSet, basename='powerconnections') +router.register(r'interface-connections', views.InterfaceConnectionViewSet, basename='interfaceconnections') # Cables router.register(r'cables', views.CableViewSet) @@ -69,7 +69,7 @@ router.register(r'cables', views.CableViewSet) router.register(r'virtual-chassis', views.VirtualChassisViewSet) # Miscellaneous -router.register(r'connected-device', views.ConnectedDeviceViewSet, base_name='connected-device') +router.register(r'connected-device', views.ConnectedDeviceViewSet, basename='connected-device') app_name = 'dcim-api' urlpatterns = router.urls diff --git a/netbox/extras/api/urls.py b/netbox/extras/api/urls.py index 7a82cd359..1bdcf181b 100644 --- a/netbox/extras/api/urls.py +++ b/netbox/extras/api/urls.py @@ -15,7 +15,7 @@ router = routers.DefaultRouter() router.APIRootView = ExtrasRootView # Field choices -router.register(r'_choices', views.ExtrasFieldChoicesViewSet, base_name='field-choice') +router.register(r'_choices', views.ExtrasFieldChoicesViewSet, basename='field-choice') # Graphs router.register(r'graphs', views.GraphViewSet) @@ -36,7 +36,7 @@ router.register(r'image-attachments', views.ImageAttachmentViewSet) router.register(r'config-contexts', views.ConfigContextViewSet) # Reports -router.register(r'reports', views.ReportViewSet, base_name='report') +router.register(r'reports', views.ReportViewSet, basename='report') # Change logging router.register(r'object-changes', views.ObjectChangeViewSet) diff --git a/netbox/ipam/api/urls.py b/netbox/ipam/api/urls.py index c1ea1e200..9a2e1bc1f 100644 --- a/netbox/ipam/api/urls.py +++ b/netbox/ipam/api/urls.py @@ -15,7 +15,7 @@ router = routers.DefaultRouter() router.APIRootView = IPAMRootView # Field choices -router.register(r'_choices', views.IPAMFieldChoicesViewSet, base_name='field-choice') +router.register(r'_choices', views.IPAMFieldChoicesViewSet, basename='field-choice') # VRFs router.register(r'vrfs', views.VRFViewSet) diff --git a/netbox/secrets/api/urls.py b/netbox/secrets/api/urls.py index cc4afd496..def87b3a1 100644 --- a/netbox/secrets/api/urls.py +++ b/netbox/secrets/api/urls.py @@ -15,15 +15,15 @@ router = routers.DefaultRouter() router.APIRootView = SecretsRootView # Field choices -router.register(r'_choices', views.SecretsFieldChoicesViewSet, base_name='field-choice') +router.register(r'_choices', views.SecretsFieldChoicesViewSet, basename='field-choice') # Secrets router.register(r'secret-roles', views.SecretRoleViewSet) router.register(r'secrets', views.SecretViewSet) # Miscellaneous -router.register(r'get-session-key', views.GetSessionKeyViewSet, base_name='get-session-key') -router.register(r'generate-rsa-key-pair', views.GenerateRSAKeyPairViewSet, base_name='generate-rsa-key-pair') +router.register(r'get-session-key', views.GetSessionKeyViewSet, basename='get-session-key') +router.register(r'generate-rsa-key-pair', views.GenerateRSAKeyPairViewSet, basename='generate-rsa-key-pair') app_name = 'secrets-api' urlpatterns = router.urls diff --git a/netbox/tenancy/api/urls.py b/netbox/tenancy/api/urls.py index a501b4302..3da0e0f82 100644 --- a/netbox/tenancy/api/urls.py +++ b/netbox/tenancy/api/urls.py @@ -15,7 +15,7 @@ router = routers.DefaultRouter() router.APIRootView = TenancyRootView # Field choices -router.register(r'_choices', views.TenancyFieldChoicesViewSet, base_name='field-choice') +router.register(r'_choices', views.TenancyFieldChoicesViewSet, basename='field-choice') # Tenants router.register(r'tenant-groups', views.TenantGroupViewSet) diff --git a/netbox/virtualization/api/urls.py b/netbox/virtualization/api/urls.py index 335ac7d0e..b27e5be3d 100644 --- a/netbox/virtualization/api/urls.py +++ b/netbox/virtualization/api/urls.py @@ -15,7 +15,7 @@ router = routers.DefaultRouter() router.APIRootView = VirtualizationRootView # Field choices -router.register(r'_choices', views.VirtualizationFieldChoicesViewSet, base_name='field-choice') +router.register(r'_choices', views.VirtualizationFieldChoicesViewSet, basename='field-choice') # Clusters router.register(r'cluster-types', views.ClusterTypeViewSet) From 9804db45514df558a16ddcb122fc4a7259dd5dc4 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 14:14:15 -0400 Subject: [PATCH 102/191] Updated dependencies --- requirements.txt | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/requirements.txt b/requirements.txt index 25f84c9f0..cea9e1f96 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,23 +1,19 @@ Django>=2.0,<2.1 django-cors-headers==2.4.0 -django-debug-toolbar==1.9.1 +django-debug-toolbar==1.10.1 django-filter==2.0.0 django-mptt==0.9.1 django-tables2==1.21.2 -django-taggit==0.22.2 +django-taggit==0.23.0 django-taggit-serializer==0.1.7 -django-timezone-field==2.1 +django-timezone-field==3.0 djangorestframework==3.9.0 -drf-yasg[validation]==1.9.2 -graphviz==0.8.4 +drf-yasg[validation]==1.11.0 +graphviz==0.10.1 Markdown==2.6.11 -natsort==5.3.3 -ncclient==0.6.0 +natsort==5.4.1 netaddr==0.7.19 -paramiko==2.4.1 -Pillow==5.2.0 +Pillow==5.3.0 psycopg2-binary==2.7.5 -py-gfm==0.1.3 -pycryptodome==3.6.4 -xmltodict==0.11.0 - +py-gfm==0.1.4 +pycryptodome==3.7.0 From b05171b126cbbb9c086ca2d4f22c732cb27bd3aa Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 14:27:17 -0400 Subject: [PATCH 103/191] Upgraded django-tables2 to v2.0.2 --- netbox/dcim/tables.py | 7 +------ netbox/ipam/views.py | 10 +++++----- netbox/utilities/views.py | 3 +-- requirements.txt | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index d46a32f01..72bf30c14 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -623,11 +623,6 @@ class CableTable(BaseTable): args=[Accessor('pk')], verbose_name='ID' ) - # django-tables2 adds CSS `class="label"` which causes rendering issues - label_ = tables.Column( - accessor=Accessor('label'), - verbose_name='Label' - ) termination_a_parent = tables.TemplateColumn( template_code=CABLE_TERMINATION_PARENT, accessor=Accessor('termination_a'), @@ -659,7 +654,7 @@ class CableTable(BaseTable): class Meta(BaseTable.Meta): model = Cable fields = ( - 'pk', 'id', 'label_', 'termination_a_parent', 'termination_a', 'termination_b_parent', 'termination_b', + 'pk', 'id', 'label', 'termination_a_parent', 'termination_a', 'termination_b_parent', 'termination_b', 'status', 'type', 'color', 'length', ) diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index d96fc3074..1e3f14f8c 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -336,7 +336,7 @@ class AggregateView(View): prefix_table.columns.show('pk') paginate = { - 'klass': EnhancedPaginator, + 'paginator_class': EnhancedPaginator, 'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT) } RequestConfig(request, paginate).configure(prefix_table) @@ -512,7 +512,7 @@ class PrefixPrefixesView(View): prefix_table.columns.show('pk') paginate = { - 'klass': EnhancedPaginator, + 'paginator_class': EnhancedPaginator, 'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT) } RequestConfig(request, paginate).configure(prefix_table) @@ -551,7 +551,7 @@ class PrefixIPAddressesView(View): ip_table.columns.show('pk') paginate = { - 'klass': EnhancedPaginator, + 'paginator_class': EnhancedPaginator, 'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT) } RequestConfig(request, paginate).configure(ip_table) @@ -840,7 +840,7 @@ class VLANGroupVLANsView(View): vlan_table.columns.hide('group') paginate = { - 'klass': EnhancedPaginator, + 'paginator_class': EnhancedPaginator, 'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT) } RequestConfig(request, paginate).configure(vlan_table) @@ -899,7 +899,7 @@ class VLANMembersView(View): members_table = tables.VLANMemberTable(members) paginate = { - 'klass': EnhancedPaginator, + 'paginator_class': EnhancedPaginator, 'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT) } RequestConfig(request, paginate).configure(members_table) diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index 0e36f3220..e5751acb3 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -25,7 +25,6 @@ from django_tables2 import RequestConfig from extras.models import CustomField, CustomFieldValue, ExportTemplate from utilities.utils import queryset_to_csv from utilities.forms import BootstrapMixin, CSVDataField -from .constants import M2M_FIELD_TYPES from .error_handlers import handle_protectederror from .forms import ConfirmationForm from .paginator import EnhancedPaginator @@ -138,7 +137,7 @@ class ObjectListView(View): # Apply the request context paginate = { - 'klass': EnhancedPaginator, + 'paginator_class': EnhancedPaginator, 'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT) } RequestConfig(request, paginate).configure(table) diff --git a/requirements.txt b/requirements.txt index cea9e1f96..f49d5dc49 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ django-cors-headers==2.4.0 django-debug-toolbar==1.10.1 django-filter==2.0.0 django-mptt==0.9.1 -django-tables2==1.21.2 +django-tables2==2.0.2 django-taggit==0.23.0 django-taggit-serializer==0.1.7 django-timezone-field==3.0 From 0a71c63583d786c32e01ed5fb5c3aa18bddf3218 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 14:42:15 -0400 Subject: [PATCH 104/191] Upgraded to Django 2.1 --- netbox/ipam/fields.py | 2 +- netbox/templates/500.html | 2 +- netbox/templates/_base.html | 2 +- netbox/templates/circuits/circuittermination_edit.html | 2 +- netbox/templates/circuits/provider.html | 2 +- netbox/templates/dcim/cable_connect.html | 2 +- netbox/templates/dcim/device.html | 2 +- netbox/templates/dcim/device_config.html | 2 +- netbox/templates/dcim/device_status.html | 2 +- netbox/templates/dcim/site.html | 2 +- netbox/templates/inc/ajax_loader.html | 2 +- netbox/templates/inc/nav_menu.html | 2 +- netbox/templates/ipam/ipaddress_assign.html | 2 +- netbox/templates/ipam/ipaddress_bulk_add.html | 2 +- netbox/templates/ipam/ipaddress_edit.html | 2 +- netbox/templates/secrets/secret.html | 2 +- netbox/templates/secrets/secret_edit.html | 2 +- netbox/templates/secrets/secret_import.html | 2 +- netbox/templates/tenancy/tenant_edit.html | 2 +- netbox/templates/users/userkey_edit.html | 2 +- netbox/templates/virtualization/cluster_add_devices.html | 2 +- requirements.txt | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/netbox/ipam/fields.py b/netbox/ipam/fields.py index 6db3a00f2..97a4de62f 100644 --- a/netbox/ipam/fields.py +++ b/netbox/ipam/fields.py @@ -16,7 +16,7 @@ class BaseIPField(models.Field): def python_type(self): return IPNetwork - def from_db_value(self, value, expression, connection, context): + def from_db_value(self, value, expression, connection): return self.to_python(value) def to_python(self, value): diff --git a/netbox/templates/500.html b/netbox/templates/500.html index 1da608a48..c09061c10 100644 --- a/netbox/templates/500.html +++ b/netbox/templates/500.html @@ -1,4 +1,4 @@ -{% load static from staticfiles %} +{% load static %} diff --git a/netbox/templates/_base.html b/netbox/templates/_base.html index 27ebb052d..6de03b4e2 100644 --- a/netbox/templates/_base.html +++ b/netbox/templates/_base.html @@ -1,4 +1,4 @@ -{% load static from staticfiles %} +{% load static %} {% load helpers %} diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html index 792ff99b8..274c2a372 100644 --- a/netbox/templates/circuits/circuittermination_edit.html +++ b/netbox/templates/circuits/circuittermination_edit.html @@ -1,5 +1,5 @@ {% extends '_base.html' %} -{% load staticfiles %} +{% load static %} {% load form_helpers %} {% block content %} diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index 733632342..99f615a90 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -1,5 +1,5 @@ {% extends '_base.html' %} -{% load static from staticfiles %} +{% load static %} {% load helpers %} {% block title %}{{ provider }}{% endblock %} diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html index 310736af7..257c6da79 100644 --- a/netbox/templates/dcim/cable_connect.html +++ b/netbox/templates/dcim/cable_connect.html @@ -1,5 +1,5 @@ {% extends '_base.html' %} -{% load static from staticfiles %} +{% load static %} {% load form_helpers %} {% block content %} diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 7c1042d2c..7289909b1 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -1,5 +1,5 @@ {% extends '_base.html' %} -{% load static from staticfiles %} +{% load static %} {% load helpers %} {% block title %}{{ device }}{% endblock %} diff --git a/netbox/templates/dcim/device_config.html b/netbox/templates/dcim/device_config.html index 210a9379a..fa35f28aa 100644 --- a/netbox/templates/dcim/device_config.html +++ b/netbox/templates/dcim/device_config.html @@ -1,5 +1,5 @@ {% extends 'dcim/device.html' %} -{% load staticfiles %} +{% load static %} {% block title %}{{ device }} - Config{% endblock %} diff --git a/netbox/templates/dcim/device_status.html b/netbox/templates/dcim/device_status.html index 7743cc635..de9f57935 100644 --- a/netbox/templates/dcim/device_status.html +++ b/netbox/templates/dcim/device_status.html @@ -1,5 +1,5 @@ {% extends 'dcim/device.html' %} -{% load staticfiles %} +{% load static %} {% block title %}{{ device }} - Status{% endblock %} diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index 8fedfbcee..b74521e9c 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -1,5 +1,5 @@ {% extends '_base.html' %} -{% load static from staticfiles %} +{% load static %} {% load tz %} {% load helpers %} diff --git a/netbox/templates/inc/ajax_loader.html b/netbox/templates/inc/ajax_loader.html index b5b3ee2c1..f6982bd65 100644 --- a/netbox/templates/inc/ajax_loader.html +++ b/netbox/templates/inc/ajax_loader.html @@ -1,4 +1,4 @@ -{% load staticfiles %} +{% load static %}
      diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html index 64f68e7e2..5f8f371d3 100644 --- a/netbox/templates/inc/nav_menu.html +++ b/netbox/templates/inc/nav_menu.html @@ -1,4 +1,4 @@ -{% load static from staticfiles %} +{% load static %} {% load helpers %}
      From 53b6a07a4110f0a96fb9a18b8f55a8e1c1bba32f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 5 Nov 2018 12:07:02 -0500 Subject: [PATCH 111/191] Changelog for #2165 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a769c5e0e..7594cba95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#1444](https://github.com/digitalocean/netbox/issues/1444) - Added an `asset_tag` field for racks * [#2000](https://github.com/digitalocean/netbox/issues/2000) - Dropped support for Python 2 * [#2104](https://github.com/digitalocean/netbox/issues/2104) - Added a `status` field for racks +* [#2165](https://github.com/digitalocean/netbox/issues/2165) - Improved natural ordering of Interfaces * [#2292](https://github.com/digitalocean/netbox/issues/2292) - Removed the deprecated UserAction model * [#2367](https://github.com/digitalocean/netbox/issues/2367) - Removed deprecated RPCClient functionality @@ -35,6 +36,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * `console_ports` * `power_ports` * `pass_through_ports` +* The field `interface_ordering` has been removed from the DeviceType serializer --- From 045856c9ac9dbda7720c4a8e4a9e1ccade545374 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 5 Nov 2018 13:00:46 -0500 Subject: [PATCH 112/191] Introduced a placeholder template filter --- netbox/templates/circuits/circuit.html | 24 ++------- .../circuits/inc/circuit_termination.html | 18 ++----- netbox/templates/circuits/provider.html | 34 ++----------- netbox/templates/dcim/cable.html | 4 +- netbox/templates/dcim/device.html | 22 ++------ netbox/templates/dcim/device_inventory.html | 17 ++----- netbox/templates/dcim/devicetype.html | 10 +--- netbox/templates/dcim/interface.html | 48 +++--------------- netbox/templates/dcim/rack.html | 26 ++-------- netbox/templates/dcim/site.html | 50 ++++--------------- .../templates/dcim/virtualchassis_edit.html | 11 ++-- netbox/templates/extras/configcontext.html | 8 +-- netbox/templates/inc/custom_fields_panel.html | 2 +- netbox/templates/ipam/aggregate.html | 16 +----- netbox/templates/ipam/ipaddress.html | 10 +--- netbox/templates/ipam/prefix.html | 8 +-- netbox/templates/ipam/service.html | 8 +-- netbox/templates/ipam/vlan.html | 8 +-- netbox/templates/ipam/vrf.html | 8 +-- netbox/templates/secrets/secret.html | 8 +-- netbox/templates/tenancy/tenant.html | 8 +-- .../virtualization/virtualmachine.html | 16 ++---- netbox/utilities/templatetags/helpers.py | 12 +++++ 23 files changed, 75 insertions(+), 301 deletions(-) diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html index 5c86cb24e..3e449ce22 100644 --- a/netbox/templates/circuits/circuit.html +++ b/netbox/templates/circuits/circuit.html @@ -95,33 +95,15 @@ Install Date - - {% if circuit.install_date %} - {{ circuit.install_date }} - {% else %} - N/A - {% endif %} - + {{ circuit.install_date|placeholder }} Commit Rate - - {% if circuit.commit_rate %} - {{ circuit.commit_rate|humanize_speed }} - {% else %} - N/A - {% endif %} - + {{ circuit.commit_rate|humanize_speed|placeholder }} Description - - {% if circuit.description %} - {{ circuit.description }} - {% else %} - N/A - {% endif %} - + {{ circuit.description|placeholder }}
      diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html index 560322357..55432b159 100644 --- a/netbox/templates/circuits/inc/circuit_termination.html +++ b/netbox/templates/circuits/inc/circuit_termination.html @@ -79,29 +79,17 @@ None {% endfor %} {% else %} - N/A + — {% endif %} Cross-Connect - - {% if termination.xconnect_id %} - {{ termination.xconnect_id }} - {% else %} - N/A - {% endif %} - + {{ termination.xconnect_id|placeholder }} Patch Panel/Port - - {% if termination.pp_info %} - {{ termination.pp_info }} - {% else %} - N/A - {% endif %} - + {{ termination.pp_info|placeholder }} {% else %} diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index 99f615a90..ea936adcb 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -67,23 +67,11 @@ - + - + @@ -91,29 +79,17 @@ {% if provider.portal_url %} {{ provider.portal_url }} {% else %} - N/A + — {% endif %} - + - + diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html index 3bf99465f..a9b61aaf1 100644 --- a/netbox/templates/dcim/cable.html +++ b/netbox/templates/dcim/cable.html @@ -51,7 +51,7 @@ - + @@ -69,7 +69,7 @@ {% if cable.length %} {{ cable.length }} {{ cable.get_length_unit_display }} {% else %} - N/A + — {% endif %} diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 7289909b1..fb633c612 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -142,7 +142,7 @@ {% elif device.rack and device.device_type.u_height %} Not racked {% else %} - N/A + — {% endif %} @@ -168,23 +168,11 @@ - + - +
      ASN - {% if provider.asn %} - {{ provider.asn }} - {% else %} - N/A - {% endif %} - {{ provider.asn|placeholder }}
      Account - {% if provider.account %} - {{ provider.account }} - {% else %} - N/A - {% endif %} - {{ provider.account|placeholder }}
      Customer Portal
      NOC Contact - {% if provider.noc_contact %} - {{ provider.noc_contact|linebreaksbr }} - {% else %} - N/A - {% endif %} - {{ provider.noc_contact|linebreaksbr|placeholder }}
      Admin Contact - {% if provider.admin_contact %} - {{ provider.admin_contact|linebreaksbr }} - {% else %} - N/A - {% endif %} - {{ provider.admin_contact|linebreaksbr|placeholder }}
      Circuits
      Label{% if cable.label %}{{ cable.label }}{% else %}N/A{% endif %}{{ cable.labe|placeholder }}
      Color
      Serial Number - {% if device.serial %} - {{ device.serial }} - {% else %} - N/A - {% endif %} - {{ device.serial|placeholder }}
      Asset Tag - {% if device.asset_tag %} - {{ device.asset_tag }} - {% else %} - N/A - {% endif %} - {{ device.asset_tag|placeholder }}
      @@ -266,7 +254,7 @@ (NAT: {{ device.primary_ip4.nat_outside.address.ip }}) {% endif %} {% else %} - N/A + — {% endif %} @@ -281,7 +269,7 @@ (NAT: {{ device.primary_ip6.nat_outside.address.ip }}) {% endif %} {% else %} - N/A + — {% endif %} diff --git a/netbox/templates/dcim/device_inventory.html b/netbox/templates/dcim/device_inventory.html index 1efbd0fbc..d9f8c5495 100644 --- a/netbox/templates/dcim/device_inventory.html +++ b/netbox/templates/dcim/device_inventory.html @@ -1,4 +1,5 @@ {% extends 'dcim/device.html' %} +{% load helpers %} {% block title %}{{ device }} - Inventory{% endblock %} @@ -16,23 +17,11 @@ Serial Number - - {% if device.serial %} - {{ device.serial }} - {% else %} - N/A - {% endif %} - + {{ device.serial|placeholder }} Asset Tag - - {% if device.asset_tag %} - {{ device.asset_tag }} - {% else %} - N/A - {% endif %} - + {{ device.asset_tag|placeholder }} diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 1719e8f66..0b0f8698b 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -74,13 +74,7 @@ Part Number - - {% if devicetype.part_number %} - {{ devicetype.part_number }} - {% else %} - N/A - {% endif %} - + {{ devicetype.part_number|placeholder }} Height (U) @@ -104,7 +98,7 @@ {% elif devicetype.subdevice_role == False %} {% else %} - N/A + — {% endif %} diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index ed5313c7d..2ca17ac33 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -82,33 +82,15 @@ Description - - {% if interface.description %} - {{ interface.description }} - {% else %} - N/A - {% endif %} - + {{ interface.description|placeholder }} MTU - - {% if interface.mtu %} - {{ interface.mtu }} - {% else %} - N/A - {% endif %} - + {{ interface.mtu|placeholder }} MAC Address - - {% if interface.mac_address %} - {{ interface.mac_address }} - {% else %} - N/A - {% endif %} - + {{ interface.mac_address|placeholder }} 802.1Q Mode @@ -165,33 +147,15 @@ Description - - {% if connected_interface.description %} - {{ connected_interface.description }} - {% else %} - N/A - {% endif %} - + {{ connected_interface.description|placeholder }} MTU - - {% if connected_interface.mtu %} - {{ connected_interface.mtu }} - {% else %} - N/A - {% endif %} - + {{ connected_interface.mtu|placeholder }} MAC Address - - {% if connected_interface.mac_address %} - {{ connected_interface.mac_address }} - {% else %} - N/A - {% endif %} - + {{ connected_interface.mac_address|placeholder }} 802.1Q Mode diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 2e17d04e7..f78fb9503 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -83,13 +83,7 @@ Facility ID - - {% if rack.facility_id %} - {{ rack.facility_id }} - {% else %} - N/A - {% endif %} - + {{ rack.facility_id|placeholder }} Tenant @@ -123,23 +117,11 @@ Serial Number - - {% if rack.serial %} - {{ rack.serial }} - {% else %} - N/A - {% endif %} - + {{ rack.serial|placeholder }} Asset Tag - - {% if rack.asset_tag %} - {{ rack.asset_tag }} - {% else %} - N/A - {% endif %} - + {{ rack.asset_tag|placeholder }} Devices @@ -231,7 +213,7 @@ {% if device.parent_bay %} {{ device.parent_bay }} {% else %} - N/A + — {% endif %} diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index b74521e9c..1b35b0db9 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -106,23 +106,11 @@ Facility - - {% if site.facility %} - {{ site.facility }} - {% else %} - N/A - {% endif %} - + {{ site.facility|placeholder }} AS Number - - {% if site.asn %} - {{ site.asn }} - {% else %} - N/A - {% endif %} - + {{ site.asn|placeholder }} Time Zone @@ -131,19 +119,13 @@ {{ site.time_zone }} (UTC {{ site.time_zone|tzoffset }})
      Site time: {% timezone site.time_zone %}{% now "SHORT_DATETIME_FORMAT" %}{% endtimezone %} {% else %} - N/A + — {% endif %} Description - - {% if site.description %} - {{ site.description }} - {% else %} - N/A - {% endif %} - + {{ site.description|placeholder }} @@ -163,19 +145,13 @@ {{ site.physical_address|linebreaksbr }} {% else %} - N/A + — {% endif %} Shipping Address - - {% if site.shipping_address %} - {{ site.shipping_address|linebreaksbr }} - {% else %} - N/A - {% endif %} - + {{ site.shipping_address|linebreaksbr|placeholder }} GPS Coordinates @@ -188,19 +164,13 @@ {{ site.latitude }}, {{ site.longitude }} {% else %} - N/A + — {% endif %} Contact Name - - {% if site.contact_name %} - {{ site.contact_name }} - {% else %} - N/A - {% endif %} - + {{ site.contact_name|placeholder }} Contact Phone @@ -208,7 +178,7 @@ {% if site.contact_phone %} {{ site.contact_phone }} {% else %} - N/A + — {% endif %} @@ -218,7 +188,7 @@ {% if site.contact_email %} {{ site.contact_email }} {% else %} - N/A + — {% endif %} diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html index 097cb487f..2665473fc 100644 --- a/netbox/templates/dcim/virtualchassis_edit.html +++ b/netbox/templates/dcim/virtualchassis_edit.html @@ -1,4 +1,5 @@ {% extends '_base.html' %} +{% load helpers %} {% load form_helpers %} {% block content %} @@ -52,16 +53,10 @@ {% if device.rack %} {{ device.rack }} / {{ device.position }} {% else %} - N/A - {% endif %} - - - {% if device.serial %} - {{ device.serial }} - {% else %} - N/A + — {% endif %} + {{ device.serial|placeholder }} {{ form.vc_position }} {% if form.vc_position.errors %} diff --git a/netbox/templates/extras/configcontext.html b/netbox/templates/extras/configcontext.html index c987daf33..6c14b7b16 100644 --- a/netbox/templates/extras/configcontext.html +++ b/netbox/templates/extras/configcontext.html @@ -55,13 +55,7 @@ Description - - {% if configcontext.description %} - {{ configcontext.description }} - {% else %} - N/A - {% endif %} - + {{ configcontext.description|placeholder }} Active diff --git a/netbox/templates/inc/custom_fields_panel.html b/netbox/templates/inc/custom_fields_panel.html index e469048af..52d9c2d6e 100644 --- a/netbox/templates/inc/custom_fields_panel.html +++ b/netbox/templates/inc/custom_fields_panel.html @@ -20,7 +20,7 @@ {% elif field.required %} Not defined {% else %} - N/A + — {% endif %} diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html index 129d9d071..0dfdd8260 100644 --- a/netbox/templates/ipam/aggregate.html +++ b/netbox/templates/ipam/aggregate.html @@ -75,23 +75,11 @@ Date Added - - {% if aggregate.date_added %} - {{ aggregate.date_added }} - {% else %} - N/A - {% endif %} - + {{ aggregate.date_added|placeholder }} Description - - {% if aggregate.description %} - {{ aggregate.description }} - {% else %} - N/A - {% endif %} - + {{ aggregate.description|placeholder }} diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html index a8501c8a0..f822ac2b8 100644 --- a/netbox/templates/ipam/ipaddress.html +++ b/netbox/templates/ipam/ipaddress.html @@ -105,13 +105,7 @@ Description - - {% if ipaddress.description %} - {{ ipaddress.description }} - {% else %} - N/A - {% endif %} - + {{ ipaddress.description|placeholder }} Assignment @@ -119,7 +113,7 @@ {% if ipaddress.interface %} {{ ipaddress.interface.parent }} ({{ ipaddress.interface }}) {% else %} - None + — {% endif %} diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index f621a0130..0e3aff6b0 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -160,13 +160,7 @@ Description - - {% if prefix.description %} - {{ prefix.description }} - {% else %} - N/A - {% endif %} - + {{ prefix.description|placeholder }} Is a pool diff --git a/netbox/templates/ipam/service.html b/netbox/templates/ipam/service.html index a0f1e57a5..17b1d971e 100644 --- a/netbox/templates/ipam/service.html +++ b/netbox/templates/ipam/service.html @@ -70,13 +70,7 @@ Description - - {% if service.description %} - {{ service.description }} - {% else %} - N/A - {% endif %} - + {{ service.description|placeholder }} diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index 73e87149b..96e3a5e10 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -129,13 +129,7 @@ Description - - {% if vlan.description %} - {{ vlan.description }} - {% else %} - N/A - {% endif %} - + {{ vlan.description|placeholder }} diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html index a69ccd0f5..f89212804 100644 --- a/netbox/templates/ipam/vrf.html +++ b/netbox/templates/ipam/vrf.html @@ -82,13 +82,7 @@ Description - - {% if vrf.description %} - {{ vrf.description }} - {% else %} - N/A - {% endif %} - + {{ vrf.description|placeholder }} diff --git a/netbox/templates/secrets/secret.html b/netbox/templates/secrets/secret.html index bfe700938..6d3119d5b 100644 --- a/netbox/templates/secrets/secret.html +++ b/netbox/templates/secrets/secret.html @@ -59,13 +59,7 @@ Name - - {% if secret.name %} - {{ secret.name }} - {% else %} - N/A - {% endif %} - + {{ secret.name|placeholder }} diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html index 6f2131a51..67f3c72fe 100644 --- a/netbox/templates/tenancy/tenant.html +++ b/netbox/templates/tenancy/tenant.html @@ -71,13 +71,7 @@ Description - - {% if tenant.description %} - {{ tenant.description }} - {% else %} - N/A - {% endif %} - + {{ tenant.description|placeholder }} diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html index 552aaa997..410ab32e5 100644 --- a/netbox/templates/virtualization/virtualmachine.html +++ b/netbox/templates/virtualization/virtualmachine.html @@ -116,7 +116,7 @@ (NAT: {{ virtualmachine.primary_ip4.nat_outside.address.ip }}) {% endif %} {% else %} - N/A + — {% endif %} @@ -131,7 +131,7 @@ (NAT: {{ virtualmachine.primary_ip6.nat_outside.address.ip }}) {% endif %} {% else %} - N/A + — {% endif %} @@ -181,13 +181,7 @@ - + @@ -195,7 +189,7 @@ {% if virtualmachine.memory %} {{ virtualmachine.memory }} MB {% else %} - N/A + — {% endif %} @@ -205,7 +199,7 @@ {% if virtualmachine.disk %} {{ virtualmachine.disk }} GB {% else %} - N/A + — {% endif %} diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py index 0d5063ae0..9fcbf2edd 100644 --- a/netbox/utilities/templatetags/helpers.py +++ b/netbox/utilities/templatetags/helpers.py @@ -22,6 +22,16 @@ def oneline(value): """ return value.replace('\n', ' ') +@register.filter() +def placeholder(value): + """ + Render a muted placeholder if value equates to False. + """ + if value: + return value + placeholder = '—' + return mark_safe(placeholder) + @register.filter() def getlist(value, arg): @@ -97,6 +107,8 @@ def humanize_speed(speed): 100000 => "100 Mbps" 10000000 => "10 Gbps" """ + if not speed: + return '' if speed >= 1000000000 and speed % 1000000000 == 0: return '{} Tbps'.format(int(speed / 1000000000)) elif speed >= 1000000 and speed % 1000000 == 0: From 1847e82d0498095842ccf3e558e6d3efef3bbf46 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 5 Nov 2018 13:53:22 -0500 Subject: [PATCH 113/191] Closes #867: Add a 'description' field to CircuitTermination --- CHANGELOG.md | 2 ++ netbox/circuits/api/serializers.py | 2 +- netbox/circuits/api/views.py | 4 +++- netbox/circuits/filters.py | 4 +++- netbox/circuits/forms.py | 2 +- .../0014_circuittermination_description.py | 18 ++++++++++++++++++ netbox/circuits/models.py | 4 ++++ .../circuits/circuittermination_edit.html | 1 + .../circuits/inc/circuit_termination.html | 4 ++++ 9 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 netbox/circuits/migrations/0014_circuittermination_description.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 7594cba95..45b014999 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ NetBox now supports modeling physical cables for console, power, and interface c ## Enhancements * [#450](https://github.com/digitalocean/netbox/issues/450) - Added `outer_width` and `outer_depth` fields to rack model +* [#867](https://github.com/digitalocean/netbox/issues/867) - Added `description` field to circuit terminations * [#1444](https://github.com/digitalocean/netbox/issues/1444) - Added an `asset_tag` field for racks * [#2000](https://github.com/digitalocean/netbox/issues/2000) - Dropped support for Python 2 * [#2104](https://github.com/digitalocean/netbox/issues/2104) - Added a `status` field for racks @@ -37,6 +38,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * `power_ports` * `pass_through_ports` * The field `interface_ordering` has been removed from the DeviceType serializer +* Added a `description` field to the CircuitTermination serializer --- diff --git a/netbox/circuits/api/serializers.py b/netbox/circuits/api/serializers.py index 340755b8a..da2bed53a 100644 --- a/netbox/circuits/api/serializers.py +++ b/netbox/circuits/api/serializers.py @@ -92,7 +92,7 @@ class CircuitTerminationSerializer(ValidatedModelSerializer): model = CircuitTermination fields = [ 'id', 'circuit', 'term_side', 'site', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', - 'connected_endpoint', 'cable', + 'description', 'connected_endpoint', 'cable', ] diff --git a/netbox/circuits/api/views.py b/netbox/circuits/api/views.py index 229abd705..877d85f85 100644 --- a/netbox/circuits/api/views.py +++ b/netbox/circuits/api/views.py @@ -67,6 +67,8 @@ class CircuitViewSet(CustomFieldModelViewSet): # class CircuitTerminationViewSet(ModelViewSet): - queryset = CircuitTermination.objects.select_related('circuit', 'site') + queryset = CircuitTermination.objects.select_related( + 'circuit', 'site', 'connected_endpoint__device', 'cable' + ) serializer_class = serializers.CircuitTerminationSerializer filterset_class = filters.CircuitTerminationFilter diff --git a/netbox/circuits/filters.py b/netbox/circuits/filters.py index d1c86f9cf..61613bc6d 100644 --- a/netbox/circuits/filters.py +++ b/netbox/circuits/filters.py @@ -125,6 +125,7 @@ class CircuitFilter(CustomFieldFilterSet, django_filters.FilterSet): Q(cid__icontains=value) | Q(terminations__xconnect_id__icontains=value) | Q(terminations__pp_info__icontains=value) | + Q(terminations__description__icontains=value) | Q(description__icontains=value) | Q(comments__icontains=value) ).distinct() @@ -160,5 +161,6 @@ class CircuitTerminationFilter(django_filters.FilterSet): return queryset.filter( Q(circuit__cid__icontains=value) | Q(xconnect_id__icontains=value) | - Q(pp_info__icontains=value) + Q(pp_info__icontains=value) | + Q(description__icontains=value) ).distinct() diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py index 2fa381dfe..d7c23543f 100644 --- a/netbox/circuits/forms.py +++ b/netbox/circuits/forms.py @@ -208,7 +208,7 @@ class CircuitTerminationForm(BootstrapMixin, forms.ModelForm): class Meta: model = CircuitTermination fields = [ - 'term_side', 'site', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', + 'term_side', 'site', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'description', ] help_texts = { 'port_speed': "Physical circuit speed", diff --git a/netbox/circuits/migrations/0014_circuittermination_description.py b/netbox/circuits/migrations/0014_circuittermination_description.py new file mode 100644 index 000000000..2b3070427 --- /dev/null +++ b/netbox/circuits/migrations/0014_circuittermination_description.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.3 on 2018-11-05 18:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('circuits', '0013_cables'), + ] + + operations = [ + migrations.AddField( + model_name='circuittermination', + name='description', + field=models.CharField(blank=True, max_length=100), + ), + ] diff --git a/netbox/circuits/models.py b/netbox/circuits/models.py index 1aa5a7281..e2f712479 100644 --- a/netbox/circuits/models.py +++ b/netbox/circuits/models.py @@ -258,6 +258,10 @@ class CircuitTermination(CableTermination): blank=True, verbose_name='Patch panel/port(s)' ) + description = models.CharField( + max_length=100, + blank=True + ) class Meta: ordering = ['circuit', 'term_side'] diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html index 274c2a372..2bbc4695d 100644 --- a/netbox/templates/circuits/circuittermination_edit.html +++ b/netbox/templates/circuits/circuittermination_edit.html @@ -68,6 +68,7 @@ {% render_field form.xconnect_id %} {% render_field form.pp_info %} + {% render_field form.description %} diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html index 55432b159..eba00d2fd 100644 --- a/netbox/templates/circuits/inc/circuit_termination.html +++ b/netbox/templates/circuits/inc/circuit_termination.html @@ -91,6 +91,10 @@ + + + +
      Virtual CPUs - {% if virtualmachine.vcpus %} - {{ virtualmachine.vcpus }} - {% else %} - N/A - {% endif %} - {{ virtualmachine.vcpus|placeholder }}
      Memory
      Patch Panel/Port {{ termination.pp_info|placeholder }}
      Description{{ termination.description|placeholder }}
      {% else %}
      From e8caa4648489244aab036ef2cceceb53de2d728a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 5 Nov 2018 14:01:34 -0500 Subject: [PATCH 114/191] Expanded v2.5 release notes --- CHANGELOG.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45b014999..4ee397db6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,17 @@ v2.5.0 (FUTURE) ## Notes -* As promised, Python 2 support has been completed removed. Python 3.5 or higher is now required to run NetBox. -* The UserAction model, which was deprecated by the new change logging feature in NetBox v2.4, has been removed. If you need to archive user activity, do so prior to upgrading to NetBox v2.5, as the database migration will remove all data associated with this model. +### Python 3 Required + +As promised, Python 2 support has been completed removed. Python 3.5 or higher is now required to run NetBox. Please see [our Python 3 migration guide](https://netbox.readthedocs.io/en/stable/installation/migrating-to-python3/) for assistance with upgrading. + +### Removed Deprecated User Activity Log + +The UserAction model, which was deprecated by the new change logging feature in NetBox v2.4, has been removed. If you need to archive legacy user activity, do so prior to upgrading to NetBox v2.5, as the database migration will remove all data associated with this model. + +### View Permissions in Django 2.1 + +Django 2.1 introduces view permissions for object types (not to be confused with object-level permissions). Implementation of [#323](https://github.com/digitalocean/netbox/issues/323) is planned for NetBox v2.6. Users are encourage to begin assigning view permissions as desired in preparation for their eventual enforcement. ## New Features From 46e594f1f1b1e1d4a9eb8f107e6e76a7aa3ad18c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 5 Nov 2018 14:32:22 -0500 Subject: [PATCH 115/191] Closes #1931: Added a count of assigned IP addresses to the interface API serializer --- netbox/dcim/api/serializers.py | 2 +- netbox/dcim/api/views.py | 4 ++-- netbox/dcim/models.py | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 882e12310..bc0995d49 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -712,7 +712,7 @@ class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer): model = Interface fields = [ 'id', 'device', 'name', 'form_factor', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description', - 'connected_endpoint', 'cable', 'mode', 'untagged_vlan', 'tagged_vlans', 'tags', + 'connected_endpoint', 'cable', 'mode', 'untagged_vlan', 'tagged_vlans', 'tags', 'count_ipaddresses', ] def validate(self, data): diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 6a0b29d96..b615a83c0 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -1,7 +1,7 @@ from collections import OrderedDict from django.conf import settings -from django.db.models import F, Q +from django.db.models import Count, F, Q from django.http import HttpResponseForbidden from django.shortcuts import get_object_or_404 from drf_yasg import openapi @@ -409,7 +409,7 @@ class InterfaceViewSet(CableTraceMixin, ModelViewSet): queryset = Interface.objects.select_related( 'device', '_connected_interface', '_connected_circuittermination', 'cable' ).prefetch_related( - 'tags' + 'ip_addresses', 'tags' ) serializer_class = serializers.InterfaceSerializer filterset_class = filters.InterfaceFilter diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index e332dafd2..a79118077 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2091,6 +2091,10 @@ class Interface(CableTermination, ComponentModel): def is_lag(self): return self.form_factor == IFACE_FF_LAG + @property + def count_ipaddresses(self): + return self.ip_addresses.count() + # # Pass-through ports From 82076d3ca6f8dd1f6a43832f9f5af47afc5c4c52 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 5 Nov 2018 14:33:50 -0500 Subject: [PATCH 116/191] Changelog for #1931 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ee397db6..19859dc0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#450](https://github.com/digitalocean/netbox/issues/450) - Added `outer_width` and `outer_depth` fields to rack model * [#867](https://github.com/digitalocean/netbox/issues/867) - Added `description` field to circuit terminations * [#1444](https://github.com/digitalocean/netbox/issues/1444) - Added an `asset_tag` field for racks +* [#1931](https://github.com/digitalocean/netbox/issues/1931) - Added a count of assigned IP addresses to the interface API serializer * [#2000](https://github.com/digitalocean/netbox/issues/2000) - Dropped support for Python 2 * [#2104](https://github.com/digitalocean/netbox/issues/2104) - Added a `status` field for racks * [#2165](https://github.com/digitalocean/netbox/issues/2165) - Improved natural ordering of Interfaces @@ -48,6 +49,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * `pass_through_ports` * The field `interface_ordering` has been removed from the DeviceType serializer * Added a `description` field to the CircuitTermination serializer +* Added `ipaddress_count` to InterfaceSerializer to show the count of assigned IP addresses for each interface --- From e57b3bc4ab76ec0ef402b61a9cfc3ddd5b763202 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 5 Nov 2018 14:41:51 -0500 Subject: [PATCH 117/191] Closes #2057: Added description columns to interface connections list --- CHANGELOG.md | 1 + netbox/dcim/tables.py | 10 +++++++++- netbox/dcim/views.py | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19859dc0f..2ec56bbb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#1444](https://github.com/digitalocean/netbox/issues/1444) - Added an `asset_tag` field for racks * [#1931](https://github.com/digitalocean/netbox/issues/1931) - Added a count of assigned IP addresses to the interface API serializer * [#2000](https://github.com/digitalocean/netbox/issues/2000) - Dropped support for Python 2 +* [#2057](https://github.com/digitalocean/netbox/issues/2057) - Added description columns to interface connections list * [#2104](https://github.com/digitalocean/netbox/issues/2104) - Added a `status` field for racks * [#2165](https://github.com/digitalocean/netbox/issues/2165) - Improved natural ordering of Interfaces * [#2292](https://github.com/digitalocean/netbox/issues/2292) - Removed the deprecated UserAction model diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 72bf30c14..361bfcebd 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -716,6 +716,10 @@ class InterfaceConnectionTable(BaseTable): args=[Accessor('pk')], verbose_name='Interface A' ) + description_a = tables.Column( + accessor=Accessor('description'), + verbose_name='Description' + ) device_b = tables.LinkColumn( viewname='dcim:device', accessor=Accessor('connected_endpoint.device'), @@ -728,6 +732,10 @@ class InterfaceConnectionTable(BaseTable): args=[Accessor('connected_endpoint.pk')], verbose_name='Interface B' ) + description_b = tables.Column( + accessor=Accessor('connected_endpoint.description'), + verbose_name='Description' + ) cable = tables.LinkColumn( viewname='dcim:cable', args=[Accessor('cable.pk')] @@ -735,7 +743,7 @@ class InterfaceConnectionTable(BaseTable): class Meta(BaseTable.Meta): model = Interface - fields = ('device_a', 'interface_a', 'device_b', 'interface_b', 'cable') + fields = ('device_a', 'interface_a', 'description_a', 'device_b', 'interface_b', 'description_b', 'cable') # diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 31787ec6d..045562e30 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1732,6 +1732,8 @@ class InterfaceConnectionsListView(ObjectListView): # Avoid duplicate connections by only selecting the lower PK in a connected pair _connected_interface__isnull=False, pk__lt=F('_connected_interface') + ).order_by( + 'device' ) filter = filters.InterfaceConnectionFilter filter_form = forms.InterfaceConnectionFilterForm From 01628cdd315a3efc7e8384d06025219e7cc78555 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 5 Nov 2018 15:09:11 -0500 Subject: [PATCH 118/191] Updated base requirements --- base_requirements.txt | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/base_requirements.txt b/base_requirements.txt index 5f3e0eb80..415b15346 100644 --- a/base_requirements.txt +++ b/base_requirements.txt @@ -1,25 +1,20 @@ -# django-filter-1.1.0 breaks with Django-2.1 -Django>=2.0,<2.1 +Django django-cors-headers django-debug-toolbar -# django-filter-2.0.0 drops Python 2 support (blocked by #2000) -django-filter==1.1.0 +django-filter django-mptt django-tables2 django-taggit django-taggit-serializer django-timezone-field -# https://github.com/encode/django-rest-framework/issues/6053 -djangorestframework==3.8.1 +djangorestframework drf-yasg[validation] graphviz -Markdown +# py-gfm requires Markdown<3.0 +Markdown<3.0 natsort -ncclient netaddr -paramiko Pillow psycopg2-binary py-gfm pycryptodome -xmltodict From bb114ea66b9453160f3ce94f7a5bf7d6a3401327 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Nov 2018 11:44:32 -0500 Subject: [PATCH 119/191] Re-implemented connected device API view & test --- netbox/dcim/api/views.py | 33 +++++++++------ netbox/dcim/tests/test_api.py | 78 ++++++++++++++++++----------------- 2 files changed, 60 insertions(+), 51 deletions(-) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 435810f14..f6c62e86f 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -1,7 +1,7 @@ from collections import OrderedDict from django.conf import settings -from django.db.models import Count, F, Q +from django.db.models import F, Q from django.http import HttpResponseForbidden from django.shortcuts import get_object_or_404 from drf_yasg import openapi @@ -528,32 +528,39 @@ class ConnectedDeviceViewSet(ViewSet): * `peer_interface`: The name of the peer interface """ permission_classes = [IsAuthenticatedOrLoginNotRequired] - _device_param = Parameter('peer_device', 'query', - description='The name of the peer device', required=True, type=openapi.TYPE_STRING) - _interface_param = Parameter('peer_interface', 'query', - description='The name of the peer interface', required=True, type=openapi.TYPE_STRING) + _device_param = Parameter( + name='peer_device', + in_='query', + description='The name of the peer device', + required=True, + type=openapi.TYPE_STRING + ) + _interface_param = Parameter( + name='peer_interface', + in_='query', + description='The name of the peer interface', + required=True, + type=openapi.TYPE_STRING + ) def get_view_name(self): return "Connected Device Locator" @swagger_auto_schema( - manual_parameters=[_device_param, _interface_param], responses={'200': serializers.DeviceSerializer}) + manual_parameters=[_device_param, _interface_param], + responses={'200': serializers.DeviceSerializer} + ) def list(self, request): peer_device_name = request.query_params.get(self._device_param.name) - if not peer_device_name: - # TODO: remove this after 2.4 as the switch to using underscores is a breaking change - peer_device_name = request.query_params.get('peer-device') peer_interface_name = request.query_params.get(self._interface_param.name) - if not peer_interface_name: - # TODO: remove this after 2.4 as the switch to using underscores is a breaking change - peer_interface_name = request.query_params.get('peer-interface') + if not peer_device_name or not peer_interface_name: raise MissingFilterException(detail='Request must include "peer_device" and "peer_interface" filters.') # Determine local interface from peer interface's connection peer_interface = get_object_or_404(Interface, device__name=peer_device_name, name=peer_interface_name) - local_interface = peer_interface.connected_interface + local_interface = peer_interface._connected_interface if local_interface is None: return Response() diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 86616389c..5c5c413e0 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -3300,44 +3300,46 @@ class ConnectionTest(APITestCase): self.assertEqual(circuittermination1.connected_endpoint, interface1) -# class ConnectedDeviceTest(APITestCase): -# -# def setUp(self): -# -# super(ConnectedDeviceTest, self).setUp() -# -# self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1') -# self.site2 = Site.objects.create(name='Test Site 2', slug='test-site-2') -# manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1') -# self.devicetype1 = DeviceType.objects.create( -# manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1' -# ) -# self.devicetype2 = DeviceType.objects.create( -# manufacturer=manufacturer, model='Test Device Type 2', slug='test-device-type-2' -# ) -# self.devicerole1 = DeviceRole.objects.create( -# name='Test Device Role 1', slug='test-device-role-1', color='ff0000' -# ) -# self.devicerole2 = DeviceRole.objects.create( -# name='Test Device Role 2', slug='test-device-role-2', color='00ff00' -# ) -# self.device1 = Device.objects.create( -# device_type=self.devicetype1, device_role=self.devicerole1, name='TestDevice1', site=self.site1 -# ) -# self.device2 = Device.objects.create( -# device_type=self.devicetype1, device_role=self.devicerole1, name='TestDevice2', site=self.site1 -# ) -# self.interface1 = Interface.objects.create(device=self.device1, name='eth0') -# self.interface2 = Interface.objects.create(device=self.device2, name='eth0') -# InterfaceConnection.objects.create(interface_a=self.interface1, interface_b=self.interface2) -# -# def test_get_connected_device(self): -# -# url = reverse('dcim-api:connected-device-list') -# response = self.client.get(url + '?peer-device=TestDevice2&peer-interface=eth0', **self.header) -# -# self.assertHttpStatus(response, status.HTTP_200_OK) -# self.assertEqual(response.data['name'], self.device1.name) +class ConnectedDeviceTest(APITestCase): + + def setUp(self): + + super(ConnectedDeviceTest, self).setUp() + + self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1') + self.site2 = Site.objects.create(name='Test Site 2', slug='test-site-2') + manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1') + self.devicetype1 = DeviceType.objects.create( + manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1' + ) + self.devicetype2 = DeviceType.objects.create( + manufacturer=manufacturer, model='Test Device Type 2', slug='test-device-type-2' + ) + self.devicerole1 = DeviceRole.objects.create( + name='Test Device Role 1', slug='test-device-role-1', color='ff0000' + ) + self.devicerole2 = DeviceRole.objects.create( + name='Test Device Role 2', slug='test-device-role-2', color='00ff00' + ) + self.device1 = Device.objects.create( + device_type=self.devicetype1, device_role=self.devicerole1, name='TestDevice1', site=self.site1 + ) + self.device2 = Device.objects.create( + device_type=self.devicetype1, device_role=self.devicerole1, name='TestDevice2', site=self.site1 + ) + self.interface1 = Interface.objects.create(device=self.device1, name='eth0') + self.interface2 = Interface.objects.create(device=self.device2, name='eth0') + + cable = Cable(termination_a=self.interface1, termination_b=self.interface2) + cable.save() + + def test_get_connected_device(self): + + url = reverse('dcim-api:connected-device-list') + response = self.client.get(url + '?peer_device=TestDevice2&peer_interface=eth0', **self.header) + + self.assertHttpStatus(response, status.HTTP_200_OK) + self.assertEqual(response.data['name'], self.device1.name) class VirtualChassisTest(APITestCase): From ad4e1f01aacc23de9153b74541a0e2775c7348ef Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Nov 2018 11:52:41 -0500 Subject: [PATCH 120/191] Improved templates for cable creation --- netbox/templates/dcim/cable.html | 2 +- netbox/templates/dcim/cable_connect.html | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html index a9b61aaf1..e1d3e4d8b 100644 --- a/netbox/templates/dcim/cable.html +++ b/netbox/templates/dcim/cable.html @@ -51,7 +51,7 @@ Label - {{ cable.labe|placeholder }} + {{ cable.label|placeholder }} Color diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html index 257c6da79..9706dad9f 100644 --- a/netbox/templates/dcim/cable_connect.html +++ b/netbox/templates/dcim/cable_connect.html @@ -116,12 +116,24 @@
      - {% render_field form.type %} - {% render_field form.status %} - {% render_field form.label %} - {% render_field form.color %} - {% render_field form.length %} - {% render_field form.length_unit %} +
      +
      Cable
      +
      + {% render_field form.status %} + {% render_field form.type %} + {% render_field form.label %} + {% render_field form.color %} +
      + +
      + {{ form.length }} +
      +
      + {{ form.length_unit }} +
      +
      +
      +
      From 5e06c5a9ea425d03c3fb06acb959478a8c70740d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Nov 2018 12:04:46 -0500 Subject: [PATCH 121/191] Added cable connection views for front/rear ports --- netbox/dcim/urls.py | 2 ++ netbox/templates/dcim/inc/frontport.html | 5 +++++ netbox/templates/dcim/inc/rearport.html | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 24c6d6a9a..982d8de94 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -216,6 +216,7 @@ urlpatterns = [ # url(r'^devices/front-ports/add/$', views.DeviceBulkAddFrontPortView.as_view(), name='device_bulk_add_frontport'), url(r'^devices/(?P\d+)/front-ports/add/$', views.FrontPortCreateView.as_view(), name='frontport_add'), url(r'^devices/(?P\d+)/front-ports/delete/$', views.FrontPortBulkDeleteView.as_view(), name='frontport_bulk_delete'), + url(r'^front-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='frontport_connect', kwargs={'termination_a_type': FrontPort}), url(r'^front-ports/(?P\d+)/edit/$', views.FrontPortEditView.as_view(), name='frontport_edit'), url(r'^front-ports/(?P\d+)/delete/$', views.FrontPortDeleteView.as_view(), name='frontport_delete'), url(r'^front-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='frontport_trace', kwargs={'model': FrontPort}), @@ -225,6 +226,7 @@ urlpatterns = [ # url(r'^devices/rear-ports/add/$', views.DeviceBulkAddRearPortView.as_view(), name='device_bulk_add_rearport'), url(r'^devices/(?P\d+)/rear-ports/add/$', views.RearPortCreateView.as_view(), name='rearport_add'), url(r'^devices/(?P\d+)/rear-ports/delete/$', views.RearPortBulkDeleteView.as_view(), name='rearport_bulk_delete'), + url(r'^rear-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='rearport_connect', kwargs={'termination_a_type': RearPort}), url(r'^rear-ports/(?P\d+)/edit/$', views.RearPortEditView.as_view(), name='rearport_edit'), url(r'^rear-ports/(?P\d+)/delete/$', views.RearPortDeleteView.as_view(), name='rearport_delete'), url(r'^rear-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='rearport_trace', kwargs={'model': RearPort}), diff --git a/netbox/templates/dcim/inc/frontport.html b/netbox/templates/dcim/inc/frontport.html index 8fb7d1136..47e539e6e 100644 --- a/netbox/templates/dcim/inc/frontport.html +++ b/netbox/templates/dcim/inc/frontport.html @@ -30,6 +30,11 @@ {# Actions #} + {% if perms.dcim.add_cable %} + + + + {% endif %} {% if perms.dcim.change_frontport %} diff --git a/netbox/templates/dcim/inc/rearport.html b/netbox/templates/dcim/inc/rearport.html index e180fa154..41541258e 100644 --- a/netbox/templates/dcim/inc/rearport.html +++ b/netbox/templates/dcim/inc/rearport.html @@ -29,6 +29,11 @@ {# Actions #} + {% if perms.dcim.add_cable %} + + + + {% endif %} {% if perms.dcim.change_rearport %} From 6140dd955ae5162f33459a4d90debf02246c8f0d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Nov 2018 12:12:01 -0500 Subject: [PATCH 122/191] Set unit_length to empty string when not specified during cable import --- netbox/dcim/forms.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 04e2120e6..8e0ab5a99 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1969,6 +1969,11 @@ class CableCSVForm(forms.ModelForm): self.instance.termination_b = termination_object return termination_object + def clean_length_unit(self): + # Avoid trying to save as NULL + length_unit = self.cleaned_data.get('length_unit', None) + return length_unit if length_unit is not None else '' + class CableBulkEditForm(BootstrapMixin, BulkEditForm): pk = forms.ModelMultipleChoiceField( From 60452a7b0c704221a55bb1d916dba44c27d24a65 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Nov 2018 12:43:30 -0500 Subject: [PATCH 123/191] Implemented DeviceComponentManager; removed natsort as a dependency --- base_requirements.txt | 1 - netbox/dcim/forms.py | 6 +-- netbox/dcim/{querysets.py => managers.py} | 17 ++++++++ netbox/dcim/models.py | 47 +++++++++++------------ netbox/dcim/views.py | 32 +++++---------- requirements.txt | 1 - 6 files changed, 52 insertions(+), 52 deletions(-) rename netbox/dcim/{querysets.py => managers.py} (83%) diff --git a/base_requirements.txt b/base_requirements.txt index 415b15346..5770bab48 100644 --- a/base_requirements.txt +++ b/base_requirements.txt @@ -12,7 +12,6 @@ drf-yasg[validation] graphviz # py-gfm requires Markdown<3.0 Markdown<3.0 -natsort netaddr Pillow psycopg2-binary diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 8e0ab5a99..e36554613 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1,5 +1,4 @@ import re -from operator import attrgetter from django import forms from django.contrib.auth.models import User @@ -8,7 +7,6 @@ from django.contrib.postgres.forms.array import SimpleArrayField from django.core.exceptions import ObjectDoesNotExist from django.db.models import Count, Q from mptt.forms import TreeNodeChoiceField -from natsort import natsorted from taggit.forms import TagField from timezone_field import TimeZoneFormField @@ -803,7 +801,7 @@ class FrontPortTemplateCreateForm(ComponentForm): # Populate rear port choices choices = [] - rear_ports = natsorted(RearPortTemplate.objects.filter(device_type=self.parent), key=attrgetter('name')) + rear_ports = RearPortTemplate.objects.filter(device_type=self.parent) for rear_port in rear_ports: for i in range(1, rear_port.positions + 1): if (rear_port.pk, i) not in occupied_port_positions: @@ -1687,7 +1685,7 @@ class FrontPortCreateForm(ComponentForm): # Populate rear port choices choices = [] - rear_ports = natsorted(RearPort.objects.filter(device=self.parent), key=attrgetter('name')) + rear_ports = RearPort.objects.filter(device=self.parent) for rear_port in rear_ports: for i in range(1, rear_port.positions + 1): if (rear_port.pk, i) not in occupied_port_positions: diff --git a/netbox/dcim/querysets.py b/netbox/dcim/managers.py similarity index 83% rename from netbox/dcim/querysets.py rename to netbox/dcim/managers.py index 84d309719..bb2057c94 100644 --- a/netbox/dcim/querysets.py +++ b/netbox/dcim/managers.py @@ -3,6 +3,7 @@ from django.db.models.expressions import RawSQL from .constants import NONCONNECTABLE_IFACE_TYPES +# Regular expressions for parsing Interface names TYPE_RE = r"SUBSTRING({} FROM '^([^0-9\.:]+)')" SLOT_RE = r"COALESCE(CAST(SUBSTRING({} FROM '^(?:[^0-9]+)?(\d{{1,9}})/') AS integer), NULL)" SUBSLOT_RE = r"COALESCE(CAST(SUBSTRING({} FROM '^(?:[^0-9\.:]+)?\d{{1,9}}/(\d{{1,9}})') AS integer), NULL)" @@ -13,6 +14,22 @@ CHANNEL_RE = r"COALESCE(CAST(SUBSTRING({} FROM '^.*:(\d{{1,9}})(\.\d{{1,9}})?$') VC_RE = r"COALESCE(CAST(SUBSTRING({} FROM '^.*\.(\d{{1,9}})$') AS integer), 0)" +class DeviceComponentManager(Manager): + + def get_queryset(self): + + queryset = super(DeviceComponentManager, self).get_queryset() + table_name = self.model._meta.db_table + sql = r"CONCAT(REGEXP_REPLACE({}.name, '\d+$', ''), LPAD(SUBSTRING({}.name FROM '\d+$'), 8, '0'))" + + # Pad any trailing digits to effect natural sorting + return queryset.extra( + select={ + 'name_padded': sql.format(table_name, table_name), + } + ).order_by('name_padded') + + class InterfaceQuerySet(QuerySet): def connectable(self): diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index a79118077..2d7e0549a 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -22,7 +22,7 @@ from utilities.models import ChangeLoggedModel from utilities.utils import serialize_object, to_meters from .constants import * from .fields import ASNField, MACAddressField -from .querysets import InterfaceManager +from .managers import DeviceComponentManager, InterfaceManager class ComponentTemplateModel(models.Model): @@ -965,6 +965,8 @@ class ConsolePortTemplate(ComponentTemplateModel): max_length=50 ) + objects = DeviceComponentManager() + class Meta: ordering = ['device_type', 'name'] unique_together = ['device_type', 'name'] @@ -986,6 +988,8 @@ class ConsoleServerPortTemplate(ComponentTemplateModel): max_length=50 ) + objects = DeviceComponentManager() + class Meta: ordering = ['device_type', 'name'] unique_together = ['device_type', 'name'] @@ -1007,6 +1011,8 @@ class PowerPortTemplate(ComponentTemplateModel): max_length=50 ) + objects = DeviceComponentManager() + class Meta: ordering = ['device_type', 'name'] unique_together = ['device_type', 'name'] @@ -1028,6 +1034,8 @@ class PowerOutletTemplate(ComponentTemplateModel): max_length=50 ) + objects = DeviceComponentManager() + class Meta: ordering = ['device_type', 'name'] unique_together = ['device_type', 'name'] @@ -1057,7 +1065,7 @@ class InterfaceTemplate(ComponentTemplateModel): verbose_name='Management only' ) - objects = InterfaceManager + objects = InterfaceManager() class Meta: ordering = ['device_type', 'name'] @@ -1092,6 +1100,8 @@ class FrontPortTemplate(ComponentTemplateModel): validators=[MinValueValidator(1), MaxValueValidator(64)] ) + objects = DeviceComponentManager() + class Meta: ordering = ['device_type', 'name'] unique_together = [ @@ -1139,6 +1149,8 @@ class RearPortTemplate(ComponentTemplateModel): validators=[MinValueValidator(1), MaxValueValidator(64)] ) + objects = DeviceComponentManager() + class Meta: ordering = ['device_type', 'name'] unique_together = ['device_type', 'name'] @@ -1160,6 +1172,8 @@ class DeviceBayTemplate(ComponentTemplateModel): max_length=50 ) + objects = DeviceComponentManager() + class Meta: ordering = ['device_type', 'name'] unique_together = ['device_type', 'name'] @@ -1693,6 +1707,7 @@ class ConsolePort(CableTermination, ComponentModel): default=CONNECTION_STATUS_CONNECTED ) + objects = DeviceComponentManager() tags = TaggableManager() csv_headers = ['console_server', 'connected_endpoint', 'device', 'console_port', 'connection_status'] @@ -1721,16 +1736,6 @@ class ConsolePort(CableTermination, ComponentModel): # Console server ports # -class ConsoleServerPortManager(models.Manager): - - def get_queryset(self): - # Pad any trailing digits to effect natural sorting - return super(ConsoleServerPortManager, self).get_queryset().extra(select={ - 'name_padded': r"CONCAT(REGEXP_REPLACE(dcim_consoleserverport.name, '\d+$', ''), " - r"LPAD(SUBSTRING(dcim_consoleserverport.name FROM '\d+$'), 8, '0'))", - }).order_by('device', 'name_padded') - - class ConsoleServerPort(CableTermination, ComponentModel): """ A physical port within a Device (typically a designated console server) which provides access to ConsolePorts. @@ -1744,7 +1749,7 @@ class ConsoleServerPort(CableTermination, ComponentModel): max_length=50 ) - objects = ConsoleServerPortManager() + objects = DeviceComponentManager() tags = TaggableManager() class Meta: @@ -1785,6 +1790,7 @@ class PowerPort(CableTermination, ComponentModel): default=CONNECTION_STATUS_CONNECTED ) + objects = DeviceComponentManager() tags = TaggableManager() csv_headers = ['pdu', 'connected_endpoint', 'device', 'power_port', 'connection_status'] @@ -1813,16 +1819,6 @@ class PowerPort(CableTermination, ComponentModel): # Power outlets # -class PowerOutletManager(models.Manager): - - def get_queryset(self): - # Pad any trailing digits to effect natural sorting - return super(PowerOutletManager, self).get_queryset().extra(select={ - 'name_padded': r"CONCAT(REGEXP_REPLACE(dcim_poweroutlet.name, '\d+$', ''), " - r"LPAD(SUBSTRING(dcim_poweroutlet.name FROM '\d+$'), 8, '0'))", - }).order_by('device', 'name_padded') - - class PowerOutlet(CableTermination, ComponentModel): """ A physical power outlet (output) within a Device which provides power to a PowerPort. @@ -1836,7 +1832,7 @@ class PowerOutlet(CableTermination, ComponentModel): max_length=50 ) - objects = PowerOutletManager() + objects = DeviceComponentManager() tags = TaggableManager() class Meta: @@ -2125,6 +2121,7 @@ class FrontPort(CableTermination, ComponentModel): validators=[MinValueValidator(1), MaxValueValidator(64)] ) + objects = DeviceComponentManager() tags = TaggableManager() class Meta: @@ -2174,6 +2171,7 @@ class RearPort(CableTermination, ComponentModel): validators=[MinValueValidator(1), MaxValueValidator(64)] ) + objects = DeviceComponentManager() tags = TaggableManager() class Meta: @@ -2209,6 +2207,7 @@ class DeviceBay(ComponentModel): null=True ) + objects = DeviceComponentManager() tags = TaggableManager() class Meta: diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 045562e30..c67962f01 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1,5 +1,3 @@ -from operator import attrgetter - from django.contrib import messages from django.contrib.auth.mixins import PermissionRequiredMixin from django.core.paginator import EmptyPage, PageNotAnInteger @@ -11,7 +9,6 @@ from django.urls import reverse from django.utils.html import escape from django.utils.safestring import mark_safe from django.views.generic import View -from natsort import natsorted from circuits.models import Circuit from extras.models import Graph, TopologyMap, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE @@ -535,19 +532,19 @@ class DeviceTypeView(View): # Component tables consoleport_table = tables.ConsolePortTemplateTable( - natsorted(ConsolePortTemplate.objects.filter(device_type=devicetype), key=attrgetter('name')), + ConsolePortTemplate.objects.filter(device_type=devicetype), orderable=False ) consoleserverport_table = tables.ConsoleServerPortTemplateTable( - natsorted(ConsoleServerPortTemplate.objects.filter(device_type=devicetype), key=attrgetter('name')), + ConsoleServerPortTemplate.objects.filter(device_type=devicetype), orderable=False ) powerport_table = tables.PowerPortTemplateTable( - natsorted(PowerPortTemplate.objects.filter(device_type=devicetype), key=attrgetter('name')), + PowerPortTemplate.objects.filter(device_type=devicetype), orderable=False ) poweroutlet_table = tables.PowerOutletTemplateTable( - natsorted(PowerOutletTemplate.objects.filter(device_type=devicetype), key=attrgetter('name')), + PowerOutletTemplate.objects.filter(device_type=devicetype), orderable=False ) interface_table = tables.InterfaceTemplateTable( @@ -555,15 +552,15 @@ class DeviceTypeView(View): orderable=False ) front_port_table = tables.FrontPortTemplateTable( - natsorted(FrontPortTemplate.objects.filter(device_type=devicetype), key=attrgetter('name')), + FrontPortTemplate.objects.filter(device_type=devicetype), orderable=False ) rear_port_table = tables.RearPortTemplateTable( - natsorted(RearPortTemplate.objects.filter(device_type=devicetype), key=attrgetter('name')), + RearPortTemplate.objects.filter(device_type=devicetype), orderable=False ) devicebay_table = tables.DeviceBayTemplateTable( - natsorted(DeviceBayTemplate.objects.filter(device_type=devicetype), key=attrgetter('name')), + DeviceBayTemplate.objects.filter(device_type=devicetype), orderable=False ) if request.user.has_perm('dcim.change_devicetype'): @@ -880,19 +877,13 @@ class DeviceView(View): vc_members = [] # Console ports - console_ports = natsorted( - device.consoleports.select_related('connected_endpoint__device', 'cable'), - key=attrgetter('name') - ) + console_ports = device.consoleports.select_related('connected_endpoint__device', 'cable') # Console server ports consoleserverports = device.consoleserverports.select_related('connected_endpoint__device', 'cable') # Power ports - power_ports = natsorted( - device.powerports.select_related('connected_endpoint__device', 'cable'), - key=attrgetter('name') - ) + power_ports = device.powerports.select_related('connected_endpoint__device', 'cable') # Power outlets poweroutlets = device.poweroutlets.select_related('connected_endpoint__device', 'cable') @@ -911,10 +902,7 @@ class DeviceView(View): rear_ports = device.rearports.select_related('cable') # Device bays - device_bays = natsorted( - device.device_bays.select_related('installed_device__device_type__manufacturer'), - key=attrgetter('name') - ) + device_bays = device.device_bays.select_related('installed_device__device_type__manufacturer') # Services services = device.services.all() diff --git a/requirements.txt b/requirements.txt index 4c5068c9b..37f26a7b8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,6 @@ djangorestframework==3.9.0 drf-yasg[validation]==1.11.0 graphviz==0.10.1 Markdown==2.6.11 -natsort==5.4.1 netaddr==0.7.19 Pillow==5.3.0 psycopg2-binary==2.7.5 From 9f0169286b968d5ada429e50ee2a81b6db45e9be Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Nov 2018 14:05:23 -0500 Subject: [PATCH 124/191] Standardize usage of NaturalOrderingManager --- netbox/dcim/models.py | 20 ++++---------------- netbox/utilities/managers.py | 22 +++++++++++++--------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 2d7e0549a..be1aca7f0 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -17,7 +17,7 @@ from timezone_field import TimeZoneField from extras.models import ConfigContextModel, CustomFieldModel, ObjectChange from utilities.fields import ColorField, NullableCharField -from utilities.managers import NaturalOrderByManager +from utilities.managers import NaturalOrderingManager from utilities.models import ChangeLoggedModel from utilities.utils import serialize_object, to_meters from .constants import * @@ -179,10 +179,6 @@ class Region(MPTTModel, ChangeLoggedModel): # Sites # -class SiteManager(NaturalOrderByManager): - natural_order_field = 'name' - - class Site(ChangeLoggedModel, CustomFieldModel): """ A Site represents a geographic location within a network; typically a building or campus. The optional facility @@ -273,7 +269,7 @@ class Site(ChangeLoggedModel, CustomFieldModel): to='extras.ImageAttachment' ) - objects = SiteManager() + objects = NaturalOrderingManager() tags = TaggableManager() csv_headers = [ @@ -416,10 +412,6 @@ class RackRole(ChangeLoggedModel): ) -class RackManager(NaturalOrderByManager): - natural_order_field = 'name' - - class Rack(ChangeLoggedModel, CustomFieldModel): """ Devices are housed within Racks. Each rack has a defined height measured in rack units, and a front and rear face. @@ -524,7 +516,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel): to='extras.ImageAttachment' ) - objects = RackManager() + objects = NaturalOrderingManager() tags = TaggableManager() csv_headers = [ @@ -1278,10 +1270,6 @@ class Platform(ChangeLoggedModel): ) -class DeviceManager(NaturalOrderByManager): - natural_order_field = 'name' - - class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): """ A Device represents a piece of physical hardware mounted within a Rack. Each Device is assigned a DeviceType, @@ -1419,7 +1407,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): to='extras.ImageAttachment' ) - objects = DeviceManager() + objects = NaturalOrderingManager() tags = TaggableManager() csv_headers = [ diff --git a/netbox/utilities/managers.py b/netbox/utilities/managers.py index da4117594..998e27a8c 100644 --- a/netbox/utilities/managers.py +++ b/netbox/utilities/managers.py @@ -1,26 +1,30 @@ from django.db.models import Manager +NAT1 = r"CAST(SUBSTRING({}.{} FROM '^(\d{{1,9}})') AS integer)" +NAT2 = r"SUBSTRING({}.{} FROM '^\d*(.*?)\d*$')" +NAT3 = r"CAST(SUBSTRING({}.{} FROM '(\d{{1,9}})$') AS integer)" -class NaturalOrderByManager(Manager): + +class NaturalOrderingManager(Manager): """ - Order objects naturally by a designated field. Leading and/or trailing digits of values within this field will be - cast as independent integers and sorted accordingly. For example, "Foo2" will be ordered before "Foo10", even though - the digit 1 is normally ordered before the digit 2. + Order objects naturally by a designated field (defaults to 'name'). Leading and/or trailing digits of values within + this field will be cast as independent integers and sorted accordingly. For example, "Foo2" will be ordered before + "Foo10", even though the digit 1 is normally ordered before the digit 2. """ - natural_order_field = None + natural_order_field = 'name' def get_queryset(self): - queryset = super(NaturalOrderByManager, self).get_queryset() + queryset = super(NaturalOrderingManager, self).get_queryset() db_table = self.model._meta.db_table db_field = self.natural_order_field # Append the three subfields derived from the designated natural ordering field queryset = queryset.extra(select={ - '_nat1': r"CAST(SUBSTRING({}.{} FROM '^(\d{{1,9}})') AS integer)".format(db_table, db_field), - '_nat2': r"SUBSTRING({}.{} FROM '^\d*(.*?)\d*$')".format(db_table, db_field), - '_nat3': r"CAST(SUBSTRING({}.{} FROM '(\d{{1,9}})$') AS integer)".format(db_table, db_field), + '_nat1': NAT1.format(db_table, db_field), + '_nat2': NAT2.format(db_table, db_field), + '_nat3': NAT3.format(db_table, db_field), }) # Replace any instance of the designated natural ordering field with its three subfields From f41f14113039b9bd0434bba03b8ca02507827178 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Nov 2018 15:32:38 -0500 Subject: [PATCH 125/191] Removed unused class NullableModelMultipleChoiceField --- netbox/utilities/filters.py | 47 ------------------------------------- 1 file changed, 47 deletions(-) diff --git a/netbox/utilities/filters.py b/netbox/utilities/filters.py index 1fb048db4..18161d465 100644 --- a/netbox/utilities/filters.py +++ b/netbox/utilities/filters.py @@ -1,14 +1,6 @@ -import itertools - import django_filters -from django import forms -from django.utils.encoding import force_text -# -# Filters -# - class NumericInFilter(django_filters.BaseInFilter, django_filters.NumberFilter): """ Filters for a set of numeric values. Example: id__in=100,200,300 @@ -27,42 +19,3 @@ class NullableCharFieldFilter(django_filters.CharFilter): return super(NullableCharFieldFilter, self).filter(qs, value) qs = self.get_method(qs)(**{'{}__isnull'.format(self.name): True}) return qs.distinct() if self.distinct else qs - - -class NullableModelMultipleChoiceField(forms.ModelMultipleChoiceField): - """ - This field operates like a normal ModelMultipleChoiceField except that it allows for one additional choice which is - used to represent a value of Null. This is accomplished by creating a new iterator which first yields the null - choice before entering the queryset iterator, and by ignoring the null choice during cleaning. The effect is similar - to defining a MultipleChoiceField with: - - choices = [(0, 'None')] + [(x.id, x) for x in Foo.objects.all()] - - However, the above approach forces immediate evaluation of the queryset, which can cause issues when calculating - database migrations. - """ - iterator = forms.models.ModelChoiceIterator - - def __init__(self, null_value=0, null_label='-- None --', *args, **kwargs): - self.null_value = null_value - self.null_label = null_label - super(NullableModelMultipleChoiceField, self).__init__(*args, **kwargs) - - def _get_choices(self): - if hasattr(self, '_choices'): - return self._choices - # Prepend the null choice to the queryset iterator - return itertools.chain( - [(self.null_value, self.null_label)], - self.iterator(self), - ) - choices = property(_get_choices, forms.ChoiceField._set_choices) - - def clean(self, value): - # Strip all instances of the null value before cleaning - if value is not None: - stripped_value = [x for x in value if x != force_text(self.null_value)] - else: - stripped_value = value - super(NullableModelMultipleChoiceField, self).clean(stripped_value) - return value From 338ce737c8c01d536e8b05d514b458162d0aaaa0 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Nov 2018 15:39:38 -0500 Subject: [PATCH 126/191] Removed deprecated expand_numeric_pattern() --- netbox/utilities/forms.py | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index 90b3c9e4f..baa035aa7 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -62,22 +62,6 @@ def parse_numeric_range(string, base=10): return list(set(values)) -def expand_numeric_pattern(string): - """ - Expand a numeric pattern into a list of strings. Examples: - 'ge-0/0/[0-3,5]' => ['ge-0/0/0', 'ge-0/0/1', 'ge-0/0/2', 'ge-0/0/3', 'ge-0/0/5'] - 'xe-0/[0,2-3]/[0-7]' => ['xe-0/0/0', 'xe-0/0/1', 'xe-0/0/2', ... 'xe-0/3/5', 'xe-0/3/6', 'xe-0/3/7'] - """ - lead, pattern, remnant = re.split(NUMERIC_EXPANSION_PATTERN, string, maxsplit=1) - parsed_range = parse_numeric_range(pattern) - for i in parsed_range: - if re.search(NUMERIC_EXPANSION_PATTERN, remnant): - for string in expand_numeric_pattern(remnant): - yield "{}{}{}".format(lead, i, string) - else: - yield "{}{}{}".format(lead, i, remnant) - - def parse_alphanumeric_range(string): """ Expand an alphanumeric range (continuous or not) into a list. @@ -120,7 +104,7 @@ def expand_alphanumeric_pattern(string): def expand_ipaddress_pattern(string, family): """ Expand an IP address pattern into a list of strings. Examples: - '192.0.2.[1,2,100-250,254]/24' => ['192.0.2.1/24', '192.0.2.2/24', '192.0.2.100/24' ... '192.0.2.250/24', '192.0.2.254/24'] + '192.0.2.[1,2,100-250]/24' => ['192.0.2.1/24', '192.0.2.2/24', '192.0.2.100/24' ... '192.0.2.250/24'] '2001:db8:0:[0,fd-ff]::/64' => ['2001:db8:0:0::/64', '2001:db8:0:fd::/64', ... '2001:db8:0:ff::/64'] """ if family not in [4, 6]: From e806b58ac9709d722b735a759eef7ad29f0f6571 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Nov 2018 15:58:55 -0500 Subject: [PATCH 127/191] Release v2.5-beta1 --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb7a0f269..29cf5996a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -v2.5.0 (FUTURE) +v2.5-beta1 (2018-11-06) + +## BETA RELEASE + +**This is a beta release.** It is intended solely for gathering community and developer feedback in preparation for the v2.5 release. Do not run it in production, and do not give it write access to your production database. As the database schema is subject to change during the beta period, a migration path to the stable release likely will not be provided. Do not commit any data which you are not willing to lose. ## Notes @@ -16,7 +20,7 @@ Django 2.1 introduces view permissions for object types (not to be confused with ## New Features -### Patch Panels and Cables ([#81](https://github.com/digitalocean/netbox/issues/20)) +### Patch Panels and Cables ([#20](https://github.com/digitalocean/netbox/issues/20)) NetBox now supports modeling physical cables for console, power, and interface connections. The new pass-through port component type has also been introduced to model patch panels and similar devices. From f61cea695bde0ac8b889261ba5881936ca55ce03 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Nov 2018 15:59:46 -0500 Subject: [PATCH 128/191] Release v2.5-beta1 --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 12910650d..67ad50655 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -21,7 +21,7 @@ except ImportError: "Configuration file is not present. Please define netbox/netbox/configuration.py per the documentation." ) -VERSION = '2.5.0-dev' +VERSION = '2.5-beta1' BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) From c063961e4adf9aa3145a0d6f59ed4b56211fcbc8 Mon Sep 17 00:00:00 2001 From: mmahacek Date: Wed, 7 Nov 2018 07:36:04 -0800 Subject: [PATCH 129/191] Add Cable count to home page (#2556) * Add stats.cable_count * Add Cable count to home page --- netbox/netbox/views.py | 4 +++- netbox/templates/home.html | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index 3ec3c7e42..bfdeb8c28 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -14,7 +14,7 @@ from dcim.filters import ( DeviceFilter, DeviceTypeFilter, RackFilter, RackGroupFilter, SiteFilter, VirtualChassisFilter ) from dcim.models import ( - ConsolePort, Device, DeviceType, Interface, PowerPort, Rack, RackGroup, Site, VirtualChassis + Cable, ConsolePort, Device, DeviceType, Interface, PowerPort, Rack, RackGroup, Site, VirtualChassis ) from dcim.tables import ( DeviceDetailTable, DeviceTypeTable, RackTable, RackGroupTable, SiteTable, VirtualChassisTable @@ -166,6 +166,7 @@ class HomeView(View): _connected_interface__isnull=False, pk__lt=F('_connected_interface') ) + cables = Cable.objects.all() stats = { @@ -177,6 +178,7 @@ class HomeView(View): 'rack_count': Rack.objects.count(), 'device_count': Device.objects.count(), 'interface_connections_count': connected_interfaces.count(), + 'cable_count': cables.count(), 'console_connections_count': connected_consoleports.count(), 'power_connections_count': connected_powerports.count(), diff --git a/netbox/templates/home.html b/netbox/templates/home.html index d6af56458..76d90bad7 100644 --- a/netbox/templates/home.html +++ b/netbox/templates/home.html @@ -39,6 +39,8 @@

      Connections

      + {{ stats.cable_count }} +

      Cables

      {{ stats.interface_connections_count }}

      Interfaces

      {{ stats.console_connections_count }} From d4e266d48c22b5df45b9270b880da9447bcc219e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 7 Nov 2018 15:49:45 -0500 Subject: [PATCH 130/191] Fixes #2563: Enable export templates for cables --- netbox/extras/constants.py | 2 +- netbox/extras/migrations/0016_exporttemplate_add_cable.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/extras/constants.py b/netbox/extras/constants.py index 5c7939e68..51fc398f7 100644 --- a/netbox/extras/constants.py +++ b/netbox/extras/constants.py @@ -49,7 +49,7 @@ GRAPH_TYPE_CHOICES = ( EXPORTTEMPLATE_MODELS = [ 'provider', 'circuit', # Circuits 'site', 'region', 'rack', 'rackgroup', 'manufacturer', 'devicetype', 'device', # DCIM - 'consoleport', 'powerport', 'interface', 'virtualchassis', # DCIM + 'consoleport', 'powerport', 'interface', 'cable', 'virtualchassis', # DCIM 'aggregate', 'prefix', 'ipaddress', 'vlan', 'vrf', 'service', # IPAM 'secret', # Secrets 'tenant', # Tenancy diff --git a/netbox/extras/migrations/0016_exporttemplate_add_cable.py b/netbox/extras/migrations/0016_exporttemplate_add_cable.py index b7c158e0e..3b8852f44 100644 --- a/netbox/extras/migrations/0016_exporttemplate_add_cable.py +++ b/netbox/extras/migrations/0016_exporttemplate_add_cable.py @@ -1,4 +1,4 @@ -# Generated by Django 2.0.9 on 2018-11-01 18:39 +# Generated by Django 2.1.3 on 2018-11-07 20:46 from django.db import migrations, models import django.db.models.deletion @@ -14,6 +14,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='exporttemplate', name='content_type', - field=models.ForeignKey(limit_choices_to={'model__in': ['provider', 'circuit', 'site', 'region', 'rack', 'rackgroup', 'manufacturer', 'devicetype', 'device', 'consoleport', 'powerport', 'interface', 'virtualchassis', 'aggregate', 'prefix', 'ipaddress', 'vlan', 'vrf', 'service', 'secret', 'tenant', 'cluster', 'virtualmachine']}, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'), + field=models.ForeignKey(limit_choices_to={'model__in': ['provider', 'circuit', 'site', 'region', 'rack', 'rackgroup', 'manufacturer', 'devicetype', 'device', 'consoleport', 'powerport', 'interface', 'cable', 'virtualchassis', 'aggregate', 'prefix', 'ipaddress', 'vlan', 'vrf', 'service', 'secret', 'tenant', 'cluster', 'virtualmachine']}, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'), ), ] From 1e36a884fa94ada1287b004ba517dc82b96175a4 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 8 Nov 2018 09:11:28 -0500 Subject: [PATCH 131/191] Changelog for #2563 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29cf5996a..77150c67f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -v2.5-beta1 (2018-11-06) +v2.5-beta2 (FUTURE) ## BETA RELEASE @@ -37,6 +37,10 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#2292](https://github.com/digitalocean/netbox/issues/2292) - Removed the deprecated UserAction model * [#2367](https://github.com/digitalocean/netbox/issues/2367) - Removed deprecated RPCClient functionality +## Bug Fixes (from v2.5-beta1) + +* [#2563](https://github.com/digitalocean/netbox/issues/2563) - Enable export templates for cables + ## API Changes * The `/extras/recent-activity/` endpoint (replaced by change logging in v2.4) has been removed From 0dee55885b7186094e3eef5f7c32736acd356259 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 8 Nov 2018 09:51:13 -0500 Subject: [PATCH 132/191] Fixes #2567: Introduced proxy models to represent console/power/interface connections --- CHANGELOG.md | 1 + netbox/dcim/models.py | 137 +++++++++++++++++++++++++++++++++++++++--- netbox/dcim/tables.py | 59 +++++++++--------- netbox/dcim/views.py | 15 ++--- 4 files changed, 170 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77150c67f..9ddf38c0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ NetBox now supports modeling physical cables for console, power, and interface c ## Bug Fixes (from v2.5-beta1) * [#2563](https://github.com/digitalocean/netbox/issues/2563) - Enable export templates for cables +* [#2567](https://github.com/digitalocean/netbox/issues/2567) - Introduced proxy models to represent console/power/interface connections ## API Changes diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index be1aca7f0..e9eb80276 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1698,7 +1698,7 @@ class ConsolePort(CableTermination, ComponentModel): objects = DeviceComponentManager() tags = TaggableManager() - csv_headers = ['console_server', 'connected_endpoint', 'device', 'console_port', 'connection_status'] + csv_headers = ['device', 'name'] class Meta: ordering = ['device', 'name'] @@ -1712,11 +1712,8 @@ class ConsolePort(CableTermination, ComponentModel): def to_csv(self): return ( - self.connected_endpoint.device.identifier if self.connected_endpoint else None, - self.connected_endpoint.name if self.connected_endpoint else None, self.device.identifier, self.name, - self.get_connection_status_display(), ) @@ -1740,6 +1737,8 @@ class ConsoleServerPort(CableTermination, ComponentModel): objects = DeviceComponentManager() tags = TaggableManager() + csv_headers = ['device', 'name'] + class Meta: unique_together = ['device', 'name'] @@ -1749,6 +1748,12 @@ class ConsoleServerPort(CableTermination, ComponentModel): def get_absolute_url(self): return self.device.get_absolute_url() + def to_csv(self): + return ( + self.device.identifier, + self.name, + ) + # # Power ports @@ -1781,7 +1786,7 @@ class PowerPort(CableTermination, ComponentModel): objects = DeviceComponentManager() tags = TaggableManager() - csv_headers = ['pdu', 'connected_endpoint', 'device', 'power_port', 'connection_status'] + csv_headers = ['device', 'name'] class Meta: ordering = ['device', 'name'] @@ -1795,11 +1800,8 @@ class PowerPort(CableTermination, ComponentModel): def to_csv(self): return ( - self.connected_endpoint.device.identifier if self.connected_endpoint else None, - self.connected_endpoint.name if self.connected_endpoint else None, self.device.identifier, self.name, - self.get_connection_status_display(), ) @@ -1823,6 +1825,8 @@ class PowerOutlet(CableTermination, ComponentModel): objects = DeviceComponentManager() tags = TaggableManager() + csv_headers = ['device', 'name'] + class Meta: unique_together = ['device', 'name'] @@ -1832,6 +1836,12 @@ class PowerOutlet(CableTermination, ComponentModel): def get_absolute_url(self): return self.device.get_absolute_url() + def to_csv(self): + return ( + self.device.identifier, + self.name, + ) + # # Interfaces @@ -1935,6 +1945,11 @@ class Interface(CableTermination, ComponentModel): objects = InterfaceManager() tags = TaggableManager() + csv_headers = [ + 'device', 'virtual_machine', 'name', 'lag', 'form_factor', 'enabled', 'mac_address', 'mtu', 'mgmt_only', + 'description', 'mode', + ] + class Meta: ordering = ['device', 'name'] unique_together = ['device', 'name'] @@ -1945,6 +1960,21 @@ class Interface(CableTermination, ComponentModel): def get_absolute_url(self): return reverse('dcim:interface', kwargs={'pk': self.pk}) + def to_csv(self): + return ( + self.device.identifier if self.device else None, + self.virtual_machine.name if self.virtual_machine else None, + self.name, + self.lag.name if self.lag else None, + self.get_form_factor_display(), + self.enabled, + self.mac_address, + self.mtu, + self.mgmt_only, + self.description, + self.get_mode_display(), + ) + def clean(self): # An Interface must belong to a Device *or* to a VirtualMachine @@ -2112,6 +2142,8 @@ class FrontPort(CableTermination, ComponentModel): objects = DeviceComponentManager() tags = TaggableManager() + csv_headers = ['device', 'name', 'type', 'rear_port', 'rear_port_position'] + class Meta: ordering = ['device', 'name'] unique_together = [ @@ -2122,6 +2154,15 @@ class FrontPort(CableTermination, ComponentModel): def __str__(self): return self.name + def to_csv(self): + return ( + self.device.identifier, + self.name, + self.get_type_display(), + self.rear_port.name, + self.rear_port_position, + ) + def clean(self): # Validate rear port assignment @@ -2162,6 +2203,8 @@ class RearPort(CableTermination, ComponentModel): objects = DeviceComponentManager() tags = TaggableManager() + csv_headers = ['device', 'name', 'type', 'positions'] + class Meta: ordering = ['device', 'name'] unique_together = ['device', 'name'] @@ -2169,6 +2212,14 @@ class RearPort(CableTermination, ComponentModel): def __str__(self): return self.name + def to_csv(self): + return ( + self.device.identifier, + self.name, + self.get_type_display(), + self.positions, + ) + # # Device bays @@ -2198,6 +2249,8 @@ class DeviceBay(ComponentModel): objects = DeviceComponentManager() tags = TaggableManager() + csv_headers = ['device', 'name', 'installed_device'] + class Meta: ordering = ['device', 'name'] unique_together = ['device', 'name'] @@ -2208,6 +2261,13 @@ class DeviceBay(ComponentModel): def get_absolute_url(self): return self.device.get_absolute_url() + def to_csv(self): + return ( + self.device.identifier, + self.name, + self.installed_device.identifier if self.installed_device else None, + ) + def clean(self): # Validate that the parent Device can have DeviceBays @@ -2535,3 +2595,64 @@ class Cable(ChangeLoggedModel): return trace_cable(far_end, position) return trace_cable(self.termination_a), trace_cable(self.termination_b) + + +# +# Connection proxy models +# + +class ConsoleConnection(ConsolePort): + + csv_headers = [ + 'console_server', 'port', 'device', 'console_port', 'connection_status', + ] + + class Meta: + proxy = True + + def to_csv(self): + return ( + self.connected_endpoint.device.identifier if self.connected_endpoint else None, + self.connected_endpoint.name if self.connected_endpoint else None, + self.device.identifier, + self.name, + self.get_connection_status_display(), + ) + + +class PowerConnection(PowerPort): + + csv_headers = [ + 'pdu', 'outlet', 'device', 'power_port', 'connection_status', + ] + + class Meta: + proxy = True + + def to_csv(self): + return ( + self.connected_endpoint.device.identifier if self.connected_endpoint else None, + self.connected_endpoint.name if self.connected_endpoint else None, + self.device.identifier, + self.name, + self.get_connection_status_display(), + ) + + +class InterfaceConnection(Interface): + + csv_headers = [ + 'device_a', 'interface_a', 'device_b', 'interface_b', 'connection_status', + ] + + class Meta: + proxy = True + + def to_csv(self): + return ( + self.connected_endpoint.device.identifier if self.connected_endpoint else None, + self.connected_endpoint.name if self.connected_endpoint else None, + self.device.identifier, + self.name, + self.get_connection_status_display(), + ) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 361bfcebd..6402958c2 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -4,10 +4,11 @@ from django_tables2.utils import Accessor from tenancy.tables import COL_TENANT from utilities.tables import BaseTable, BooleanColumn, ColorColumn, ToggleColumn from .models import ( - Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, - InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RearPort, RearPortTemplate, Region, Site, VirtualChassis, + Cable, ConsoleConnection, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, + DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceConnection, + InterfaceTemplate, InventoryItem, Manufacturer, Platform, PowerConnection, PowerOutlet, PowerOutletTemplate, + PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, RearPort, RearPortTemplate, Region, Site, + VirtualChassis, ) REGION_LINK = """ @@ -668,19 +669,22 @@ class ConsoleConnectionTable(BaseTable): viewname='dcim:device', accessor=Accessor('connected_endpoint.device'), args=[Accessor('connected_endpoint.device.pk')], - verbose_name='Console server' + verbose_name='Console Server' ) - connected_endpoint = tables.Column(verbose_name='Port') - device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device') - name = tables.Column(verbose_name='Console port') - cable = tables.LinkColumn( - viewname='dcim:cable', - args=[Accessor('cable.pk')] + connected_endpoint = tables.Column( + verbose_name='Port' + ) + device = tables.LinkColumn( + viewname='dcim:device', + args=[Accessor('device.pk')] + ) + name = tables.Column( + verbose_name='Console Port' ) class Meta(BaseTable.Meta): - model = ConsolePort - fields = ('console_server', 'connected_endpoint', 'device', 'name', 'cable') + model = ConsoleConnection + fields = ('console_server', 'connected_endpoint', 'device', 'name', 'connection_status') class PowerConnectionTable(BaseTable): @@ -690,17 +694,20 @@ class PowerConnectionTable(BaseTable): args=[Accessor('connected_endpoint.device.pk')], verbose_name='PDU' ) - connected_endpoint = tables.Column(verbose_name='Outlet') - device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device') - name = tables.Column(verbose_name='Power Port') - cable = tables.LinkColumn( - viewname='dcim:cable', - args=[Accessor('cable.pk')] + connected_endpoint = tables.Column( + verbose_name='Outlet' + ) + device = tables.LinkColumn( + viewname='dcim:device', + args=[Accessor('device.pk')] + ) + name = tables.Column( + verbose_name='Power Port' ) class Meta(BaseTable.Meta): - model = PowerPort - fields = ('pdu', 'connected_endpoint', 'device', 'name', 'cable') + model = PowerConnection + fields = ('pdu', 'connected_endpoint', 'device', 'name', 'connection_status') class InterfaceConnectionTable(BaseTable): @@ -736,14 +743,12 @@ class InterfaceConnectionTable(BaseTable): accessor=Accessor('connected_endpoint.description'), verbose_name='Description' ) - cable = tables.LinkColumn( - viewname='dcim:cable', - args=[Accessor('cable.pk')] - ) class Meta(BaseTable.Meta): - model = Interface - fields = ('device_a', 'interface_a', 'description_a', 'device_b', 'interface_b', 'description_b', 'cable') + model = InterfaceConnection + fields = ( + 'device_a', 'interface_a', 'description_a', 'device_b', 'interface_b', 'description_b', 'connection_status', + ) # diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index c67962f01..d61cd8bd5 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -24,10 +24,11 @@ from utilities.views import ( from virtualization.models import VirtualMachine from . import filters, forms, tables from .models import ( - Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, - Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, + Cable, ConsoleConnection, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, + DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceConnection, + InterfaceTemplate, InventoryItem, Manufacturer, Platform, PowerConnection, PowerOutlet, PowerOutletTemplate, + PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, + VirtualChassis, ) @@ -1686,7 +1687,7 @@ class CableBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # class ConsoleConnectionsListView(ObjectListView): - queryset = ConsolePort.objects.select_related( + queryset = ConsoleConnection.objects.select_related( 'device', 'connected_endpoint__device' ).filter( connected_endpoint__isnull=False @@ -1700,7 +1701,7 @@ class ConsoleConnectionsListView(ObjectListView): class PowerConnectionsListView(ObjectListView): - queryset = PowerPort.objects.select_related( + queryset = PowerConnection.objects.select_related( 'device', 'connected_endpoint__device' ).filter( connected_endpoint__isnull=False @@ -1714,7 +1715,7 @@ class PowerConnectionsListView(ObjectListView): class InterfaceConnectionsListView(ObjectListView): - queryset = Interface.objects.select_related( + queryset = InterfaceConnection.objects.select_related( 'device', 'cable', '_connected_interface__device' ).filter( # Avoid duplicate connections by only selecting the lower PK in a connected pair From 4b5181d640ebe1b2b6d9521eabe5a36296dc81f9 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 8 Nov 2018 10:40:17 -0500 Subject: [PATCH 133/191] Fixes #2566: Prevent both ends of a cable from connecting to the same termination point --- CHANGELOG.md | 1 + netbox/dcim/models.py | 5 +++++ netbox/project-static/js/livesearch.js | 1 - 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ddf38c0c..8eaff04c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ NetBox now supports modeling physical cables for console, power, and interface c ## Bug Fixes (from v2.5-beta1) * [#2563](https://github.com/digitalocean/netbox/issues/2563) - Enable export templates for cables +* [#2566](https://github.com/digitalocean/netbox/issues/2566) - Prevent both ends of a cable from connecting to the same termination point * [#2567](https://github.com/digitalocean/netbox/issues/2567) - Introduced proxy models to represent console/power/interface connections ## API Changes diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index e9eb80276..22a830123 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2516,6 +2516,11 @@ class Cable(ChangeLoggedModel): self.termination_a_type, self.termination_b_type )) + # A termination point cannot be connected to itself + if self.termination_a == self.termination_b: + print("Validation failed: same interface") + raise ValidationError("Cannot connect {} to itself".format(self.termination_a_type)) + # Check for an existing Cable connected to either termination object if self.termination_a.cable not in (None, self): raise ValidationError("{} already has a cable attached (#{})".format( diff --git a/netbox/project-static/js/livesearch.js b/netbox/project-static/js/livesearch.js index e00aefbaf..6df1f23ef 100644 --- a/netbox/project-static/js/livesearch.js +++ b/netbox/project-static/js/livesearch.js @@ -42,7 +42,6 @@ $(document).ready(function() { event.preventDefault(); search_field.val(ui.item.label); select_fields.val(''); - select_fields.attr('disabled', 'disabled'); real_field.empty(); real_field.append($("").attr('value', ui.item.value).text(ui.item.label)); real_field.change(); From a228f1e1c281d8acba781e6bb6eb3faf1c701420 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 8 Nov 2018 10:49:26 -0500 Subject: [PATCH 134/191] Closes #2569: Added LSH fiber type; removed SC duplex/simplex designations --- CHANGELOG.md | 3 ++- netbox/dcim/constants.py | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8eaff04c2..d40cc01fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,11 +37,12 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#2292](https://github.com/digitalocean/netbox/issues/2292) - Removed the deprecated UserAction model * [#2367](https://github.com/digitalocean/netbox/issues/2367) - Removed deprecated RPCClient functionality -## Bug Fixes (from v2.5-beta1) +## Changes From v2.5-beta1 * [#2563](https://github.com/digitalocean/netbox/issues/2563) - Enable export templates for cables * [#2566](https://github.com/digitalocean/netbox/issues/2566) - Prevent both ends of a cable from connecting to the same termination point * [#2567](https://github.com/digitalocean/netbox/issues/2567) - Introduced proxy models to represent console/power/interface connections +* [#2569](https://github.com/digitalocean/netbox/issues/2569) - Added LSH fiber type; removed SC duplex/simplex designations ## API Changes diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index 161055879..36b225ca1 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -226,12 +226,12 @@ IFACE_MODE_CHOICES = [ # Pass-through port types PORT_TYPE_8P8C = 1000 PORT_TYPE_ST = 2000 -PORT_TYPE_SC_SIMPLEX = 2100 -PORT_TYPE_SC_DUPLEX = 2110 +PORT_TYPE_SC = 2100 PORT_TYPE_FC = 2200 PORT_TYPE_LC = 2300 PORT_TYPE_MTRJ = 2400 PORT_TYPE_MPO = 2500 +PORT_TYPE_LSH = 2600 PORT_TYPE_CHOICES = [ [ 'Copper', @@ -242,13 +242,13 @@ PORT_TYPE_CHOICES = [ [ 'Fiber Optic', [ - [PORT_TYPE_ST, 'ST'], - [PORT_TYPE_SC_SIMPLEX, 'SC (Simplex)'], - [PORT_TYPE_SC_DUPLEX, 'SC (Duplex)'], [PORT_TYPE_FC, 'FC'], [PORT_TYPE_LC, 'LC'], - [PORT_TYPE_MTRJ, 'MTRJ'], + [PORT_TYPE_LSH, 'LSH'], [PORT_TYPE_MPO, 'MPO'], + [PORT_TYPE_MTRJ, 'MTRJ'], + [PORT_TYPE_SC, 'SC'], + [PORT_TYPE_ST, 'ST'], ] ] ] From 21fd889810ca44bf26e8f7fba547405d4b71ae37 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 8 Nov 2018 11:11:52 -0500 Subject: [PATCH 135/191] Fix regression from #2566 --- netbox/project-static/js/livesearch.js | 1 + 1 file changed, 1 insertion(+) diff --git a/netbox/project-static/js/livesearch.js b/netbox/project-static/js/livesearch.js index 6df1f23ef..e39f17aa2 100644 --- a/netbox/project-static/js/livesearch.js +++ b/netbox/project-static/js/livesearch.js @@ -43,6 +43,7 @@ $(document).ready(function() { search_field.val(ui.item.label); select_fields.val(''); real_field.empty(); + select_fields.attr('disabled', 'disabled'); real_field.append($("").attr('value', ui.item.value).text(ui.item.label)); real_field.change(); // Disable parent selection fields From bb5432de7d6d37ae03e801aba23125800cd7751a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 8 Nov 2018 11:13:03 -0500 Subject: [PATCH 136/191] PEP8 fix --- netbox/utilities/templatetags/helpers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py index 9fcbf2edd..e7bc40846 100644 --- a/netbox/utilities/templatetags/helpers.py +++ b/netbox/utilities/templatetags/helpers.py @@ -22,6 +22,7 @@ def oneline(value): """ return value.replace('\n', ' ') + @register.filter() def placeholder(value): """ From 3e92aa9fe778509f8c653c4f1a8ab293c569e597 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 8 Nov 2018 12:15:56 -0500 Subject: [PATCH 137/191] Fixes #2571: Enforce deletion of attached cable when deleting a termination point --- CHANGELOG.md | 1 + netbox/dcim/models.py | 12 ++++++++ netbox/dcim/signals.py | 10 ++++--- netbox/dcim/tests/test_models.py | 51 ++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d40cc01fd..49fdc6b04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#2566](https://github.com/digitalocean/netbox/issues/2566) - Prevent both ends of a cable from connecting to the same termination point * [#2567](https://github.com/digitalocean/netbox/issues/2567) - Introduced proxy models to represent console/power/interface connections * [#2569](https://github.com/digitalocean/netbox/issues/2569) - Added LSH fiber type; removed SC duplex/simplex designations +* [#2571](https://github.com/digitalocean/netbox/issues/2571) - Enforce deletion of attached cable when deleting a termination point ## API Changes diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 22a830123..d3c18d7e2 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -73,6 +73,18 @@ class CableTermination(models.Model): null=True ) + # Generic relations to Cable. These ensure that an attached Cable is deleted if the terminated object is deleted. + _cabled_as_a = GenericRelation( + to='dcim.Cable', + content_type_field='termination_a_type', + object_id_field='termination_a_id' + ) + _cabled_as_b = GenericRelation( + to='dcim.Cable', + content_type_field='termination_b_type', + object_id_field='termination_b_id' + ) + class Meta: abstract = True diff --git a/netbox/dcim/signals.py b/netbox/dcim/signals.py index b37c34226..0bb6690b4 100644 --- a/netbox/dcim/signals.py +++ b/netbox/dcim/signals.py @@ -45,10 +45,12 @@ def update_connected_endpoints(instance, **kwargs): def nullify_connected_endpoints(instance, **kwargs): # Disassociate the Cable from its termination points - instance.termination_a.cable = None - instance.termination_a.save() - instance.termination_b.cable = None - instance.termination_b.save() + if instance.termination_a is not None: + instance.termination_a.cable = None + instance.termination_a.save() + if instance.termination_b is not None: + instance.termination_b.cable = None + instance.termination_b.save() # If this Cable was part of a complete path, tear it down endpoint_a, endpoint_b = instance.get_path_endpoints() diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py index 012c7d121..d2072812c 100644 --- a/netbox/dcim/tests/test_models.py +++ b/netbox/dcim/tests/test_models.py @@ -149,3 +149,54 @@ class RackTestCase(TestCase): face=None, ) self.assertTrue(pdu) + + +class CableTestCase(TestCase): + + def setUp(self): + + site = Site.objects.create(name='Test Site 1', slug='test-site-1') + manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1') + devicetype = DeviceType.objects.create( + manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1' + ) + devicerole = DeviceRole.objects.create( + name='Test Device Role 1', slug='test-device-role-1', color='ff0000' + ) + self.device1 = Device.objects.create( + device_type=devicetype, device_role=devicerole, name='TestDevice1', site=site + ) + self.device2 = Device.objects.create( + device_type=devicetype, device_role=devicerole, name='TestDevice2', site=site + ) + self.interface1 = Interface.objects.create(device=self.device1, name='eth0') + self.interface2 = Interface.objects.create(device=self.device2, name='eth0') + self.cable = Cable(termination_a=self.interface1, termination_b=self.interface2) + self.cable.save() + + def test_cable_creation(self): + """ + When a new Cable is created, it must be cached on either termination point. + """ + interface1 = Interface.objects.get(pk=self.interface1.pk) + self.assertEqual(self.cable.termination_a, interface1) + interface2 = Interface.objects.get(pk=self.interface2.pk) + self.assertEqual(self.cable.termination_b, interface2) + + def test_cable_deletion(self): + """ + When a Cable is deleted, the `cable` field on its termination points must be nullified. + """ + self.cable.delete() + interface1 = Interface.objects.get(pk=self.interface1.pk) + self.assertIsNone(interface1.cable) + interface2 = Interface.objects.get(pk=self.interface2.pk) + self.assertIsNone(interface2.cable) + + def test_cabletermination_deletion(self): + """ + When a CableTermination object is deleted, its attached Cable (if any) must also be deleted. + """ + self.interface1.delete() + cable = Cable.objects.filter(pk=self.cable.pk).first() + self.assertIsNone(cable) From 30f8fb4c110c10b977a8e979f1d92c7f1ad982da Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 8 Nov 2018 12:27:15 -0500 Subject: [PATCH 138/191] Fixes #2572: Add button to disconnect cable from circuit termination --- CHANGELOG.md | 1 + netbox/templates/circuits/inc/circuit_termination.html | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49fdc6b04..c8a762249 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#2567](https://github.com/digitalocean/netbox/issues/2567) - Introduced proxy models to represent console/power/interface connections * [#2569](https://github.com/digitalocean/netbox/issues/2569) - Added LSH fiber type; removed SC duplex/simplex designations * [#2571](https://github.com/digitalocean/netbox/issues/2571) - Enforce deletion of attached cable when deleting a termination point +* [#2572](https://github.com/digitalocean/netbox/issues/2572) - Add button to disconnect cable from circuit termination ## API Changes diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html index eba00d2fd..a3cb09b25 100644 --- a/netbox/templates/circuits/inc/circuit_termination.html +++ b/netbox/templates/circuits/inc/circuit_termination.html @@ -40,13 +40,20 @@ Termination {% if termination.cable %} + {% if perms.dcim.delete_cable %} +
      + + Disconnect + +
      + {% endif %} {{ termination.cable }} {% if termination.connected_endpoint %} to {{ termination.connected_endpoint.device }} {{ termination.connected_endpoint }} {% endif %} {% else %} - {% if perms.circuits.change_circuittermination %} + {% if perms.circuits.add_cable %}
      Connect From 788847edaaeca0eb1f7b62cb60c712ded56571f5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 8 Nov 2018 15:04:34 -0500 Subject: [PATCH 139/191] Fixes #2573: Fix bulk console/power/interface disconnections --- CHANGELOG.md | 1 + netbox/dcim/urls.py | 6 +-- netbox/dcim/views.py | 49 +++++++++------------- netbox/templates/dcim/bulk_disconnect.html | 2 +- netbox/templates/dcim/device.html | 6 +-- 5 files changed, 27 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8a762249..d46f2f3c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#2569](https://github.com/digitalocean/netbox/issues/2569) - Added LSH fiber type; removed SC duplex/simplex designations * [#2571](https://github.com/digitalocean/netbox/issues/2571) - Enforce deletion of attached cable when deleting a termination point * [#2572](https://github.com/digitalocean/netbox/issues/2572) - Add button to disconnect cable from circuit termination +* [#2573](https://github.com/digitalocean/netbox/issues/2573) - Fix bulk console/power/interface disconnections ## API Changes diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 982d8de94..da9be6f72 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -169,13 +169,13 @@ urlpatterns = [ # Console server ports url(r'^devices/console-server-ports/add/$', views.DeviceBulkAddConsoleServerPortView.as_view(), name='device_bulk_add_consoleserverport'), url(r'^devices/(?P\d+)/console-server-ports/add/$', views.ConsoleServerPortCreateView.as_view(), name='consoleserverport_add'), - url(r'^devices/(?P\d+)/console-server-ports/disconnect/$', views.ConsoleServerPortBulkDisconnectView.as_view(), name='consoleserverport_bulk_disconnect'), url(r'^devices/(?P\d+)/console-server-ports/delete/$', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'), url(r'^console-server-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'termination_a_type': ConsoleServerPort}), url(r'^console-server-ports/(?P\d+)/edit/$', views.ConsoleServerPortEditView.as_view(), name='consoleserverport_edit'), url(r'^console-server-ports/(?P\d+)/delete/$', views.ConsoleServerPortDeleteView.as_view(), name='consoleserverport_delete'), url(r'^console-server-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='consoleserverport_trace', kwargs={'model': ConsoleServerPort}), url(r'^console-server-ports/rename/$', views.ConsoleServerPortBulkRenameView.as_view(), name='consoleserverport_bulk_rename'), + url(r'^console-server-ports/disconnect/$', views.ConsoleServerPortBulkDisconnectView.as_view(), name='consoleserverport_bulk_disconnect'), # Power ports url(r'^devices/power-ports/add/$', views.DeviceBulkAddPowerPortView.as_view(), name='device_bulk_add_powerport'), @@ -189,19 +189,18 @@ urlpatterns = [ # Power outlets url(r'^devices/power-outlets/add/$', views.DeviceBulkAddPowerOutletView.as_view(), name='device_bulk_add_poweroutlet'), url(r'^devices/(?P\d+)/power-outlets/add/$', views.PowerOutletCreateView.as_view(), name='poweroutlet_add'), - url(r'^devices/(?P\d+)/power-outlets/disconnect/$', views.PowerOutletBulkDisconnectView.as_view(), name='poweroutlet_bulk_disconnect'), url(r'^devices/(?P\d+)/power-outlets/delete/$', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'), url(r'^power-outlets/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'termination_a_type': PowerOutlet}), url(r'^power-outlets/(?P\d+)/edit/$', views.PowerOutletEditView.as_view(), name='poweroutlet_edit'), url(r'^power-outlets/(?P\d+)/delete/$', views.PowerOutletDeleteView.as_view(), name='poweroutlet_delete'), url(r'^power-outlets/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='poweroutlet_trace', kwargs={'model': PowerOutlet}), url(r'^power-outlets/rename/$', views.PowerOutletBulkRenameView.as_view(), name='poweroutlet_bulk_rename'), + url(r'^power-outlets/disconnect/$', views.PowerOutletBulkDisconnectView.as_view(), name='poweroutlet_bulk_disconnect'), # Interfaces url(r'^devices/interfaces/add/$', views.DeviceBulkAddInterfaceView.as_view(), name='device_bulk_add_interface'), url(r'^devices/(?P\d+)/interfaces/add/$', views.InterfaceCreateView.as_view(), name='interface_add'), url(r'^devices/(?P\d+)/interfaces/edit/$', views.InterfaceBulkEditView.as_view(), name='interface_bulk_edit'), - url(r'^devices/(?P\d+)/interfaces/disconnect/$', views.InterfaceBulkDisconnectView.as_view(), name='interface_bulk_disconnect'), url(r'^devices/(?P\d+)/interfaces/delete/$', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'), url(r'^interfaces/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='interface_connect', kwargs={'termination_a_type': Interface}), url(r'^interfaces/(?P\d+)/$', views.InterfaceView.as_view(), name='interface'), @@ -211,6 +210,7 @@ urlpatterns = [ url(r'^interfaces/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='interface_changelog', kwargs={'model': Interface}), url(r'^interfaces/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='interface_trace', kwargs={'model': Interface}), url(r'^interfaces/rename/$', views.InterfaceBulkRenameView.as_view(), name='interface_bulk_rename'), + url(r'^interfaces/disconnect/$', views.InterfaceBulkDisconnectView.as_view(), name='interface_bulk_disconnect'), # Front ports # url(r'^devices/front-ports/add/$', views.DeviceBulkAddFrontPortView.as_view(), name='device_bulk_add_frontport'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index d61cd8bd5..c24740471 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -74,7 +74,7 @@ class BulkRenameView(GetReturnURLMixin, View): }) -class BulkDisconnectView(View): +class BulkDisconnectView(GetReturnURLMixin, View): """ An extendable view for disconnection console/power/interface components in bulk. """ @@ -82,22 +82,30 @@ class BulkDisconnectView(View): form = None template_name = 'dcim/bulk_disconnect.html' - def disconnect_objects(self, objects): - raise NotImplementedError() + def post(self, request): - def post(self, request, pk): - - device = get_object_or_404(Device, pk=pk) selected_objects = [] + return_url = self.get_return_url(request) if '_confirm' in request.POST: form = self.form(request.POST) + if form.is_valid(): - count = self.disconnect_objects(form.cleaned_data['pk']) - messages.success(request, "Disconnected {} {} on {}".format( - count, self.model._meta.verbose_name_plural, device + + with transaction.atomic(): + + count = 0 + for obj in self.model.objects.filter(pk__in=form.cleaned_data['pk']): + if obj.cable is None: + continue + obj.cable.delete() + count += 1 + + messages.success(request, "Disconnected {} {}".format( + count, self.model._meta.verbose_name_plural )) - return redirect(device.get_absolute_url()) + + return redirect(return_url) else: form = self.form(initial={'pk': request.POST.getlist('pk')}) @@ -105,10 +113,9 @@ class BulkDisconnectView(View): return render(request, self.template_name, { 'form': form, - 'device': device, 'obj_type_plural': self.model._meta.verbose_name_plural, 'selected_objects': selected_objects, - 'return_url': device.get_absolute_url(), + 'return_url': return_url, }) @@ -1139,14 +1146,6 @@ class ConsoleServerPortBulkDisconnectView(PermissionRequiredMixin, BulkDisconnec model = ConsoleServerPort form = forms.ConsoleServerPortBulkDisconnectForm - def disconnect_objects(self, consoleserverports): - return ConsolePort.objects.filter( - connected_endpoint__in=consoleserverports - ).update( - connected_endpoint=None, - connection_status=None - ) - class ConsoleServerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_consoleserverport' @@ -1223,11 +1222,6 @@ class PowerOutletBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView) model = PowerOutlet form = forms.PowerOutletBulkDisconnectForm - def disconnect_objects(self, poweroutlets): - return PowerPort.objects.filter(connected_endpoint__in=poweroutlets).update( - connected_endpoint=None, connection_status=None - ) - class PowerOutletBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_poweroutlet' @@ -1308,11 +1302,6 @@ class InterfaceBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView): model = Interface form = forms.InterfaceBulkDisconnectForm - def disconnect_objects(self, interfaces): - return Interface.objects.filter(_connected_interface__in=interfaces).update( - _connected_interface=None, connection_status=None - ) - class InterfaceBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_interface' diff --git a/netbox/templates/dcim/bulk_disconnect.html b/netbox/templates/dcim/bulk_disconnect.html index 82cc86a7a..e82d880ad 100644 --- a/netbox/templates/dcim/bulk_disconnect.html +++ b/netbox/templates/dcim/bulk_disconnect.html @@ -4,7 +4,7 @@ {% block title %}Disconnect {{ obj_type_plural|bettertitle }}{% endblock %} {% block message %} -

      Are you sure you want to disconnect all {{ selected_objects|length }} of these {{ obj_type_plural }} on {{ device }}?

      +

      Are you sure you want to disconnect these {{ selected_objects|length }} {{ obj_type_plural }}?

      -

      - - {% if cable.label %}{{ cable.label }}{% else %}Cable #{{ cable.pk }}{% endif %} - -

      - {{ cable.get_status_display }}
      - {{ cable.get_type_display|default:"" }} - {% if cable.length %}- {{ cable.length }}{{ cable.length_unit }}{% endif %} -   + {% if cable %} +

      + + {% if cable.label %}{{ cable.label }}{% else %}Cable #{{ cable.pk }}{% endif %} + +

      + {{ cable.get_status_display }}
      + {{ cable.get_type_display|default:"" }} + {% if cable.length %}- {{ cable.length }}{{ cable.length_unit }}{% endif %} +   + {% else %} +

      No Cable

      + {% endif %}
      - {% include 'dcim/inc/cable_trace_end.html' with end=far_end %} + {% if far_end %} + {% include 'dcim/inc/cable_trace_end.html' with end=far_end %} + {% endif %}
      {% if not forloop.last %}
      {% endif %} From 75f0d8ee909b8113b97af0e1356c0e500366e3de Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 12 Nov 2018 11:36:44 -0500 Subject: [PATCH 144/191] Closes #2578: Reorganized nested serializers --- CHANGELOG.md | 1 + netbox/circuits/api/nested_serializers.py | 52 ++ netbox/circuits/api/serializers.py | 51 +- netbox/dcim/api/nested_serializers.py | 243 ++++++ netbox/dcim/api/serializers.py | 695 +++++------------- netbox/dcim/tests/test_api.py | 2 +- netbox/extras/api/nested_serializers.py | 23 + netbox/extras/api/serializers.py | 19 +- netbox/ipam/api/nested_serializers.py | 100 +++ netbox/ipam/api/serializers.py | 124 +--- netbox/secrets/api/nested_serializers.py | 16 + netbox/secrets/api/serializers.py | 19 +- netbox/tenancy/api/nested_serializers.py | 29 + netbox/tenancy/api/serializers.py | 26 +- netbox/users/api/nested_serializers.py | 18 + netbox/users/api/serializers.py | 10 +- .../virtualization/api/nested_serializers.py | 62 ++ netbox/virtualization/api/serializers.py | 99 +-- 18 files changed, 788 insertions(+), 801 deletions(-) create mode 100644 netbox/circuits/api/nested_serializers.py create mode 100644 netbox/dcim/api/nested_serializers.py create mode 100644 netbox/extras/api/nested_serializers.py create mode 100644 netbox/ipam/api/nested_serializers.py create mode 100644 netbox/secrets/api/nested_serializers.py create mode 100644 netbox/tenancy/api/nested_serializers.py create mode 100644 netbox/users/api/nested_serializers.py create mode 100644 netbox/virtualization/api/nested_serializers.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 63326838b..db325bb08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#2572](https://github.com/digitalocean/netbox/issues/2572) - Add button to disconnect cable from circuit termination * [#2573](https://github.com/digitalocean/netbox/issues/2573) - Fix bulk console/power/interface disconnections * [#2574](https://github.com/digitalocean/netbox/issues/2574) - Remove duplicate interface links from topology maps +* [#2578](https://github.com/digitalocean/netbox/issues/2578) - Reorganized nested serializers * [#2579](https://github.com/digitalocean/netbox/issues/2579) - Add missing cable disconnect buttons for front/rear ports ## API Changes diff --git a/netbox/circuits/api/nested_serializers.py b/netbox/circuits/api/nested_serializers.py new file mode 100644 index 000000000..211dc4007 --- /dev/null +++ b/netbox/circuits/api/nested_serializers.py @@ -0,0 +1,52 @@ +from rest_framework import serializers + +from circuits.models import Circuit, CircuitTermination, CircuitType, Provider +from utilities.api import WritableNestedSerializer + +__all__ = [ + 'NestedCircuitSerializer', + 'NestedCircuitTerminationSerializer', + 'NestedCircuitTypeSerializer', + 'NestedProviderSerializer', +] + + +# +# Providers +# + +class NestedProviderSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='circuits-api:provider-detail') + + class Meta: + model = Provider + fields = ['id', 'url', 'name', 'slug'] + + +# +# Circuits +# + +class NestedCircuitTypeSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittype-detail') + + class Meta: + model = CircuitType + fields = ['id', 'url', 'name', 'slug'] + + +class NestedCircuitSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuit-detail') + + class Meta: + model = Circuit + fields = ['id', 'url', 'cid'] + + +class NestedCircuitTerminationSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittermination-detail') + circuit = NestedCircuitSerializer() + + class Meta: + model = CircuitTermination + fields = ['id', 'url', 'circuit', 'term_side'] diff --git a/netbox/circuits/api/serializers.py b/netbox/circuits/api/serializers.py index da2bed53a..6ac2587c6 100644 --- a/netbox/circuits/api/serializers.py +++ b/netbox/circuits/api/serializers.py @@ -1,12 +1,12 @@ -from rest_framework import serializers from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField from circuits.constants import CIRCUIT_STATUS_CHOICES from circuits.models import Provider, Circuit, CircuitTermination, CircuitType -from dcim.api.serializers import NestedCableSerializer, NestedInterfaceSerializer, NestedSiteSerializer +from dcim.api.nested_serializers import NestedCableSerializer, NestedInterfaceSerializer, NestedSiteSerializer from extras.api.customfields import CustomFieldModelSerializer -from tenancy.api.serializers import NestedTenantSerializer -from utilities.api import ChoiceField, ValidatedModelSerializer, WritableNestedSerializer +from tenancy.api.nested_serializers import NestedTenantSerializer +from utilities.api import ChoiceField, ValidatedModelSerializer +from .nested_serializers import * # @@ -24,16 +24,8 @@ class ProviderSerializer(TaggitSerializer, CustomFieldModelSerializer): ] -class NestedProviderSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='circuits-api:provider-detail') - - class Meta: - model = Provider - fields = ['id', 'url', 'name', 'slug'] - - # -# Circuit types +# Circuits # class CircuitTypeSerializer(ValidatedModelSerializer): @@ -43,18 +35,6 @@ class CircuitTypeSerializer(ValidatedModelSerializer): fields = ['id', 'name', 'slug'] -class NestedCircuitTypeSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittype-detail') - - class Meta: - model = CircuitType - fields = ['id', 'url', 'name', 'slug'] - - -# -# Circuits -# - class CircuitSerializer(TaggitSerializer, CustomFieldModelSerializer): provider = NestedProviderSerializer() status = ChoiceField(choices=CIRCUIT_STATUS_CHOICES, required=False) @@ -70,18 +50,6 @@ class CircuitSerializer(TaggitSerializer, CustomFieldModelSerializer): ] -class NestedCircuitSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuit-detail') - - class Meta: - model = Circuit - fields = ['id', 'url', 'cid'] - - -# -# Circuit Terminations -# - class CircuitTerminationSerializer(ValidatedModelSerializer): circuit = NestedCircuitSerializer() site = NestedSiteSerializer() @@ -94,12 +62,3 @@ class CircuitTerminationSerializer(ValidatedModelSerializer): 'id', 'circuit', 'term_side', 'site', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'description', 'connected_endpoint', 'cable', ] - - -class NestedCircuitTerminationSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittermination-detail') - circuit = NestedCircuitSerializer() - - class Meta: - model = CircuitTermination - fields = ['id', 'url', 'circuit', 'term_side'] diff --git a/netbox/dcim/api/nested_serializers.py b/netbox/dcim/api/nested_serializers.py new file mode 100644 index 000000000..b8dd403b5 --- /dev/null +++ b/netbox/dcim/api/nested_serializers.py @@ -0,0 +1,243 @@ +from rest_framework import serializers + +from dcim.models import ( + Cable, ConsolePort, ConsoleServerPort, Device, DeviceBay, DeviceType, DeviceRole, FrontPort, FrontPortTemplate, + Interface, Manufacturer, Platform, PowerOutlet, PowerPort, Rack, RackGroup, RackRole, RearPort, RearPortTemplate, + Region, Site, VirtualChassis, +) +from utilities.api import WritableNestedSerializer + +__all__ = [ + 'NestedCableSerializer', + 'NestedConsolePortSerializer', + 'NestedConsoleServerPortSerializer', + 'NestedDeviceBaySerializer', + 'NestedDeviceRoleSerializer', + 'NestedDeviceSerializer', + 'NestedDeviceTypeSerializer', + 'NestedFrontPortSerializer', + 'NestedFrontPortTemplateSerializer', + 'NestedInterfaceSerializer', + 'NestedManufacturerSerializer', + 'NestedPlatformSerializer', + 'NestedPowerOutletSerializer', + 'NestedPowerPortSerializer', + 'NestedRackGroupSerializer', + 'NestedRackRoleSerializer', + 'NestedRackSerializer', + 'NestedRearPortSerializer', + 'NestedRearPortTemplateSerializer', + 'NestedRegionSerializer', + 'NestedSiteSerializer', + 'NestedVirtualChassisSerializer', +] + + +# +# Regions/sites +# + +class NestedRegionSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:region-detail') + + class Meta: + model = Region + fields = ['id', 'url', 'name', 'slug'] + + +class NestedSiteSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:site-detail') + + class Meta: + model = Site + fields = ['id', 'url', 'name', 'slug'] + + +# +# Racks +# + +class NestedRackGroupSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackgroup-detail') + + class Meta: + model = RackGroup + fields = ['id', 'url', 'name', 'slug'] + + +class NestedRackRoleSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackrole-detail') + + class Meta: + model = RackRole + fields = ['id', 'url', 'name', 'slug'] + + +class NestedRackSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rack-detail') + + class Meta: + model = Rack + fields = ['id', 'url', 'name', 'display_name'] + + +# +# Device types +# + +class NestedManufacturerSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:manufacturer-detail') + + class Meta: + model = Manufacturer + fields = ['id', 'url', 'name', 'slug'] + + +class NestedDeviceTypeSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicetype-detail') + manufacturer = NestedManufacturerSerializer(read_only=True) + + class Meta: + model = DeviceType + fields = ['id', 'url', 'manufacturer', 'model', 'slug'] + + +class NestedRearPortTemplateSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearporttemplate-detail') + + class Meta: + model = RearPortTemplate + fields = ['id', 'url', 'name'] + + +class NestedFrontPortTemplateSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontporttemplate-detail') + + class Meta: + model = FrontPortTemplate + fields = ['id', 'url', 'name'] + + +# +# Devices +# + +class NestedDeviceRoleSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicerole-detail') + + class Meta: + model = DeviceRole + fields = ['id', 'url', 'name', 'slug'] + + +class NestedPlatformSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:platform-detail') + + class Meta: + model = Platform + fields = ['id', 'url', 'name', 'slug'] + + +class NestedDeviceSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:device-detail') + + class Meta: + model = Device + fields = ['id', 'url', 'name', 'display_name'] + + +class NestedConsoleServerPortSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverport-detail') + device = NestedDeviceSerializer(read_only=True) + + class Meta: + model = ConsoleServerPort + fields = ['id', 'url', 'device', 'name', 'cable'] + + +class NestedConsolePortSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleport-detail') + device = NestedDeviceSerializer(read_only=True) + + class Meta: + model = ConsolePort + fields = ['id', 'url', 'device', 'name', 'cable'] + + +class NestedPowerOutletSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlet-detail') + device = NestedDeviceSerializer(read_only=True) + + class Meta: + model = PowerOutlet + fields = ['id', 'url', 'device', 'name', 'cable'] + + +class NestedPowerPortSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerport-detail') + device = NestedDeviceSerializer(read_only=True) + + class Meta: + model = PowerPort + fields = ['id', 'url', 'device', 'name', 'cable'] + + +class NestedInterfaceSerializer(WritableNestedSerializer): + device = NestedDeviceSerializer(read_only=True) + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interface-detail') + + class Meta: + model = Interface + fields = ['id', 'url', 'device', 'name', 'cable'] + + +class NestedRearPortSerializer(WritableNestedSerializer): + device = NestedDeviceSerializer(read_only=True) + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail') + + class Meta: + model = RearPort + fields = ['id', 'url', 'device', 'name', 'cable'] + + +class NestedFrontPortSerializer(WritableNestedSerializer): + device = NestedDeviceSerializer(read_only=True) + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontport-detail') + + class Meta: + model = FrontPort + fields = ['id', 'url', 'device', 'name', 'cable'] + + +class NestedDeviceBaySerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail') + device = NestedDeviceSerializer(read_only=True) + + class Meta: + model = DeviceBay + fields = ['id', 'url', 'device', 'name'] + + +# +# Cables +# + +class NestedCableSerializer(serializers.ModelSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail') + + class Meta: + model = Cable + fields = ['id', 'url', 'label'] + + +# +# Virtual chassis +# + +class NestedVirtualChassisSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:virtualchassis-detail') + master = NestedDeviceSerializer() + + class Meta: + model = VirtualChassis + fields = ['id', 'url', 'master'] diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index bc0995d49..23d870864 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -2,7 +2,6 @@ from rest_framework import serializers from rest_framework.validators import UniqueTogetherValidator from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField -from circuits.models import Circuit, CircuitTermination from dcim.constants import * from dcim.models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, @@ -11,28 +10,22 @@ from dcim.models import ( RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, ) from extras.api.customfields import CustomFieldModelSerializer -from ipam.models import IPAddress, VLAN -from tenancy.api.serializers import NestedTenantSerializer -from users.api.serializers import NestedUserSerializer +from ipam.api.nested_serializers import NestedIPAddressSerializer, NestedVLANSerializer +from ipam.models import VLAN +from tenancy.api.nested_serializers import NestedTenantSerializer +from users.api.nested_serializers import NestedUserSerializer from utilities.api import ( ChoiceField, ContentTypeField, SerializedPKRelatedField, TimeZoneField, ValidatedModelSerializer, WritableNestedSerializer, get_serializer_for_model, ) -from virtualization.models import Cluster +from virtualization.api.nested_serializers import NestedClusterSerializer +from .nested_serializers import * # -# Regions +# Regions/sites # -class NestedRegionSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:region-detail') - - class Meta: - model = Region - fields = ['id', 'url', 'name', 'slug'] - - class RegionSerializer(serializers.ModelSerializer): parent = NestedRegionSerializer(required=False, allow_null=True) @@ -41,10 +34,6 @@ class RegionSerializer(serializers.ModelSerializer): fields = ['id', 'name', 'slug', 'parent'] -# -# Sites -# - class SiteSerializer(TaggitSerializer, CustomFieldModelSerializer): status = ChoiceField(choices=SITE_STATUS_CHOICES, required=False) region = NestedRegionSerializer(required=False, allow_null=True) @@ -62,16 +51,8 @@ class SiteSerializer(TaggitSerializer, CustomFieldModelSerializer): ] -class NestedSiteSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:site-detail') - - class Meta: - model = Site - fields = ['id', 'url', 'name', 'slug'] - - # -# Rack groups +# Racks # class RackGroupSerializer(ValidatedModelSerializer): @@ -82,18 +63,6 @@ class RackGroupSerializer(ValidatedModelSerializer): fields = ['id', 'name', 'slug', 'site'] -class NestedRackGroupSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackgroup-detail') - - class Meta: - model = RackGroup - fields = ['id', 'url', 'name', 'slug'] - - -# -# Rack roles -# - class RackRoleSerializer(ValidatedModelSerializer): class Meta: @@ -101,18 +70,6 @@ class RackRoleSerializer(ValidatedModelSerializer): fields = ['id', 'name', 'slug', 'color'] -class NestedRackRoleSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackrole-detail') - - class Meta: - model = RackRole - fields = ['id', 'url', 'name', 'slug'] - - -# -# Racks -# - class RackSerializer(TaggitSerializer, CustomFieldModelSerializer): site = NestedSiteSerializer() group = NestedRackGroupSerializer(required=False, allow_null=True, default=None) @@ -151,26 +108,6 @@ class RackSerializer(TaggitSerializer, CustomFieldModelSerializer): return data -class NestedRackSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rack-detail') - - class Meta: - model = Rack - fields = ['id', 'url', 'name', 'display_name'] - - -# -# Rack units -# - -class NestedDeviceSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:device-detail') - - class Meta: - model = Device - fields = ['id', 'url', 'name', 'display_name'] - - class RackUnitSerializer(serializers.Serializer): """ A rack unit is an abstraction formed by the set (rack, position, face); it does not exist as a row in the database. @@ -181,10 +118,6 @@ class RackUnitSerializer(serializers.Serializer): device = NestedDeviceSerializer(read_only=True) -# -# Rack reservations -# - class RackReservationSerializer(ValidatedModelSerializer): rack = NestedRackSerializer() user = NestedUserSerializer() @@ -196,7 +129,7 @@ class RackReservationSerializer(ValidatedModelSerializer): # -# Manufacturers +# Device types # class ManufacturerSerializer(ValidatedModelSerializer): @@ -206,18 +139,6 @@ class ManufacturerSerializer(ValidatedModelSerializer): fields = ['id', 'name', 'slug'] -class NestedManufacturerSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:manufacturer-detail') - - class Meta: - model = Manufacturer - fields = ['id', 'url', 'name', 'slug'] - - -# -# Device types -# - class DeviceTypeSerializer(TaggitSerializer, CustomFieldModelSerializer): manufacturer = NestedManufacturerSerializer() subdevice_role = ChoiceField(choices=SUBDEVICE_ROLE_CHOICES, required=False, allow_null=True) @@ -232,19 +153,6 @@ class DeviceTypeSerializer(TaggitSerializer, CustomFieldModelSerializer): ] -class NestedDeviceTypeSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicetype-detail') - manufacturer = NestedManufacturerSerializer(read_only=True) - - class Meta: - model = DeviceType - fields = ['id', 'url', 'manufacturer', 'model', 'slug'] - - -# -# Console port templates -# - class ConsolePortTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() @@ -253,10 +161,6 @@ class ConsolePortTemplateSerializer(ValidatedModelSerializer): fields = ['id', 'device_type', 'name'] -# -# Console server port templates -# - class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() @@ -265,10 +169,6 @@ class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer): fields = ['id', 'device_type', 'name'] -# -# Power port templates -# - class PowerPortTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() @@ -277,10 +177,6 @@ class PowerPortTemplateSerializer(ValidatedModelSerializer): fields = ['id', 'device_type', 'name'] -# -# Power outlet templates -# - class PowerOutletTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() @@ -289,10 +185,6 @@ class PowerOutletTemplateSerializer(ValidatedModelSerializer): fields = ['id', 'device_type', 'name'] -# -# Interface templates -# - class InterfaceTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() form_factor = ChoiceField(choices=IFACE_FF_CHOICES, required=False) @@ -302,10 +194,6 @@ class InterfaceTemplateSerializer(ValidatedModelSerializer): fields = ['id', 'device_type', 'name', 'form_factor', 'mgmt_only'] -# -# Rear port templates -# - class RearPortTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() type = ChoiceField(choices=PORT_TYPE_CHOICES) @@ -315,18 +203,6 @@ class RearPortTemplateSerializer(ValidatedModelSerializer): fields = ['id', 'device_type', 'name', 'type', 'positions'] -class NestedRearPortTemplateSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearporttemplate-detail') - - class Meta: - model = RearPortTemplate - fields = ['id', 'url', 'name'] - - -# -# Front port templates -# - class FrontPortTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() type = ChoiceField(choices=PORT_TYPE_CHOICES) @@ -337,18 +213,6 @@ class FrontPortTemplateSerializer(ValidatedModelSerializer): fields = ['id', 'device_type', 'name', 'type', 'rear_port', 'rear_port_position'] -class NestedFrontPortTemplateSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontporttemplate-detail') - - class Meta: - model = FrontPortTemplate - fields = ['id', 'url', 'name'] - - -# -# Device bay templates -# - class DeviceBayTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() @@ -358,7 +222,7 @@ class DeviceBayTemplateSerializer(ValidatedModelSerializer): # -# Device roles +# Devices # class DeviceRoleSerializer(ValidatedModelSerializer): @@ -368,18 +232,6 @@ class DeviceRoleSerializer(ValidatedModelSerializer): fields = ['id', 'name', 'slug', 'color', 'vm_role'] -class NestedDeviceRoleSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicerole-detail') - - class Meta: - model = DeviceRole - fields = ['id', 'url', 'name', 'slug'] - - -# -# Platforms -# - class PlatformSerializer(ValidatedModelSerializer): manufacturer = NestedManufacturerSerializer(required=False, allow_null=True) @@ -388,46 +240,6 @@ class PlatformSerializer(ValidatedModelSerializer): fields = ['id', 'name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_args'] -class NestedPlatformSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:platform-detail') - - class Meta: - model = Platform - fields = ['id', 'url', 'name', 'slug'] - - -# -# Devices -# - -# Cannot import ipam.api.NestedIPAddressSerializer due to circular dependency -class DeviceIPAddressSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='ipam-api:ipaddress-detail') - - class Meta: - model = IPAddress - fields = ['id', 'url', 'family', 'address'] - - -# Cannot import virtualization.api.NestedClusterSerializer due to circular dependency -class NestedClusterSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:cluster-detail') - - class Meta: - model = Cluster - fields = ['id', 'url', 'name'] - - -# Cannot import NestedVirtualChassisSerializer due to circular dependency -class DeviceVirtualChassisSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:virtualchassis-detail') - master = NestedDeviceSerializer() - - class Meta: - model = VirtualChassis - fields = ['id', 'url', 'master'] - - class DeviceSerializer(TaggitSerializer, CustomFieldModelSerializer): device_type = NestedDeviceTypeSerializer() device_role = NestedDeviceRoleSerializer() @@ -437,12 +249,12 @@ class DeviceSerializer(TaggitSerializer, CustomFieldModelSerializer): rack = NestedRackSerializer(required=False, allow_null=True) face = ChoiceField(choices=RACK_FACE_CHOICES, required=False, allow_null=True) status = ChoiceField(choices=DEVICE_STATUS_CHOICES, required=False) - primary_ip = DeviceIPAddressSerializer(read_only=True) - primary_ip4 = DeviceIPAddressSerializer(required=False, allow_null=True) - primary_ip6 = DeviceIPAddressSerializer(required=False, allow_null=True) + primary_ip = NestedIPAddressSerializer(read_only=True) + primary_ip4 = NestedIPAddressSerializer(required=False, allow_null=True) + primary_ip6 = NestedIPAddressSerializer(required=False, allow_null=True) parent_device = serializers.SerializerMethodField() cluster = NestedClusterSerializer(required=False, allow_null=True) - virtual_chassis = DeviceVirtualChassisSerializer(required=False, allow_null=True) + virtual_chassis = NestedVirtualChassisSerializer(required=False, allow_null=True) tags = TagListSerializerField(required=False) class Meta: @@ -450,8 +262,8 @@ class DeviceSerializer(TaggitSerializer, CustomFieldModelSerializer): fields = [ 'id', 'name', 'display_name', 'device_type', 'device_role', 'tenant', 'platform', 'serial', 'asset_tag', 'site', 'rack', 'position', 'face', 'parent_device', 'status', 'primary_ip', 'primary_ip4', 'primary_ip6', - 'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', 'tags', 'custom_fields', 'created', - 'last_updated', 'local_context_data', + 'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', 'local_context_data', 'tags', + 'custom_fields', 'created', 'last_updated', ] validators = [] @@ -486,14 +298,178 @@ class DeviceWithConfigContextSerializer(DeviceSerializer): fields = [ 'id', 'name', 'display_name', 'device_type', 'device_role', 'tenant', 'platform', 'serial', 'asset_tag', 'site', 'rack', 'position', 'face', 'parent_device', 'status', 'primary_ip', 'primary_ip4', 'primary_ip6', - 'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', 'tags', 'custom_fields', - 'config_context', 'created', 'last_updated', 'local_context_data', + 'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', 'local_context_data', 'tags', + 'custom_fields', 'config_context', 'created', 'last_updated', ] def get_config_context(self, obj): return obj.get_config_context() +class ConsoleServerPortSerializer(TaggitSerializer, ValidatedModelSerializer): + device = NestedDeviceSerializer() + cable = NestedCableSerializer(read_only=True) + tags = TagListSerializerField(required=False) + + class Meta: + model = ConsoleServerPort + fields = ['id', 'device', 'name', 'connected_endpoint', 'cable', 'tags'] + read_only_fields = ['connected_endpoint'] + + +class ConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): + device = NestedDeviceSerializer() + connected_endpoint = NestedConsoleServerPortSerializer(read_only=True) + cable = NestedCableSerializer(read_only=True) + tags = TagListSerializerField(required=False) + + class Meta: + model = ConsolePort + fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags'] + + +class PowerOutletSerializer(TaggitSerializer, ValidatedModelSerializer): + device = NestedDeviceSerializer() + cable = NestedCableSerializer(read_only=True) + tags = TagListSerializerField(required=False) + + class Meta: + model = PowerOutlet + fields = ['id', 'device', 'name', 'connected_endpoint', 'cable', 'tags'] + read_only_fields = ['connected_endpoint'] + + +class PowerPortSerializer(TaggitSerializer, ValidatedModelSerializer): + device = NestedDeviceSerializer() + connected_endpoint = NestedPowerOutletSerializer(read_only=True) + cable = NestedCableSerializer(read_only=True) + tags = TagListSerializerField(required=False) + + class Meta: + model = PowerPort + fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags'] + + +class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer): + device = NestedDeviceSerializer() + form_factor = ChoiceField(choices=IFACE_FF_CHOICES, required=False) + lag = NestedInterfaceSerializer(required=False, allow_null=True) + connected_endpoint = serializers.SerializerMethodField(read_only=True) + mode = ChoiceField(choices=IFACE_MODE_CHOICES, required=False, allow_null=True) + untagged_vlan = NestedVLANSerializer(required=False, allow_null=True) + tagged_vlans = SerializedPKRelatedField( + queryset=VLAN.objects.all(), + serializer=NestedVLANSerializer, + required=False, + many=True + ) + cable = NestedCableSerializer(read_only=True) + tags = TagListSerializerField(required=False) + + class Meta: + model = Interface + fields = [ + 'id', 'device', 'name', 'form_factor', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description', + 'connected_endpoint', 'cable', 'mode', 'untagged_vlan', 'tagged_vlans', 'tags', 'count_ipaddresses', + ] + + # TODO: This validation should be handled by Interface.clean() + def validate(self, data): + + # All associated VLANs be global or assigned to the parent device's site. + device = self.instance.device if self.instance else data.get('device') + untagged_vlan = data.get('untagged_vlan') + if untagged_vlan and untagged_vlan.site not in [device.site, None]: + raise serializers.ValidationError({ + 'untagged_vlan': "VLAN {} must belong to the same site as the interface's parent device, or it must be " + "global.".format(untagged_vlan) + }) + for vlan in data.get('tagged_vlans', []): + if vlan.site not in [device.site, None]: + raise serializers.ValidationError({ + 'tagged_vlans': "VLAN {} must belong to the same site as the interface's parent device, or it must " + "be global.".format(vlan) + }) + + return super(InterfaceSerializer, self).validate(data) + + def get_connected_endpoint(self, obj): + """ + Return the appropriate serializer for the type of connected object. + """ + if obj.connected_endpoint is None: + return None + + serializer = get_serializer_for_model(obj.connected_endpoint, prefix='Nested') + context = {'request': self.context['request']} + data = serializer(obj.connected_endpoint, context=context).data + + return data + + +class RearPortSerializer(ValidatedModelSerializer): + device = NestedDeviceSerializer() + type = ChoiceField(choices=PORT_TYPE_CHOICES) + cable = NestedCableSerializer(read_only=True) + tags = TagListSerializerField(required=False) + + class Meta: + model = RearPort + fields = ['id', 'device', 'name', 'type', 'positions', 'cable', 'tags'] + + +class FrontPortRearPortSerializer(WritableNestedSerializer): + """ + NestedRearPortSerializer but with parent device omitted (since front and rear ports must belong to same device) + """ + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail') + + class Meta: + model = RearPort + fields = ['id', 'url', 'name'] + + +class FrontPortSerializer(ValidatedModelSerializer): + device = NestedDeviceSerializer() + type = ChoiceField(choices=PORT_TYPE_CHOICES) + rear_port = FrontPortRearPortSerializer() + cable = NestedCableSerializer(read_only=True) + tags = TagListSerializerField(required=False) + + class Meta: + model = FrontPort + fields = ['id', 'device', 'name', 'type', 'rear_port', 'rear_port_position', 'cable', 'tags'] + + +class DeviceBaySerializer(TaggitSerializer, ValidatedModelSerializer): + device = NestedDeviceSerializer() + installed_device = NestedDeviceSerializer(required=False, allow_null=True) + tags = TagListSerializerField(required=False) + + class Meta: + model = DeviceBay + fields = ['id', 'device', 'name', 'installed_device', 'tags'] + + +# +# Inventory items +# + +class InventoryItemSerializer(TaggitSerializer, ValidatedModelSerializer): + device = NestedDeviceSerializer() + # Provide a default value to satisfy UniqueTogetherValidator + parent = serializers.PrimaryKeyRelatedField(queryset=InventoryItem.objects.all(), allow_null=True, default=None) + manufacturer = NestedManufacturerSerializer(required=False, allow_null=True, default=None) + tags = TagListSerializerField(required=False) + + class Meta: + model = InventoryItem + fields = [ + 'id', 'device', 'parent', 'name', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered', + 'description', 'tags', + ] + + # # Cables # @@ -548,305 +524,6 @@ class TracedCableSerializer(serializers.ModelSerializer): ] -class NestedCableSerializer(serializers.ModelSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail') - - class Meta: - model = Cable - fields = ['id', 'url', 'label'] - - -# -# Console server ports -# - -class ConsoleServerPortSerializer(TaggitSerializer, ValidatedModelSerializer): - device = NestedDeviceSerializer() - cable = NestedCableSerializer(read_only=True) - tags = TagListSerializerField(required=False) - - class Meta: - model = ConsoleServerPort - fields = ['id', 'device', 'name', 'connected_endpoint', 'cable', 'tags'] - read_only_fields = ['connected_endpoint'] - - -class NestedConsoleServerPortSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverport-detail') - device = NestedDeviceSerializer(read_only=True) - - class Meta: - model = ConsoleServerPort - fields = ['id', 'url', 'device', 'name', 'cable'] - - -# -# Console ports -# - -class ConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): - device = NestedDeviceSerializer() - connected_endpoint = NestedConsoleServerPortSerializer(read_only=True) - cable = NestedCableSerializer(read_only=True) - tags = TagListSerializerField(required=False) - - class Meta: - model = ConsolePort - fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags'] - - -class NestedConsolePortSerializer(TaggitSerializer, ValidatedModelSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleport-detail') - device = NestedDeviceSerializer(read_only=True) - - class Meta: - model = ConsolePort - fields = ['id', 'url', 'device', 'name', 'cable'] - - -# -# Power outlets -# - -class PowerOutletSerializer(TaggitSerializer, ValidatedModelSerializer): - device = NestedDeviceSerializer() - cable = NestedCableSerializer(read_only=True) - tags = TagListSerializerField(required=False) - - class Meta: - model = PowerOutlet - fields = ['id', 'device', 'name', 'connected_endpoint', 'cable', 'tags'] - read_only_fields = ['connected_endpoint'] - - -class NestedPowerOutletSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlet-detail') - device = NestedDeviceSerializer(read_only=True) - - class Meta: - model = PowerOutlet - fields = ['id', 'url', 'device', 'name', 'cable'] - - -# -# Power ports -# - -class PowerPortSerializer(TaggitSerializer, ValidatedModelSerializer): - device = NestedDeviceSerializer() - connected_endpoint = NestedPowerOutletSerializer(read_only=True) - cable = NestedCableSerializer(read_only=True) - tags = TagListSerializerField(required=False) - - class Meta: - model = PowerPort - fields = ['id', 'device', 'name', 'connected_endpoint', 'connection_status', 'cable', 'tags'] - - -class NestedPowerPortSerializer(TaggitSerializer, ValidatedModelSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerport-detail') - device = NestedDeviceSerializer(read_only=True) - - class Meta: - model = PowerPort - fields = ['id', 'url', 'device', 'name', 'cable'] - - -# -# Interfaces -# - -class NestedInterfaceSerializer(WritableNestedSerializer): - device = NestedDeviceSerializer(read_only=True) - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interface-detail') - - class Meta: - model = Interface - fields = ['id', 'url', 'device', 'name', 'cable'] - - -class InterfaceNestedCircuitSerializer(serializers.ModelSerializer): - url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuit-detail') - - class Meta: - model = Circuit - fields = ['id', 'url', 'cid'] - - -class InterfaceCircuitTerminationSerializer(WritableNestedSerializer): - circuit = InterfaceNestedCircuitSerializer(read_only=True) - - class Meta: - model = CircuitTermination - fields = [ - 'id', 'circuit', 'term_side', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', - ] - - -# Cannot import ipam.api.NestedVLANSerializer due to circular dependency -class InterfaceVLANSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlan-detail') - - class Meta: - model = VLAN - fields = ['id', 'url', 'vid', 'name', 'display_name'] - - -class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer): - device = NestedDeviceSerializer() - form_factor = ChoiceField(choices=IFACE_FF_CHOICES, required=False) - lag = NestedInterfaceSerializer(required=False, allow_null=True) - connected_endpoint = serializers.SerializerMethodField(read_only=True) - mode = ChoiceField(choices=IFACE_MODE_CHOICES, required=False, allow_null=True) - untagged_vlan = InterfaceVLANSerializer(required=False, allow_null=True) - tagged_vlans = SerializedPKRelatedField( - queryset=VLAN.objects.all(), - serializer=InterfaceVLANSerializer, - required=False, - many=True - ) - cable = NestedCableSerializer(read_only=True) - tags = TagListSerializerField(required=False) - - class Meta: - model = Interface - fields = [ - 'id', 'device', 'name', 'form_factor', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description', - 'connected_endpoint', 'cable', 'mode', 'untagged_vlan', 'tagged_vlans', 'tags', 'count_ipaddresses', - ] - - def validate(self, data): - - # All associated VLANs be global or assigned to the parent device's site. - device = self.instance.device if self.instance else data.get('device') - untagged_vlan = data.get('untagged_vlan') - if untagged_vlan and untagged_vlan.site not in [device.site, None]: - raise serializers.ValidationError({ - 'untagged_vlan': "VLAN {} must belong to the same site as the interface's parent device, or it must be " - "global.".format(untagged_vlan) - }) - for vlan in data.get('tagged_vlans', []): - if vlan.site not in [device.site, None]: - raise serializers.ValidationError({ - 'tagged_vlans': "VLAN {} must belong to the same site as the interface's parent device, or it must " - "be global.".format(vlan) - }) - - return super(InterfaceSerializer, self).validate(data) - - def get_connected_endpoint(self, obj): - """ - Return the appropriate serializer for the type of connected object. - """ - if obj.connected_endpoint is None: - return None - - serializer = get_serializer_for_model(obj.connected_endpoint, prefix='Nested') - context = {'request': self.context['request']} - data = serializer(obj.connected_endpoint, context=context).data - - return data - - -# -# Rear ports -# - -class RearPortSerializer(ValidatedModelSerializer): - device = NestedDeviceSerializer() - type = ChoiceField(choices=PORT_TYPE_CHOICES) - cable = NestedCableSerializer(read_only=True) - tags = TagListSerializerField(required=False) - - class Meta: - model = RearPort - fields = ['id', 'device', 'name', 'type', 'positions', 'cable', 'tags'] - - -class NestedRearPortSerializer(WritableNestedSerializer): - device = NestedDeviceSerializer(read_only=True) - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail') - - class Meta: - model = RearPort - fields = ['id', 'url', 'device', 'name', 'cable'] - - -# -# Front ports -# - -class FrontPortRearPortSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail') - - class Meta: - model = RearPort - fields = ['id', 'url', 'name'] - - -class FrontPortSerializer(ValidatedModelSerializer): - device = NestedDeviceSerializer() - type = ChoiceField(choices=PORT_TYPE_CHOICES) - rear_port = FrontPortRearPortSerializer() - cable = NestedCableSerializer(read_only=True) - tags = TagListSerializerField(required=False) - - class Meta: - model = FrontPort - fields = ['id', 'device', 'name', 'type', 'rear_port', 'rear_port_position', 'cable', 'tags'] - - -class NestedFrontPortSerializer(WritableNestedSerializer): - device = NestedDeviceSerializer(read_only=True) - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontport-detail') - - class Meta: - model = FrontPort - fields = ['id', 'url', 'device', 'name', 'cable'] - - -# -# Device bays -# - -class DeviceBaySerializer(TaggitSerializer, ValidatedModelSerializer): - device = NestedDeviceSerializer() - installed_device = NestedDeviceSerializer(required=False, allow_null=True) - tags = TagListSerializerField(required=False) - - class Meta: - model = DeviceBay - fields = ['id', 'device', 'name', 'installed_device', 'tags'] - - -class NestedDeviceBaySerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail') - device = NestedDeviceSerializer(read_only=True) - - class Meta: - model = DeviceBay - fields = ['id', 'url', 'device', 'name'] - - -# -# Inventory items -# - -class InventoryItemSerializer(TaggitSerializer, ValidatedModelSerializer): - device = NestedDeviceSerializer() - # Provide a default value to satisfy UniqueTogetherValidator - parent = serializers.PrimaryKeyRelatedField(queryset=InventoryItem.objects.all(), allow_null=True, default=None) - manufacturer = NestedManufacturerSerializer(required=False, allow_null=True, default=None) - tags = TagListSerializerField(required=False) - - class Meta: - model = InventoryItem - fields = [ - 'id', 'device', 'parent', 'name', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered', - 'description', 'tags', - ] - - # # Interface connections # @@ -876,11 +553,3 @@ class VirtualChassisSerializer(TaggitSerializer, ValidatedModelSerializer): class Meta: model = VirtualChassis fields = ['id', 'master', 'domain', 'tags'] - - -class NestedVirtualChassisSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:virtualchassis-detail') - - class Meta: - model = VirtualChassis - fields = ['id', 'url'] diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 5c5c413e0..a40886f21 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -3433,7 +3433,7 @@ class VirtualChassisTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['id', 'url'] + ['id', 'master', 'url'] ) def test_create_virtualchassis(self): diff --git a/netbox/extras/api/nested_serializers.py b/netbox/extras/api/nested_serializers.py new file mode 100644 index 000000000..11367aba9 --- /dev/null +++ b/netbox/extras/api/nested_serializers.py @@ -0,0 +1,23 @@ +from rest_framework import serializers + +from extras.models import ReportResult + +__all__ = [ + 'NestedReportResultSerializer', +] + + +# +# Reports +# + +class NestedReportResultSerializer(serializers.ModelSerializer): + url = serializers.HyperlinkedIdentityField( + view_name='extras-api:report-detail', + lookup_field='report', + lookup_url_kwarg='pk' + ) + + class Meta: + model = ReportResult + fields = ['url', 'created', 'user', 'failed'] diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py index c62fab635..db468ceba 100644 --- a/netbox/extras/api/serializers.py +++ b/netbox/extras/api/serializers.py @@ -2,7 +2,7 @@ from django.core.exceptions import ObjectDoesNotExist from rest_framework import serializers from taggit.models import Tag -from dcim.api.serializers import ( +from dcim.api.nested_serializers import ( NestedDeviceSerializer, NestedDeviceRoleSerializer, NestedPlatformSerializer, NestedRackSerializer, NestedRegionSerializer, NestedSiteSerializer, ) @@ -11,12 +11,13 @@ from extras.constants import * from extras.models import ( ConfigContext, ExportTemplate, Graph, ImageAttachment, ObjectChange, ReportResult, TopologyMap, ) -from tenancy.api.serializers import NestedTenantSerializer, NestedTenantGroupSerializer +from tenancy.api.nested_serializers import NestedTenantSerializer, NestedTenantGroupSerializer from tenancy.models import Tenant, TenantGroup -from users.api.serializers import NestedUserSerializer +from users.api.nested_serializers import NestedUserSerializer from utilities.api import ( ChoiceField, ContentTypeField, get_serializer_for_model, SerializedPKRelatedField, ValidatedModelSerializer, ) +from .nested_serializers import * # @@ -187,18 +188,6 @@ class ReportResultSerializer(serializers.ModelSerializer): fields = ['created', 'user', 'failed', 'data'] -class NestedReportResultSerializer(serializers.ModelSerializer): - url = serializers.HyperlinkedIdentityField( - view_name='extras-api:report-detail', - lookup_field='report', - lookup_url_kwarg='pk' - ) - - class Meta: - model = ReportResult - fields = ['url', 'created', 'user', 'failed'] - - class ReportSerializer(serializers.Serializer): module = serializers.CharField(max_length=255) name = serializers.CharField(max_length=255) diff --git a/netbox/ipam/api/nested_serializers.py b/netbox/ipam/api/nested_serializers.py new file mode 100644 index 000000000..2ffaa0ae2 --- /dev/null +++ b/netbox/ipam/api/nested_serializers.py @@ -0,0 +1,100 @@ +from rest_framework import serializers + +from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, VLAN, VLANGroup, VRF +from utilities.api import WritableNestedSerializer + +__all__ = [ + 'NestedAggregateSerializer', + 'NestedIPAddressSerializer', + 'NestedPrefixSerializer', + 'NestedRIRSerializer', + 'NestedRoleSerializer', + 'NestedVLANGroupSerializer', + 'NestedVLANSerializer', + 'NestedVRFSerializer', +] + + +# +# VRFs +# + +class NestedVRFSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vrf-detail') + + class Meta: + model = VRF + fields = ['id', 'url', 'name', 'rd'] + + +# +# RIRs/aggregates +# + +class NestedRIRSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='ipam-api:rir-detail') + + class Meta: + model = RIR + fields = ['id', 'url', 'name', 'slug'] + + +class NestedAggregateSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='ipam-api:aggregate-detail') + + class Meta: + model = Aggregate + fields = ['id', 'url', 'family', 'prefix'] + + +# +# VLANs +# + +class NestedRoleSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='ipam-api:role-detail') + + class Meta: + model = Role + fields = ['id', 'url', 'name', 'slug'] + + +class NestedVLANGroupSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlangroup-detail') + + class Meta: + model = VLANGroup + fields = ['id', 'url', 'name', 'slug'] + + +class NestedVLANSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlan-detail') + + class Meta: + model = VLAN + fields = ['id', 'url', 'vid', 'name', 'display_name'] + + +# +# Prefixes +# + +class NestedPrefixSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='ipam-api:prefix-detail') + + class Meta: + model = Prefix + fields = ['id', 'url', 'family', 'prefix'] + + +# +# IP addresses +# + + +class NestedIPAddressSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='ipam-api:ipaddress-detail') + + class Meta: + model = IPAddress + fields = ['id', 'url', 'family', 'address'] diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py index 0581d1e6d..ec47d5d7f 100644 --- a/netbox/ipam/api/serializers.py +++ b/netbox/ipam/api/serializers.py @@ -5,18 +5,17 @@ from rest_framework.reverse import reverse from rest_framework.validators import UniqueTogetherValidator from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField -from dcim.api.serializers import NestedDeviceSerializer, InterfaceSerializer, NestedSiteSerializer +from dcim.api.nested_serializers import NestedDeviceSerializer, NestedSiteSerializer from dcim.models import Interface from extras.api.customfields import CustomFieldModelSerializer -from ipam.constants import ( - IPADDRESS_ROLE_CHOICES, IPADDRESS_STATUS_CHOICES, IP_PROTOCOL_CHOICES, PREFIX_STATUS_CHOICES, VLAN_STATUS_CHOICES, -) +from ipam.constants import * from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF -from tenancy.api.serializers import NestedTenantSerializer +from tenancy.api.nested_serializers import NestedTenantSerializer from utilities.api import ( ChoiceField, SerializedPKRelatedField, ValidatedModelSerializer, WritableNestedSerializer, ) -from virtualization.api.serializers import NestedVirtualMachineSerializer +from virtualization.api.nested_serializers import NestedVirtualMachineSerializer +from .nested_serializers import * # @@ -35,35 +34,8 @@ class VRFSerializer(TaggitSerializer, CustomFieldModelSerializer): ] -class NestedVRFSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vrf-detail') - - class Meta: - model = VRF - fields = ['id', 'url', 'name', 'rd'] - - # -# Roles -# - -class RoleSerializer(ValidatedModelSerializer): - - class Meta: - model = Role - fields = ['id', 'name', 'slug', 'weight'] - - -class NestedRoleSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='ipam-api:role-detail') - - class Meta: - model = Role - fields = ['id', 'url', 'name', 'slug'] - - -# -# RIRs +# RIRs/aggregates # class RIRSerializer(ValidatedModelSerializer): @@ -73,18 +45,6 @@ class RIRSerializer(ValidatedModelSerializer): fields = ['id', 'name', 'slug', 'is_private'] -class NestedRIRSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='ipam-api:rir-detail') - - class Meta: - model = RIR - fields = ['id', 'url', 'name', 'slug'] - - -# -# Aggregates -# - class AggregateSerializer(TaggitSerializer, CustomFieldModelSerializer): rir = NestedRIRSerializer() tags = TagListSerializerField(required=False) @@ -98,18 +58,17 @@ class AggregateSerializer(TaggitSerializer, CustomFieldModelSerializer): read_only_fields = ['family'] -class NestedAggregateSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='ipam-api:aggregate-detail') - - class Meta(AggregateSerializer.Meta): - model = Aggregate - fields = ['id', 'url', 'family', 'prefix'] - - # -# VLAN groups +# VLANs # +class RoleSerializer(ValidatedModelSerializer): + + class Meta: + model = Role + fields = ['id', 'name', 'slug', 'weight'] + + class VLANGroupSerializer(ValidatedModelSerializer): site = NestedSiteSerializer(required=False, allow_null=True) @@ -133,18 +92,6 @@ class VLANGroupSerializer(ValidatedModelSerializer): return data -class NestedVLANGroupSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlangroup-detail') - - class Meta: - model = VLANGroup - fields = ['id', 'url', 'name', 'slug'] - - -# -# VLANs -# - class VLANSerializer(TaggitSerializer, CustomFieldModelSerializer): site = NestedSiteSerializer(required=False, allow_null=True) group = NestedVLANGroupSerializer(required=False, allow_null=True) @@ -176,14 +123,6 @@ class VLANSerializer(TaggitSerializer, CustomFieldModelSerializer): return data -class NestedVLANSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlan-detail') - - class Meta: - model = VLAN - fields = ['id', 'url', 'vid', 'name', 'display_name'] - - # # Prefixes # @@ -206,16 +145,10 @@ class PrefixSerializer(TaggitSerializer, CustomFieldModelSerializer): read_only_fields = ['family'] -class NestedPrefixSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='ipam-api:prefix-detail') - - class Meta: - model = Prefix - fields = ['id', 'url', 'family', 'prefix'] - - class AvailablePrefixSerializer(serializers.Serializer): - + """ + Representation of a prefix which does not exist in the database. + """ def to_representation(self, instance): if self.context.get('vrf'): vrf = NestedVRFSerializer(self.context['vrf'], context={'request': self.context['request']}).data @@ -233,11 +166,14 @@ class AvailablePrefixSerializer(serializers.Serializer): # class IPAddressInterfaceSerializer(WritableNestedSerializer): + """ + Nested representation of an Interface which may belong to a Device *or* a VirtualMachine. + """ url = serializers.SerializerMethodField() # We're imitating a HyperlinkedIdentityField here device = NestedDeviceSerializer(read_only=True) virtual_machine = NestedVirtualMachineSerializer(read_only=True) - class Meta(InterfaceSerializer.Meta): + class Meta: model = Interface fields = [ 'id', 'url', 'device', 'virtual_machine', 'name', @@ -258,6 +194,8 @@ class IPAddressSerializer(TaggitSerializer, CustomFieldModelSerializer): status = ChoiceField(choices=IPADDRESS_STATUS_CHOICES, required=False) role = ChoiceField(choices=IPADDRESS_ROLE_CHOICES, required=False, allow_null=True) interface = IPAddressInterfaceSerializer(required=False, allow_null=True) + nat_inside = NestedIPAddressSerializer(required=False, allow_null=True) + nat_outside = NestedIPAddressSerializer(read_only=True) tags = TagListSerializerField(required=False) class Meta: @@ -269,20 +207,10 @@ class IPAddressSerializer(TaggitSerializer, CustomFieldModelSerializer): read_only_fields = ['family'] -class NestedIPAddressSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='ipam-api:ipaddress-detail') - - class Meta: - model = IPAddress - fields = ['id', 'url', 'family', 'address'] - - -IPAddressSerializer._declared_fields['nat_inside'] = NestedIPAddressSerializer(required=False, allow_null=True) -IPAddressSerializer._declared_fields['nat_outside'] = NestedIPAddressSerializer(read_only=True) - - class AvailableIPSerializer(serializers.Serializer): - + """ + Representation of an IP address which does not exist in the database. + """ def to_representation(self, instance): if self.context.get('vrf'): vrf = NestedVRFSerializer(self.context['vrf'], context={'request': self.context['request']}).data diff --git a/netbox/secrets/api/nested_serializers.py b/netbox/secrets/api/nested_serializers.py new file mode 100644 index 000000000..819546c63 --- /dev/null +++ b/netbox/secrets/api/nested_serializers.py @@ -0,0 +1,16 @@ +from rest_framework import serializers + +from secrets.models import SecretRole +from utilities.api import WritableNestedSerializer + +__all__ = [ + 'NestedSecretRoleSerializer' +] + + +class NestedSecretRoleSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='secrets-api:secretrole-detail') + + class Meta: + model = SecretRole + fields = ['id', 'url', 'name', 'slug'] diff --git a/netbox/secrets/api/serializers.py b/netbox/secrets/api/serializers.py index fc1a60b03..4d50a0a0b 100644 --- a/netbox/secrets/api/serializers.py +++ b/netbox/secrets/api/serializers.py @@ -2,14 +2,15 @@ from rest_framework import serializers from rest_framework.validators import UniqueTogetherValidator from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField -from dcim.api.serializers import NestedDeviceSerializer +from dcim.api.nested_serializers import NestedDeviceSerializer from extras.api.customfields import CustomFieldModelSerializer from secrets.models import Secret, SecretRole -from utilities.api import ValidatedModelSerializer, WritableNestedSerializer +from utilities.api import ValidatedModelSerializer +from .nested_serializers import * # -# SecretRoles +# Secrets # class SecretRoleSerializer(ValidatedModelSerializer): @@ -19,18 +20,6 @@ class SecretRoleSerializer(ValidatedModelSerializer): fields = ['id', 'name', 'slug'] -class NestedSecretRoleSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='secrets-api:secretrole-detail') - - class Meta: - model = SecretRole - fields = ['id', 'url', 'name', 'slug'] - - -# -# Secrets -# - class SecretSerializer(TaggitSerializer, CustomFieldModelSerializer): device = NestedDeviceSerializer() role = NestedSecretRoleSerializer() diff --git a/netbox/tenancy/api/nested_serializers.py b/netbox/tenancy/api/nested_serializers.py new file mode 100644 index 000000000..d26ac4675 --- /dev/null +++ b/netbox/tenancy/api/nested_serializers.py @@ -0,0 +1,29 @@ +from rest_framework import serializers + +from tenancy.models import Tenant, TenantGroup +from utilities.api import WritableNestedSerializer + +__all__ = [ + 'NestedTenantGroupSerializer', + 'NestedTenantSerializer', +] + + +# +# Tenants +# + +class NestedTenantGroupSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:tenantgroup-detail') + + class Meta: + model = TenantGroup + fields = ['id', 'url', 'name', 'slug'] + + +class NestedTenantSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:tenant-detail') + + class Meta: + model = Tenant + fields = ['id', 'url', 'name', 'slug'] diff --git a/netbox/tenancy/api/serializers.py b/netbox/tenancy/api/serializers.py index 08492c55d..80f3b948d 100644 --- a/netbox/tenancy/api/serializers.py +++ b/netbox/tenancy/api/serializers.py @@ -1,13 +1,13 @@ -from rest_framework import serializers from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField from extras.api.customfields import CustomFieldModelSerializer from tenancy.models import Tenant, TenantGroup -from utilities.api import ValidatedModelSerializer, WritableNestedSerializer +from utilities.api import ValidatedModelSerializer +from .nested_serializers import * # -# Tenant groups +# Tenants # class TenantGroupSerializer(ValidatedModelSerializer): @@ -17,18 +17,6 @@ class TenantGroupSerializer(ValidatedModelSerializer): fields = ['id', 'name', 'slug'] -class NestedTenantGroupSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:tenantgroup-detail') - - class Meta: - model = TenantGroup - fields = ['id', 'url', 'name', 'slug'] - - -# -# Tenants -# - class TenantSerializer(TaggitSerializer, CustomFieldModelSerializer): group = NestedTenantGroupSerializer(required=False) tags = TagListSerializerField(required=False) @@ -39,11 +27,3 @@ class TenantSerializer(TaggitSerializer, CustomFieldModelSerializer): 'id', 'name', 'slug', 'group', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', ] - - -class NestedTenantSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:tenant-detail') - - class Meta: - model = Tenant - fields = ['id', 'url', 'name', 'slug'] diff --git a/netbox/users/api/nested_serializers.py b/netbox/users/api/nested_serializers.py new file mode 100644 index 000000000..d1b649713 --- /dev/null +++ b/netbox/users/api/nested_serializers.py @@ -0,0 +1,18 @@ +from django.contrib.auth.models import User + +from utilities.api import WritableNestedSerializer + +_all_ = [ + 'NestedUserSerializer', +] + + +# +# Users +# + +class NestedUserSerializer(WritableNestedSerializer): + + class Meta: + model = User + fields = ['id', 'username'] diff --git a/netbox/users/api/serializers.py b/netbox/users/api/serializers.py index d97ba7ed1..86d350e69 100644 --- a/netbox/users/api/serializers.py +++ b/netbox/users/api/serializers.py @@ -1,10 +1,4 @@ -from django.contrib.auth.models import User - -from utilities.api import WritableNestedSerializer +from .nested_serializers import * -class NestedUserSerializer(WritableNestedSerializer): - - class Meta: - model = User - fields = ['id', 'username'] +# Placeholder for future serializers diff --git a/netbox/virtualization/api/nested_serializers.py b/netbox/virtualization/api/nested_serializers.py new file mode 100644 index 000000000..fb6e2b0be --- /dev/null +++ b/netbox/virtualization/api/nested_serializers.py @@ -0,0 +1,62 @@ +from rest_framework import serializers + +from dcim.models import Interface +from utilities.api import WritableNestedSerializer +from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine + +__all__ = [ + 'NestedClusterGroupSerializer', + 'NestedClusterSerializer', + 'NestedClusterTypeSerializer', + 'NestedInterfaceSerializer', + 'NestedVirtualMachineSerializer', +] + +# +# Clusters +# + + +class NestedClusterTypeSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:clustertype-detail') + + class Meta: + model = ClusterType + fields = ['id', 'url', 'name', 'slug'] + + +class NestedClusterGroupSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:clustergroup-detail') + + class Meta: + model = ClusterGroup + fields = ['id', 'url', 'name', 'slug'] + + +class NestedClusterSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:cluster-detail') + + class Meta: + model = Cluster + fields = ['id', 'url', 'name'] + + +# +# Virtual machines +# + +class NestedVirtualMachineSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:virtualmachine-detail') + + class Meta: + model = VirtualMachine + fields = ['id', 'url', 'name'] + + +class NestedInterfaceSerializer(WritableNestedSerializer): + url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:interface-detail') + virtual_machine = NestedVirtualMachineSerializer(read_only=True) + + class Meta: + model = Interface + fields = ['id', 'url', 'virtual_machine', 'name'] diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py index 0c1bf927c..1f2b957fc 100644 --- a/netbox/virtualization/api/serializers.py +++ b/netbox/virtualization/api/serializers.py @@ -1,19 +1,21 @@ from rest_framework import serializers from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField -from dcim.api.serializers import NestedDeviceRoleSerializer, NestedPlatformSerializer, NestedSiteSerializer +from dcim.api.nested_serializers import NestedDeviceRoleSerializer, NestedPlatformSerializer, NestedSiteSerializer from dcim.constants import IFACE_FF_CHOICES, IFACE_FF_VIRTUAL, IFACE_MODE_CHOICES from dcim.models import Interface from extras.api.customfields import CustomFieldModelSerializer -from ipam.models import IPAddress, VLAN -from tenancy.api.serializers import NestedTenantSerializer -from utilities.api import ChoiceField, SerializedPKRelatedField, ValidatedModelSerializer, WritableNestedSerializer +from ipam.api.nested_serializers import NestedIPAddressSerializer, NestedVLANSerializer +from ipam.models import VLAN +from tenancy.api.nested_serializers import NestedTenantSerializer +from utilities.api import ChoiceField, SerializedPKRelatedField, ValidatedModelSerializer from virtualization.constants import VM_STATUS_CHOICES from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine +from .nested_serializers import * # -# Cluster types +# Clusters # class ClusterTypeSerializer(ValidatedModelSerializer): @@ -23,18 +25,6 @@ class ClusterTypeSerializer(ValidatedModelSerializer): fields = ['id', 'name', 'slug'] -class NestedClusterTypeSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:clustertype-detail') - - class Meta: - model = ClusterType - fields = ['id', 'url', 'name', 'slug'] - - -# -# Cluster groups -# - class ClusterGroupSerializer(ValidatedModelSerializer): class Meta: @@ -42,18 +32,6 @@ class ClusterGroupSerializer(ValidatedModelSerializer): fields = ['id', 'name', 'slug'] -class NestedClusterGroupSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:clustergroup-detail') - - class Meta: - model = ClusterGroup - fields = ['id', 'url', 'name', 'slug'] - - -# -# Clusters -# - class ClusterSerializer(TaggitSerializer, CustomFieldModelSerializer): type = NestedClusterTypeSerializer() group = NestedClusterGroupSerializer(required=False, allow_null=True) @@ -67,27 +45,10 @@ class ClusterSerializer(TaggitSerializer, CustomFieldModelSerializer): ] -class NestedClusterSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:cluster-detail') - - class Meta: - model = Cluster - fields = ['id', 'url', 'name'] - - # # Virtual machines # -# Cannot import ipam.api.NestedIPAddressSerializer due to circular dependency -class VirtualMachineIPAddressSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='ipam-api:ipaddress-detail') - - class Meta: - model = IPAddress - fields = ['id', 'url', 'family', 'address'] - - class VirtualMachineSerializer(TaggitSerializer, CustomFieldModelSerializer): status = ChoiceField(choices=VM_STATUS_CHOICES, required=False) site = NestedSiteSerializer(read_only=True) @@ -95,17 +56,17 @@ class VirtualMachineSerializer(TaggitSerializer, CustomFieldModelSerializer): role = NestedDeviceRoleSerializer(required=False, allow_null=True) tenant = NestedTenantSerializer(required=False, allow_null=True) platform = NestedPlatformSerializer(required=False, allow_null=True) - primary_ip = VirtualMachineIPAddressSerializer(read_only=True) - primary_ip4 = VirtualMachineIPAddressSerializer(required=False, allow_null=True) - primary_ip6 = VirtualMachineIPAddressSerializer(required=False, allow_null=True) + primary_ip = NestedIPAddressSerializer(read_only=True) + primary_ip4 = NestedIPAddressSerializer(required=False, allow_null=True) + primary_ip6 = NestedIPAddressSerializer(required=False, allow_null=True) tags = TagListSerializerField(required=False) class Meta: model = VirtualMachine fields = [ 'id', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'platform', 'primary_ip', 'primary_ip4', - 'primary_ip6', 'vcpus', 'memory', 'disk', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', - 'local_context_data', + 'primary_ip6', 'vcpus', 'memory', 'disk', 'comments', 'local_context_data', 'tags', 'custom_fields', + 'created', 'last_updated', ] @@ -114,44 +75,27 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer): class Meta(VirtualMachineSerializer.Meta): fields = [ - 'id', 'name', 'status', 'cluster', 'role', 'tenant', 'platform', 'primary_ip', 'primary_ip4', 'primary_ip6', - 'vcpus', 'memory', 'disk', 'comments', 'tags', 'custom_fields', 'config_context', 'created', 'last_updated', - 'local_context_data', + 'id', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'platform', 'primary_ip', 'primary_ip4', + 'primary_ip6', 'vcpus', 'memory', 'disk', 'comments', 'local_context_data', 'tags', 'custom_fields', + 'config_context', 'created', 'last_updated', ] def get_config_context(self, obj): return obj.get_config_context() -class NestedVirtualMachineSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:virtualmachine-detail') - - class Meta: - model = VirtualMachine - fields = ['id', 'url', 'name'] - - # # VM interfaces # -# Cannot import ipam.api.serializers.NestedVLANSerializer due to circular dependency -class InterfaceVLANSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlan-detail') - - class Meta: - model = VLAN - fields = ['id', 'url', 'vid', 'name', 'display_name'] - - class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer): virtual_machine = NestedVirtualMachineSerializer() form_factor = ChoiceField(choices=IFACE_FF_CHOICES, default=IFACE_FF_VIRTUAL, required=False) mode = ChoiceField(choices=IFACE_MODE_CHOICES, required=False, allow_null=True) - untagged_vlan = InterfaceVLANSerializer(required=False, allow_null=True) + untagged_vlan = NestedVLANSerializer(required=False, allow_null=True) tagged_vlans = SerializedPKRelatedField( queryset=VLAN.objects.all(), - serializer=InterfaceVLANSerializer, + serializer=NestedVLANSerializer, required=False, many=True ) @@ -163,12 +107,3 @@ class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer): 'id', 'virtual_machine', 'name', 'form_factor', 'enabled', 'mtu', 'mac_address', 'description', 'mode', 'untagged_vlan', 'tagged_vlans', 'tags', ] - - -class NestedInterfaceSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:interface-detail') - virtual_machine = NestedVirtualMachineSerializer(read_only=True) - - class Meta: - model = Interface - fields = ['id', 'url', 'virtual_machine', 'name'] From 59589fdd2980bcaf66c64ffb8515eb6d0d202f7c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 12 Nov 2018 12:04:04 -0500 Subject: [PATCH 145/191] Fixes #2580: Remove erroneous CSS class from "add components" button --- netbox/templates/dcim/device.html | 2 +- netbox/templates/dcim/devicetype.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 79030b69b..cfcd6f51a 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -36,7 +36,7 @@
      {% if perms.dcim.change_device %}
      -
        diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 0b0f8698b..dba230fe2 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -17,7 +17,7 @@
        {% if perms.dcim.change_devicetype %}
        -
          From 9543b5e716520c1860ee916c786331ee86a69e01 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Mon, 12 Nov 2018 22:15:06 -0500 Subject: [PATCH 146/191] fixed #2584 - validation for connecting front port to corresponding rear port --- netbox/dcim/models.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index d3c18d7e2..9a0a59bb8 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2530,9 +2530,19 @@ class Cable(ChangeLoggedModel): # A termination point cannot be connected to itself if self.termination_a == self.termination_b: - print("Validation failed: same interface") raise ValidationError("Cannot connect {} to itself".format(self.termination_a_type)) + # A front port cannot be connected to its corresponding rear port + if ( + type_a in ['frontport', 'rearport'] and + type_b in ['frontport', 'rearport'] and + ( + getattr(self.termination_a, 'rear_port', None) == self.termination_b or + getattr(self.termination_b, 'rear_port', None) == self.termination_a + ) + ): + raise ValidationError("A front port cannot be connected to it corresponding rear port") + # Check for an existing Cable connected to either termination object if self.termination_a.cable not in (None, self): raise ValidationError("{} already has a cable attached (#{})".format( From 7cd0e0b244990c09b087062d30fce29e6a5ce933 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Mon, 12 Nov 2018 22:19:30 -0500 Subject: [PATCH 147/191] #2584 changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d5ee0345..2bf59a8b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#2574](https://github.com/digitalocean/netbox/issues/2574) - Remove duplicate interface links from topology maps * [#2578](https://github.com/digitalocean/netbox/issues/2578) - Reorganized nested serializers * [#2579](https://github.com/digitalocean/netbox/issues/2579) - Add missing cable disconnect buttons for front/rear ports +* [#2584](https://github.com/digitalocean/netbox/issues/2584) - Prevent a Front port from being connected to its corresponding rear port ## API Changes From 8a6913fe19f246deeaaa9de22e5adccb1cd4a981 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Mon, 12 Nov 2018 23:18:23 -0500 Subject: [PATCH 148/191] fixed #2585 - connections with virtual interfaces --- netbox/dcim/models.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 9a0a59bb8..501bf32cb 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2553,6 +2553,20 @@ class Cable(ChangeLoggedModel): self.termination_b, self.termination_b.cable_id )) + # Virtual interfaces cannot be connected + endpoint_a, endpoint_b = self.get_path_endpoints() + if ( + ( + isinstance(endpoint_a, Interface) and + endpoint_a.form_factor == IFACE_FF_VIRTUAL + ) or + ( + isinstance(endpoint_b, Interface) and + endpoint_b.form_factor == IFACE_FF_VIRTUAL + ) + ): + raise ValidationError("Cannot connect to a virtual interface") + # Validate length and length_unit if self.length and not self.length_unit: raise ValidationError("Must specify a unit when setting a cable length") From 7887a70b70bd3ca054ed676077876649d3933324 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Mon, 12 Nov 2018 23:20:17 -0500 Subject: [PATCH 149/191] #2585 changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bf59a8b6..cff931e92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#2578](https://github.com/digitalocean/netbox/issues/2578) - Reorganized nested serializers * [#2579](https://github.com/digitalocean/netbox/issues/2579) - Add missing cable disconnect buttons for front/rear ports * [#2584](https://github.com/digitalocean/netbox/issues/2584) - Prevent a Front port from being connected to its corresponding rear port +* [#2585](https://github.com/digitalocean/netbox/issues/2585) - Prevent cable connections that include a virtual interface ## API Changes From 65bc8f0254886dba2a2bdd69a7a0730169f569dd Mon Sep 17 00:00:00 2001 From: John Anderson Date: Mon, 12 Nov 2018 23:26:08 -0500 Subject: [PATCH 150/191] resolved #2586 - tests for the Cable model clean method --- netbox/dcim/tests/test_models.py | 53 ++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py index d2072812c..dbacbd98a 100644 --- a/netbox/dcim/tests/test_models.py +++ b/netbox/dcim/tests/test_models.py @@ -174,6 +174,16 @@ class CableTestCase(TestCase): self.cable = Cable(termination_a=self.interface1, termination_b=self.interface2) self.cable.save() + self.power_port1 = PowerPort.objects.create(device=self.device2, name='psu1') + self.patch_pannel = Device.objects.create( + device_type=devicetype, device_role=devicerole, name='TestPatchPannel', site=site + ) + self.rear_port = RearPort.objects.create(device=self.patch_pannel, name='R1', type=1000) + self.front_port = FrontPort.objects.create( + device=self.patch_pannel, name='F1', type=1000, rear_port=self.rear_port + ) + + def test_cable_creation(self): """ When a new Cable is created, it must be cached on either termination point. @@ -200,3 +210,46 @@ class CableTestCase(TestCase): self.interface1.delete() cable = Cable.objects.filter(pk=self.cable.pk).first() self.assertIsNone(cable) + + def test_cable_validates_compatibale_types(self): + """ + The clean method should have a check to ensure only compatiable port types can be connected by a cable + """ + # An interface cannot be connected to a power port + cable = Cable(termination_a=self.interface1, termination_b=self.power_port1) + with self.assertRaises(ValidationError): + cable.clean() + + def test_cable_cannot_have_the_same_terminination_on_both_ends(self): + """ + A cable cannot be made with the same A and B side terminations + """ + cable = Cable(termination_a=self.interface1, termination_b=self.interface1) + with self.assertRaises(ValidationError): + cable.clean() + + def test_cable_front_port_cannot_connect_to_corresponding_rear_port(self): + """ + A cable cannot connect a front port to its sorresponding rear port + """ + cable = Cable(termination_a=self.front_port, termination_b=self.rear_port) + with self.assertRaises(ValidationError): + cable.clean() + + def test_cable_cannot_be_connected_to_an_existing_connection(self): + """ + Either side of a cable cannot be terminated when that side aready has a connection + """ + # Try to create a cable with the same interface terminations + cable = Cable(termination_a=self.interface2, termination_b=self.interface1) + with self.assertRaises(ValidationError): + cable.clean() + + def test_cable_cannot_connect_to_a_virtual_inteface(self): + """ + A cable connection cannot include a virtual interface + """ + virtual_interface = Interface(device=self.device1, name="V1", form_factor=0) + cable = Cable(termination_a=self.interface2, termination_b=virtual_interface) + with self.assertRaises(ValidationError): + cable.clean() From 5649024d9353a5c7db10deefe096e35d876da22b Mon Sep 17 00:00:00 2001 From: John Anderson Date: Mon, 12 Nov 2018 23:27:14 -0500 Subject: [PATCH 151/191] #2586 changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cff931e92..f4f2e91ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#2579](https://github.com/digitalocean/netbox/issues/2579) - Add missing cable disconnect buttons for front/rear ports * [#2584](https://github.com/digitalocean/netbox/issues/2584) - Prevent a Front port from being connected to its corresponding rear port * [#2585](https://github.com/digitalocean/netbox/issues/2585) - Prevent cable connections that include a virtual interface +* [#2586](https://github.com/digitalocean/netbox/issues/2585) - Added tests for the Cable model's clean() method ## API Changes From fc41359df638dea63e1c67cfabf4a22f70c72211 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Mon, 12 Nov 2018 23:34:14 -0500 Subject: [PATCH 152/191] removed blank line --- netbox/dcim/tests/test_models.py | 1 - 1 file changed, 1 deletion(-) diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py index dbacbd98a..93336de24 100644 --- a/netbox/dcim/tests/test_models.py +++ b/netbox/dcim/tests/test_models.py @@ -183,7 +183,6 @@ class CableTestCase(TestCase): device=self.patch_pannel, name='F1', type=1000, rear_port=self.rear_port ) - def test_cable_creation(self): """ When a new Cable is created, it must be cached on either termination point. From f8e6cfbeba67bfc11fd613d4fc69750427816f48 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 13 Nov 2018 10:31:44 -0500 Subject: [PATCH 153/191] Closes #2426: Introduced SESSION_FILE_PATH configuration setting for authentication without write access to database --- CHANGELOG.md | 1 + docs/configuration/optional-settings.md | 8 ++++++++ netbox/netbox/configuration.example.py | 13 +++++++++---- netbox/netbox/settings.py | 5 +++++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4f2e91ad..969235c58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#2165](https://github.com/digitalocean/netbox/issues/2165) - Improved natural ordering of Interfaces * [#2292](https://github.com/digitalocean/netbox/issues/2292) - Removed the deprecated UserAction model * [#2367](https://github.com/digitalocean/netbox/issues/2367) - Removed deprecated RPCClient functionality +* [#2426](https://github.com/digitalocean/netbox/issues/2426) - Introduced `SESSION_FILE_PATH` configuration setting for authentication without write access to database ## Changes From v2.5-beta1 diff --git a/docs/configuration/optional-settings.md b/docs/configuration/optional-settings.md index b4de6fe7b..ee266ecc1 100644 --- a/docs/configuration/optional-settings.md +++ b/docs/configuration/optional-settings.md @@ -223,6 +223,14 @@ The file path to the location where custom reports will be kept. By default, thi --- +## SESSION_FILE_PATH + +Default: None + +Session data is used to track authenticated users when they access NetBox. By default, NetBox stores session data in the PostgreSQL database. However, this inhibits authentication to a standby instance of NetBox without write access to the database. Alternatively, a local file path may be specified here and NetBox will store session data as files instead of using the database. Note that the user as which NetBox runs must have read and write permissions to this path. + +--- + ## TIME_ZONE Default: UTC diff --git a/netbox/netbox/configuration.example.py b/netbox/netbox/configuration.example.py index 23d6ba221..34f1bff8d 100644 --- a/netbox/netbox/configuration.example.py +++ b/netbox/netbox/configuration.example.py @@ -121,10 +121,6 @@ PAGINATE_COUNT = 50 # prefer IPv4 instead. PREFER_IPV4 = False -# The Webhook event backend is disabled by default. Set this to True to enable it. Note that this requires a Redis -# database be configured and accessible by NetBox (see `REDIS` below). -WEBHOOKS_ENABLED = False - # Redis database settings (optional). A Redis database is required only if the webhooks backend is enabled. REDIS = { 'HOST': 'localhost', @@ -138,9 +134,18 @@ REDIS = { # this setting is derived from the installed location. # REPORTS_ROOT = '/opt/netbox/netbox/reports' +# By default, NetBox will store session data in the database. Alternatively, a file path can be specified here to use +# local file storage instead. (This can be useful for enabling authentication on a standby instance with read-only +# database access.) Note that the user as which NetBox runs must have read and write permissions to this path. +SESSION_FILE_PATH = None + # Time zone (default: UTC) TIME_ZONE = 'UTC' +# The webhooks backend is disabled by default. Set this to True to enable it. Note that this requires a Redis +# database be configured and accessible by NetBox. +WEBHOOKS_ENABLED = False + # Date/time formatting. See the following link for supported formats: # https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'N j, Y' diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 67ad50655..800d39d82 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -65,6 +65,7 @@ PAGINATE_COUNT = getattr(configuration, 'PAGINATE_COUNT', 50) PREFER_IPV4 = getattr(configuration, 'PREFER_IPV4', False) REPORTS_ROOT = getattr(configuration, 'REPORTS_ROOT', os.path.join(BASE_DIR, 'reports')).rstrip('/') REDIS = getattr(configuration, 'REDIS', {}) +SESSION_FILE_PATH = getattr(configuration, 'SESSION_FILE_PATH', None) SHORT_DATE_FORMAT = getattr(configuration, 'SHORT_DATE_FORMAT', 'Y-m-d') SHORT_DATETIME_FORMAT = getattr(configuration, 'SHORT_DATETIME_FORMAT', 'Y-m-d H:i') SHORT_TIME_FORMAT = getattr(configuration, 'SHORT_TIME_FORMAT', 'H:i:s') @@ -111,6 +112,10 @@ DATABASES = { 'default': configuration.DATABASE, } +# Sessions +if SESSION_FILE_PATH is not None: + SESSION_ENGINE = 'django.contrib.sessions.backends.file' + # Redis REDIS_HOST = REDIS.get('HOST', 'localhost') REDIS_PORT = REDIS.get('PORT', 6379) From 63bd48003e545efea676468149aabadf492d71f1 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 14 Nov 2018 12:17:18 -0500 Subject: [PATCH 154/191] Clean up cable termination types --- netbox/dcim/forms.py | 2 ++ netbox/templates/dcim/cable_connect.html | 7 +++++++ netbox/templates/dcim/inc/cable_termination.html | 7 +++++++ netbox/utilities/templates/widgets/select_contenttype.html | 2 +- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 7b8c13ffa..257907015 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1851,6 +1851,8 @@ class CableCreateForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): termination_a_type = self.instance.termination_a._meta.model_name self.fields['termination_b_type'].queryset = ContentType.objects.filter( model__in=COMPATIBLE_TERMINATION_TYPES.get(termination_a_type) + ).exclude( + model='circuittermination' ) diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html index 9706dad9f..4b431ed16 100644 --- a/netbox/templates/dcim/cable_connect.html +++ b/netbox/templates/dcim/cable_connect.html @@ -1,5 +1,6 @@ {% extends '_base.html' %} {% load static %} +{% load helpers %} {% load form_helpers %} {% block content %} @@ -49,6 +50,12 @@

          {{ termination_a.device }}

        +
        + +
        +

        {{ termination_a|model_name|capfirst }}

        +
        +
        diff --git a/netbox/templates/dcim/inc/cable_termination.html b/netbox/templates/dcim/inc/cable_termination.html index e1b0959bb..e7b2891e7 100644 --- a/netbox/templates/dcim/inc/cable_termination.html +++ b/netbox/templates/dcim/inc/cable_termination.html @@ -1,3 +1,4 @@ +{% load helpers %} {% if termination.device %} {# Device component #} @@ -7,6 +8,12 @@ {{ termination.device }} + + + + diff --git a/netbox/utilities/templates/widgets/select_contenttype.html b/netbox/utilities/templates/widgets/select_contenttype.html index ca7fe326e..04c42c371 100644 --- a/netbox/utilities/templates/widgets/select_contenttype.html +++ b/netbox/utilities/templates/widgets/select_contenttype.html @@ -1 +1 @@ - + From 641254b23aca2f5986b155268d527c7e5f8c00bb Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 14 Nov 2018 14:18:32 -0500 Subject: [PATCH 155/191] Closes #2053: Introduced the LOGIN_TIMEOUT configuration setting --- CHANGELOG.md | 1 + docs/configuration/optional-settings.md | 8 ++++++++ netbox/netbox/configuration.example.py | 4 ++++ netbox/netbox/settings.py | 8 ++++++++ 4 files changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 969235c58..1496c5ead 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#1444](https://github.com/digitalocean/netbox/issues/1444) - Added an `asset_tag` field for racks * [#1931](https://github.com/digitalocean/netbox/issues/1931) - Added a count of assigned IP addresses to the interface API serializer * [#2000](https://github.com/digitalocean/netbox/issues/2000) - Dropped support for Python 2 +* [#2053](https://github.com/digitalocean/netbox/issues/2053) - Introduced the `LOGIN_TIMEOUT` configuration setting * [#2057](https://github.com/digitalocean/netbox/issues/2057) - Added description columns to interface connections list * [#2104](https://github.com/digitalocean/netbox/issues/2104) - Added a `status` field for racks * [#2165](https://github.com/digitalocean/netbox/issues/2165) - Improved natural ordering of Interfaces diff --git a/docs/configuration/optional-settings.md b/docs/configuration/optional-settings.md index ee266ecc1..82412cdf7 100644 --- a/docs/configuration/optional-settings.md +++ b/docs/configuration/optional-settings.md @@ -133,6 +133,14 @@ Setting this to True will permit only authenticated users to access any part of --- +## LOGIN_TIMEOUT + +Default: 1209600 seconds (14 days) + +The liftetime (in seconds) of the authentication cookie issued to a NetBox user upon login. + +--- + ## MAINTENANCE_MODE Default: False diff --git a/netbox/netbox/configuration.example.py b/netbox/netbox/configuration.example.py index 34f1bff8d..d7a9cf2ed 100644 --- a/netbox/netbox/configuration.example.py +++ b/netbox/netbox/configuration.example.py @@ -91,6 +91,10 @@ LOGGING = {} # are permitted to access most data in NetBox (excluding secrets) but not make any changes. LOGIN_REQUIRED = False +# The length of time (in seconds) for which a user will remain logged into the web UI before being prompted to +# re-authenticate. (Default: 1209600 [14 days]) +LOGIN_TIMEOUT = None + # Setting this to True will display a "maintenance mode" banner at the top of every page. MAINTENANCE_MODE = False diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 800d39d82..75d4f3197 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -54,6 +54,7 @@ ENFORCE_GLOBAL_UNIQUE = getattr(configuration, 'ENFORCE_GLOBAL_UNIQUE', False) EMAIL = getattr(configuration, 'EMAIL', {}) LOGGING = getattr(configuration, 'LOGGING', {}) LOGIN_REQUIRED = getattr(configuration, 'LOGIN_REQUIRED', False) +LOGIN_TIMEOUT = getattr(configuration, 'LOGIN_TIMEOUT', None) MAINTENANCE_MODE = getattr(configuration, 'MAINTENANCE_MODE', False) MAX_PAGE_SIZE = getattr(configuration, 'MAX_PAGE_SIZE', 1000) MEDIA_ROOT = getattr(configuration, 'MEDIA_ROOT', os.path.join(BASE_DIR, 'media')).rstrip('/') @@ -113,6 +114,13 @@ DATABASES = { } # Sessions +if LOGIN_TIMEOUT is not None: + if type(LOGIN_TIMEOUT) is not int or LOGIN_TIMEOUT < 0: + raise ImproperlyConfigured( + "LOGIN_TIMEOUT must be a positive integer (value: {})".format(LOGIN_TIMEOUT) + ) + # Django default is 1209600 seconds (14 days) + SESSION_COOKIE_AGE = LOGIN_TIMEOUT if SESSION_FILE_PATH is not None: SESSION_ENGINE = 'django.contrib.sessions.backends.file' From 3c0181ef35ad74295c64618057ecaac23e36384f Mon Sep 17 00:00:00 2001 From: John Anderson Date: Wed, 14 Nov 2018 23:35:15 -0500 Subject: [PATCH 156/191] added logic to append &type=physical to interface API query for cable creation - #2585 --- netbox/dcim/forms.py | 5 ++++- netbox/project-static/js/forms.js | 17 ++++++++++++++++- netbox/utilities/forms.py | 17 ++++++++++++++++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 257907015..83cdff29e 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1833,7 +1833,10 @@ class CableCreateForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): label='Name', widget=APISelect( api_url='/api/dcim/{{termination_b_type}}s/?device_id={{termination_b_device}}', - disabled_indicator='cable' + disabled_indicator='cable', + url_conditional_append={ + 'termination_b_type__interface': '&type=physical', + } ) ) diff --git a/netbox/project-static/js/forms.js b/netbox/project-static/js/forms.js index 7ea4b152b..a494664c7 100644 --- a/netbox/project-static/js/forms.js +++ b/netbox/project-static/js/forms.js @@ -91,8 +91,9 @@ $(document).ready(function() { var filter_regex = /\{\{([a-z_]+)\}\}/g; var match; var rendered_url = api_url; + var filter_field; while (match = filter_regex.exec(api_url)) { - var filter_field = $('#id_' + match[1]); + filter_field = $('#id_' + match[1]); var custom_attr = $('option:selected', filter_field).attr('api-value'); if (custom_attr) { rendered_url = rendered_url.replace(match[0], custom_attr); @@ -103,6 +104,20 @@ $(document).ready(function() { } } + // Account for any conditional URL append strings + $.each(child_field[0].attributes, function(index, attr){ + if (attr.name.includes("data-url-conditional-append-")){ + var conditional = attr.name.split("data-url-conditional-append-")[1].split("__"); + var field = $("#id_" + conditional[0]); + var field_value = conditional[1]; + console.log($('option:selected', field).attr('api-value')); + if ($('option:selected', field).attr('api-value') === field_value){ + console.log(attr.value); + rendered_url = rendered_url + attr.value; + } + } + }) + // If all URL variables have been replaced, make the API call if (rendered_url.search('{{') < 0) { console.log(child_name + ": Fetching " + rendered_url); diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index baa035aa7..51e553cf9 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -258,9 +258,21 @@ class APISelect(SelectWithDisabled): :param api_url: API URL :param display_field: (Optional) Field to display for child in selection list. Defaults to `name`. :param disabled_indicator: (Optional) Mark option as disabled if this field equates true. + :param url_conditional_append: (Optional) A dict of URL query strings to append to the URL if the + condition is met. The condition is the dict key and is specified in the form `__`. + If the provided field value is selected for the given field, the URL query string will be appended to + the rendered URL. This is useful in cases where a particular field value dictates an additional API filter. """ - def __init__(self, api_url, display_field=None, disabled_indicator=None, *args, **kwargs): + def __init__( + self, + api_url, + display_field=None, + disabled_indicator=None, + url_conditional_append=None, + *args, + **kwargs + ): super(APISelect, self).__init__(*args, **kwargs) @@ -270,6 +282,9 @@ class APISelect(SelectWithDisabled): self.attrs['display-field'] = display_field if disabled_indicator: self.attrs['disabled-indicator'] = disabled_indicator + if url_conditional_append: + for key, value in url_conditional_append.items(): + self.attrs["data-url-conditional-append-{}".format(key)] = value class APISelectMultiple(APISelect): From fd9b2f2fdaca92e116963ad7e2ec78413fe6c0de Mon Sep 17 00:00:00 2001 From: John Anderson Date: Thu, 15 Nov 2018 00:42:01 -0500 Subject: [PATCH 157/191] cleanup component filters and UI filter forms for device and device type - #2583 --- netbox/dcim/filters.py | 104 +++++++++++++----------------- netbox/dcim/forms.py | 92 +++++++++++++++++--------- netbox/project-static/js/forms.js | 2 - netbox/utilities/forms.py | 5 ++ 4 files changed, 113 insertions(+), 90 deletions(-) diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index aa18f46c6..50929512e 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -299,7 +299,7 @@ class ManufacturerFilter(django_filters.FilterSet): fields = ['name', 'slug'] -class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet): +class DeviceTypeFilter(CustomFieldFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -318,27 +318,27 @@ class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet): to_field_name='slug', label='Manufacturer (slug)', ) - console_ports = django_filters.CharFilter( + console_ports = django_filters.BooleanFilter( method='_console_ports', label='Has console ports', ) - console_server_ports = django_filters.CharFilter( + console_server_ports = django_filters.BooleanFilter( method='_console_server_ports', label='Has console server ports', ) - power_ports = django_filters.CharFilter( + power_ports = django_filters.BooleanFilter( method='_power_ports', label='Has power ports', ) - power_outlets = django_filters.CharFilter( + power_outlets = django_filters.BooleanFilter( method='_power_outlets', label='Has power outlets', ) - interfaces = django_filters.CharFilter( + interfaces = django_filters.BooleanFilter( method='_interfaces', label='Has interfaces', ) - pass_through_ports = django_filters.CharFilter( + pass_through_ports = django_filters.BooleanFilter( method='_pass_through_ports', label='Has pass-through ports', ) @@ -361,30 +361,24 @@ class DeviceTypeFilter(CustomFieldFilterSet, django_filters.FilterSet): ) def _console_ports(self, queryset, name, value): - value = value.strip() - return queryset.exclude(consoleport_templates__isnull=bool(value)) + return queryset.exclude(consoleport_templates__isnull=value) def _console_server_ports(self, queryset, name, value): - value = value.strip() - return queryset.exclude(consoleserverport_templates__isnull=bool(value)) + return queryset.exclude(consoleserverport_templates__isnull=value) def _power_ports(self, queryset, name, value): - value = value.strip() - return queryset.exclude(powerport_templates__isnull=bool(value)) + return queryset.exclude(powerport_templates__isnull=value) def _power_outlets(self, queryset, name, value): - value = value.strip() - return queryset.exclude(poweroutlet_templates__isnull=bool(value)) + return queryset.exclude(poweroutlet_templates__isnull=value) def _interfaces(self, queryset, name, value): - value = value.strip() - return queryset.exclude(interface_templates__isnull=bool(value)) + return queryset.exclude(interface_templates__isnull=value) def _pass_through_ports(self, queryset, name, value): - value = value.strip() return queryset.exclude( - frontport_templates__isnull=bool(value), - rearport_templates__isnull=bool(value) + frontport_templates__isnull=value, + rearport_templates__isnull=value ) @@ -477,7 +471,7 @@ class PlatformFilter(django_filters.FilterSet): fields = ['name', 'slug'] -class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): +class DeviceFilter(CustomFieldFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -582,30 +576,6 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): field_name='device_type__is_full_depth', label='Is full depth', ) - console_ports = django_filters.CharFilter( - method='_console_ports', - label='Has console ports', - ) - console_server_ports = django_filters.CharFilter( - method='_console_server_ports', - label='Has console server ports', - ) - power_ports = django_filters.CharFilter( - method='_power_ports', - label='Has power ports', - ) - power_outlets = django_filters.CharFilter( - method='_power_outlets', - label='Has power outlets', - ) - interfaces = django_filters.CharFilter( - method='_interfaces', - label='Has interfaces', - ) - pass_through_ports = django_filters.CharFilter( - method='_pass_through_ports', - label='Has pass-through ports', - ) mac_address = django_filters.CharFilter( method='_mac_address', label='MAC address', @@ -619,6 +589,30 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): queryset=VirtualChassis.objects.all(), label='Virtual chassis (ID)', ) + console_ports = django_filters.BooleanFilter( + method='_console_ports', + label='Has console ports', + ) + console_server_ports = django_filters.BooleanFilter( + method='_console_server_ports', + label='Has console server ports', + ) + power_ports = django_filters.BooleanFilter( + method='_power_ports', + label='Has power ports', + ) + power_outlets = django_filters.BooleanFilter( + method='_power_outlets', + label='Has power outlets', + ) + interfaces = django_filters.BooleanFilter( + method='_interfaces', + label='Has interfaces', + ) + pass_through_ports = django_filters.BooleanFilter( + method='_pass_through_ports', + label='Has pass-through ports', + ) tag = TagFilter() class Meta: @@ -669,30 +663,24 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): ) def _console_ports(self, queryset, name, value): - value = value.strip() - return queryset.exclude(consoleports__isnull=bool(value)) + return queryset.exclude(consoleports__isnull=value) def _console_server_ports(self, queryset, name, value): - value = value.strip() - return queryset.exclude(consoleserverports__isnull=bool(value)) + return queryset.exclude(consoleserverports__isnull=value) def _power_ports(self, queryset, name, value): - value = value.strip() - return queryset.exclude(powerports__isnull=bool(value)) + return queryset.exclude(powerports__isnull=value) def _power_outlets(self, queryset, name, value): - value = value.strip() - return queryset.exclude(poweroutlets__isnull=bool(value)) + return queryset.exclude(poweroutlets_isnull=value) def _interfaces(self, queryset, name, value): - value = value.strip() - return queryset.exclude(interfaces__isnull=bool(value)) + return queryset.exclude(interfaces__isnull=value) def _pass_through_ports(self, queryset, name, value): - value = value.strip() return queryset.exclude( - frontports__isnull=bool(value), - rearports__isnull=bool(value) + frontports__isnull=value, + rearports__isnull=value ) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 83cdff29e..27f03ef3b 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -19,7 +19,7 @@ from utilities.forms import ( BulkEditNullBooleanSelect, ChainedFieldsMixin, ChainedModelChoiceField, ColorSelect, CommentField, ComponentForm, ConfirmationForm, ContentTypeSelect, CSVChoiceField, ExpandableNameField, FilterChoiceField, FilterTreeNodeMultipleChoiceField, FlexibleModelChoiceField, JSONField, Livesearch, SelectWithPK, SmallTextarea, - SlugField, COLOR_CHOICES, + SlugField, BOOLEAN_WITH_BLANK_CHOICES, COLOR_CHOICES, ) from virtualization.models import Cluster @@ -650,35 +650,41 @@ class DeviceTypeFilterForm(BootstrapMixin, CustomFieldFilterForm): queryset=Manufacturer.objects.annotate(filter_count=Count('device_types')), to_field_name='slug' ) - console_ports = forms.BooleanField( - required=False, - label='Has console ports' - ) - console_server_ports = forms.BooleanField( - required=False, - label='Has console server ports' - ) - power_ports = forms.BooleanField( - required=False, - label='Has power ports' - ) - power_outlets = forms.BooleanField( - required=False, - label='Has power outlets' - ) - interfaces = forms.BooleanField( - required=False, - label='Has interfaces' - ) - pass_through_ports = forms.BooleanField( - required=False, - label='Has pass-through ports' - ) subdevice_role = forms.NullBooleanField( required=False, label='Subdevice role', widget=forms.Select(choices=add_blank_choice(SUBDEVICE_ROLE_CHOICES)) ) + console_ports = forms.NullBooleanField( + required=False, + label='Has console ports', + widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES) + ) + console_server_ports = forms.NullBooleanField( + required=False, + label='Has console server ports', + widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES) + ) + power_ports = forms.NullBooleanField( + required=False, + label='Has power ports', + widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES) + ) + power_outlets = forms.NullBooleanField( + required=False, + label='Has power outlets', + widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES) + ) + interfaces = forms.NullBooleanField( + required=False, + label='Has interfaces', + widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES) + ) + pass_through_ports = forms.NullBooleanField( + required=False, + label='Has pass-through ports', + widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES) + ) # @@ -1316,11 +1322,37 @@ class DeviceFilterForm(BootstrapMixin, CustomFieldFilterForm): has_primary_ip = forms.NullBooleanField( required=False, label='Has a primary IP', - widget=forms.Select(choices=[ - ('', '---------'), - ('True', 'Yes'), - ('False', 'No'), - ]) + widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES) + ) + console_ports = forms.NullBooleanField( + required=False, + label='Has console ports', + widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES) + ) + console_server_ports = forms.NullBooleanField( + required=False, + label='Has console server ports', + widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES) + ) + power_ports = forms.NullBooleanField( + required=False, + label='Has power ports', + widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES) + ) + power_outlets = forms.NullBooleanField( + required=False, + label='Has power outlets', + widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES) + ) + interfaces = forms.NullBooleanField( + required=False, + label='Has interfaces', + widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES) + ) + pass_through_ports = forms.NullBooleanField( + required=False, + label='Has pass-through ports', + widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES) ) diff --git a/netbox/project-static/js/forms.js b/netbox/project-static/js/forms.js index a494664c7..89bc3aee1 100644 --- a/netbox/project-static/js/forms.js +++ b/netbox/project-static/js/forms.js @@ -110,9 +110,7 @@ $(document).ready(function() { var conditional = attr.name.split("data-url-conditional-append-")[1].split("__"); var field = $("#id_" + conditional[0]); var field_value = conditional[1]; - console.log($('option:selected', field).attr('api-value')); if ($('option:selected', field).attr('api-value') === field_value){ - console.log(attr.value); rendered_url = rendered_url + attr.value; } } diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index 51e553cf9..181221fe3 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -42,6 +42,11 @@ NUMERIC_EXPANSION_PATTERN = r'\[((?:\d+[?:,-])+\d+)\]' ALPHANUMERIC_EXPANSION_PATTERN = r'\[((?:[a-zA-Z0-9]+[?:,-])+[a-zA-Z0-9]+)\]' IP4_EXPANSION_PATTERN = r'\[((?:[0-9]{1,3}[?:,-])+[0-9]{1,3})\]' IP6_EXPANSION_PATTERN = r'\[((?:[0-9a-f]{1,4}[?:,-])+[0-9a-f]{1,4})\]' +BOOLEAN_WITH_BLANK_CHOICES = ( + ('', '---------'), + ('True', 'Yes'), + ('False', 'No'), +) def parse_numeric_range(string, base=10): From dfe6ba5603a21eb19de1778e95d0dc36653965be Mon Sep 17 00:00:00 2001 From: John Anderson Date: Thu, 15 Nov 2018 00:55:47 -0500 Subject: [PATCH 158/191] #2583 changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1496c5ead..aed3d4304 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#2574](https://github.com/digitalocean/netbox/issues/2574) - Remove duplicate interface links from topology maps * [#2578](https://github.com/digitalocean/netbox/issues/2578) - Reorganized nested serializers * [#2579](https://github.com/digitalocean/netbox/issues/2579) - Add missing cable disconnect buttons for front/rear ports +* [#2583](https://github.com/digitalocean/netbox/issues/2583) - Cleaned up component filters for device and device type * [#2584](https://github.com/digitalocean/netbox/issues/2584) - Prevent a Front port from being connected to its corresponding rear port * [#2585](https://github.com/digitalocean/netbox/issues/2585) - Prevent cable connections that include a virtual interface * [#2586](https://github.com/digitalocean/netbox/issues/2585) - Added tests for the Cable model's clean() method From 7dde370ee1b104f8a484b24037b5bb12fe80125b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 15 Nov 2018 14:23:23 -0500 Subject: [PATCH 159/191] Fixes #2593: Fix toggling of connected cable's status --- CHANGELOG.md | 3 ++- netbox/templates/dcim/device.html | 18 +++++-------- .../dcim/inc/cable_toggle_buttons.html | 16 +++++++++++ netbox/templates/dcim/inc/consoleport.html | 27 ++++++------------- .../templates/dcim/inc/consoleserverport.html | 27 ++++++------------- netbox/templates/dcim/inc/frontport.html | 10 +++---- netbox/templates/dcim/inc/interface.html | 27 +++++-------------- netbox/templates/dcim/inc/poweroutlet.html | 27 ++++++------------- netbox/templates/dcim/inc/powerport.html | 27 ++++++------------- netbox/templates/dcim/inc/rearport.html | 10 +++---- 10 files changed, 71 insertions(+), 121 deletions(-) create mode 100644 netbox/templates/dcim/inc/cable_toggle_buttons.html diff --git a/CHANGELOG.md b/CHANGELOG.md index aed3d4304..1a8f02322 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,7 +56,8 @@ NetBox now supports modeling physical cables for console, power, and interface c * [#2583](https://github.com/digitalocean/netbox/issues/2583) - Cleaned up component filters for device and device type * [#2584](https://github.com/digitalocean/netbox/issues/2584) - Prevent a Front port from being connected to its corresponding rear port * [#2585](https://github.com/digitalocean/netbox/issues/2585) - Prevent cable connections that include a virtual interface -* [#2586](https://github.com/digitalocean/netbox/issues/2585) - Added tests for the Cable model's clean() method +* [#2586](https://github.com/digitalocean/netbox/issues/2586) - Added tests for the Cable model's clean() method +* [#2593](https://github.com/digitalocean/netbox/issues/2593) - Fix toggling of connected cable's status ## API Changes diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index cfcd6f51a..af4b9e209 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -776,8 +776,8 @@ {% block javascript %}
        Type + {{ termination|model_name|capfirst }} +
        Component {{ termination }}