nautobot 2.3.16__py3-none-any.whl → 2.4.0__py3-none-any.whl

nautobot/dcim/navigation.py

@@ -1,7 +1,4 @@
 from nautobot.core.apps import (
-    NavContext,
-    NavGrouping,
-    NavItem,
     NavMenuAddButton,
     NavMenuGroup,
     NavMenuItem,
@@ -188,6 +185,22 @@ menu_items = (
                             ),
                         ),
                     ),
+                    NavMenuItem(
+                        link="dcim:virtualdevicecontext_list",
+                        name="Virtual Device Contexts",
+                        weight=700,
+                        permissions=[
+                            "dcim.view_virtualdevicecontext",
+                        ],
+                        buttons=(
+                            NavMenuAddButton(
+                                link="dcim:virtualdevicecontext_add",
+                                permissions=[
+                                    "dcim.add_virtualdevicecontext",
+                                ],
+                            ),
+                        ),
+                    ),
                 ),
             ),
             NavMenuGroup(
@@ -358,11 +371,19 @@ menu_items = (
                     ),
                     NavMenuItem(
                         link="dcim:controllermanageddevicegroup_list",
-                        name="Managed Device Groups",
+                        name="Device Groups",
                         weight=200,
                         permissions=[
                             "dcim.view_controllermanageddevicegroup",
                         ],
+                        buttons=(
+                            NavMenuAddButton(
+                                link="dcim:controllermanageddevicegroup_add",
+                                permissions=[
+                                    "dcim.add_controllermanageddevicegroup",
+                                ],
+                            ),
+                        ),
                     ),
                 ),
             ),
@@ -551,223 +572,3 @@ menu_items = (
         ),
     ),
 )
-
-
-navigation = (
-    NavContext(
-        name="Inventory",
-        groups=(
-            NavGrouping(
-                name="Devices",
-                weight=100,
-                items=(
-                    NavItem(
-                        name="Devices",
-                        link="dcim:device_list",
-                        weight=100,
-                        permissions=["dcim.view_device"],
-                    ),
-                    NavItem(
-                        name="Device Types",
-                        weight=200,
-                        link="dcim:devicetype_list",
-                        permissions=["dcim.view_devicetype"],
-                    ),
-                    NavItem(
-                        link="dcim:platform_list",
-                        name="Platforms",
-                        weight=300,
-                        permissions=[
-                            "dcim.view_platform",
-                        ],
-                    ),
-                    NavItem(
-                        link="dcim:manufacturer_list",
-                        name="Manufacturers",
-                        weight=400,
-                        permissions=[
-                            "dcim.view_manufacturer",
-                        ],
-                    ),
-                    NavItem(
-                        link="dcim:virtualchassis_list",
-                        name="Virtual Chassis",
-                        weight=500,
-                        permissions=[
-                            "dcim.view_virtualchassis",
-                        ],
-                    ),
-                    NavItem(
-                        name="Device Redundancy Groups",
-                        weight=600,
-                        link="dcim:deviceredundancygroup_list",
-                        permissions=["dcim.view_deviceredundancygroup"],
-                    ),
-                    NavGrouping(
-                        name="Connections",
-                        weight=700,
-                        items=(
-                            NavItem(
-                                name="Cables",
-                                weight=100,
-                                link="dcim:cable_list",
-                                permissions=["dcim.view_cable"],
-                            ),
-                            NavItem(
-                                name="Console Connections",
-                                weight=200,
-                                link="dcim:console_connections_list",
-                                permissions=[
-                                    "dcim.view_consoleport",
-                                    "dcim.view_consoleserverport",
-                                ],
-                            ),
-                            NavItem(
-                                name="Power Connections",
-                                weight=300,
-                                link="dcim:power_connections_list",
-                                permissions=[
-                                    "dcim.view_powerport",
-                                    "dcim.view_poweroutlet",
-                                ],
-                            ),
-                            NavItem(
-                                name="Interface Connections",
-                                weight=400,
-                                link="dcim:interface_connections_list",
-                                permissions=["dcim.view_interface"],
-                            ),
-                        ),
-                    ),
-                    NavGrouping(
-                        name="Components",
-                        weight=800,
-                        items=(
-                            NavItem(
-                                name="Interfaces",
-                                weight=100,
-                                link="dcim:interface_list",
-                                permissions=["dcim.view_interface"],
-                            ),
-                            NavItem(
-                                name="Front Ports",
-                                weight=200,
-                                link="dcim:frontport_list",
-                                permissions=["dcim.view_frontport"],
-                            ),
-                            NavItem(
-                                name="Rear Ports",
-                                weight=300,
-                                link="dcim:rearport_list",
-                                permissions=["dcim.view_rearport"],
-                            ),
-                            NavItem(
-                                name="Console Ports",
-                                weight=400,
-                                link="dcim:consoleport_list",
-                                permissions=["dcim.view_consoleport"],
-                            ),
-                            NavItem(
-                                name="Console Server Ports",
-                                weight=500,
-                                link="dcim:consoleserverport_list",
-                                permissions=["dcim.view_consoleserverport"],
-                            ),
-                            NavItem(
-                                name="Power Ports",
-                                weight=600,
-                                link="dcim:powerport_list",
-                                permissions=["dcim.view_powerport"],
-                            ),
-                            NavItem(
-                                name="Power Outlets",
-                                weight=700,
-                                link="dcim:poweroutlet_list",
-                                permissions=["dcim.view_poweroutlet"],
-                            ),
-                            NavItem(
-                                name="Device Bays",
-                                weight=800,
-                                link="dcim:devicebay_list",
-                                permissions=["dcim.view_devicebay"],
-                            ),
-                            NavItem(
-                                name="Inventory Items",
-                                weight=900,
-                                link="dcim:inventoryitem_list",
-                                permissions=["dcim.view_inventoryitem"],
-                            ),
-                        ),
-                    ),
-                    # space reserved for Dynamic Groups item with weight 900
-                    NavItem(
-                        name="Racks",
-                        weight=1000,
-                        link="dcim:rack_list",
-                        permissions=["dcim.view_rack"],
-                    ),
-                    NavItem(
-                        name="Rack Groups",
-                        weight=1100,
-                        link="dcim:rackgroup_list",
-                        permissions=["dcim.view_rackgroup"],
-                    ),
-                    NavItem(
-                        name="Rack Reservations",
-                        weight=1200,
-                        link="dcim:rackreservation_list",
-                        permissions=["dcim.view_rackreservation"],
-                    ),
-                    NavItem(
-                        name="Rack Elevations",
-                        weight=1300,
-                        link="dcim:rack_elevation_list",
-                        permissions=["dcim.view_rack"],
-                    ),
-                ),
-            ),
-            NavGrouping(
-                name="Organization",
-                weight=200,
-                items=(
-                    NavItem(
-                        link="dcim:location_list",
-                        name="Locations",
-                        weight=100,
-                        permissions=[
-                            "dcim.view_location",
-                        ],
-                    ),
-                    NavItem(
-                        link="dcim:locationtype_list",
-                        name="Location Types",
-                        weight=200,
-                        permissions=[
-                            "dcim.view_locationtype",
-                        ],
-                    ),
-                ),
-            ),
-            # space reserved for Tenants at weight 300
-            # space reserved for Circuits at weight 400
-            NavGrouping(
-                name="Power",
-                weight=500,
-                items=(
-                    NavItem(
-                        name="Power Feeds",
-                        link="dcim:powerfeed_list",
-                        weight=100,
-                        permissions=["dcim.view_powerfeed"],
-                    ),
-                    NavItem(
-                        name="Power Panels",
-                        weight=200,
-                        link="dcim:powerpanel_list",
-                        permissions=["dcim.view_powerpanel"],
-                    ),
-                ),
-            ),
-        ),
-    ),
-)

nautobot/dcim/signals.py

@@ -15,6 +15,7 @@ from .models import (
     Device,
     DeviceRedundancyGroup,
     Interface,
+    InterfaceVDCAssignment,
     PathEndpoint,
     PowerPanel,
     Rack,
@@ -289,6 +290,49 @@ def prevent_adding_tagged_vlans_with_incorrect_mode_or_site(sender, instance, ac
     validate_interface_tagged_vlans(instance, kwargs["model"], kwargs["pk_set"])
 
 
+#
+# VirtualDeviceContext Interfaces
+#
+
+
+@receiver(m2m_changed, sender=InterfaceVDCAssignment)
+@disable_for_loaddata
+def validate_vdcs_interface_relationships(sender, instance, action, **kwargs):
+    if action != "pre_add":
+        return
+
+    pk_set = kwargs.get("pk_set", [])
+    if isinstance(instance, Interface):
+        invalid_vdcs = kwargs["model"].objects.filter(pk__in=pk_set).exclude(device=instance.device)
+        if invalid_vdcs.count():
+            raise ValidationError(
+                {
+                    "virtual_device_contexts": (
+                        f"Virtual Device Context with names {list(invalid_vdcs.values_list('name', flat=True))} must all belong to the "
+                        f"same device as the interface's device."
+                    )
+                }
+            )
+    else:
+        vc_interfaces_ids = instance.device.vc_interfaces.values_list("pk", flat=True)
+        invalid_interfaces = (
+            kwargs["model"]
+            .objects.filter(pk__in=pk_set)
+            .exclude(device=instance.device)
+            .exclude(id__in=vc_interfaces_ids)
+        )
+
+        if invalid_interfaces.count():
+            raise ValidationError(
+                {
+                    "interfaces": (
+                        f"Interfaces with names {list(invalid_interfaces.values_list('name', flat=True))} must all belong to the "
+                        f"same device as the Virtual Device Context's device."
+                    )
+                }
+            )
+
+
 #
 # ControllerManagedDeviceGroup
 #

nautobot/dcim/tables/__init__.py

@@ -39,6 +39,7 @@ from .devices import (
     SoftwareImageFileTable,
     SoftwareVersionTable,
     VirtualChassisTable,
+    VirtualDeviceContextTable,
 )
 from .devicetypes import (
     ConsolePortTemplateTable,
@@ -123,6 +124,7 @@ __all__ = (
     "SoftwareImageFileTable",
     "SoftwareVersionTable",
     "VirtualChassisTable",
+    "VirtualDeviceContextTable",
 )
 
 #

nautobot/dcim/tables/devices.py

@@ -1,4 +1,4 @@
-from django.utils.html import format_html
+from django.utils.html import format_html, format_html_join
 import django_tables2 as tables
 from django_tables2.utils import Accessor
 
@@ -33,6 +33,7 @@ from nautobot.dcim.models import (
     SoftwareImageFile,
     SoftwareVersion,
     VirtualChassis,
+    VirtualDeviceContext,
 )
 from nautobot.dcim.utils import cable_status_color_css
 from nautobot.extras.tables import RoleTableMixin, StatusTableMixin
@@ -63,8 +64,8 @@ from .template_code import (
 __all__ = (
     "ConsolePortTable",
     "ConsoleServerPortTable",
-    "ControllerTable",
     "ControllerManagedDeviceGroupTable",
+    "ControllerTable",
     "DeviceBayTable",
     "DeviceDeviceBayTable",
     "DeviceImportTable",
@@ -74,19 +75,19 @@ __all__ = (
     "DeviceModuleConsoleServerPortTable",
     "DeviceModuleFrontPortTable",
     "DeviceModuleInterfaceTable",
-    "DeviceModulePowerPortTable",
     "DeviceModulePowerOutletTable",
+    "DeviceModulePowerPortTable",
     "DeviceModuleRearPortTable",
     "DeviceRedundancyGroupTable",
     "DeviceTable",
     "FrontPortTable",
-    "InterfaceTable",
-    "InterfaceRedundancyGroupTable",
     "InterfaceRedundancyGroupAssociationTable",
+    "InterfaceRedundancyGroupTable",
+    "InterfaceTable",
     "InventoryItemTable",
-    "ModuleTable",
     "ModuleBayTable",
     "ModuleModuleBayTable",
+    "ModuleTable",
     "PlatformTable",
     "PowerOutletTable",
     "PowerPortTable",
@@ -94,6 +95,7 @@ __all__ = (
     "SoftwareImageFileTable",
     "SoftwareVersionTable",
     "VirtualChassisTable",
+    "VirtualDeviceContextTable",
 )
 
 
@@ -172,9 +174,10 @@ class DeviceTable(StatusTableMixin, RoleTableMixin, BaseTable):
     device_redundancy_group_priority = tables.TemplateColumn(
         template_code="""{% if record.device_redundancy_group %}<span class="badge badge-default">{{ record.device_redundancy_group_priority|default:'None' }}</span>{% else %}—{% endif %}"""
     )
-    controller_managed_device_group = tables.Column(linkify=True)
+    controller_managed_device_group = tables.Column(linkify=True, verbose_name="Device Group")
     software_version = tables.Column(linkify=True, verbose_name="Software Version")
     secrets_group = tables.Column(linkify=True)
+    capabilities = tables.Column(orderable=False, accessor="controller_managed_device_group.capabilities")
     tags = TagColumn(url_name="dcim:device_list")
 
     class Meta(BaseTable.Meta):
@@ -205,6 +208,7 @@ class DeviceTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "software_version",
             "controller_managed_device_group",
             "secrets_group",
+            "capabilities",
             "tags",
         )
         default_columns = (
@@ -219,6 +223,12 @@ class DeviceTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "primary_ip",
         )
 
+    def render_capabilities(self, value):
+        """Render capabilities."""
+        if not value:
+            return format_html("&mdash;")
+        return format_html_join(" ", '<span class="label label-default">{}</span>', ((v,) for v in value))
+
 
 class DeviceImportTable(StatusTableMixin, RoleTableMixin, BaseTable):
     name = tables.TemplateColumn(template_code=DEVICE_LINK)
@@ -635,6 +645,11 @@ class BaseInterfaceTable(StatusTableMixin, RoleTableMixin, BaseTable):
 class InterfaceTable(ModularDeviceComponentTable, BaseInterfaceTable, PathEndpointTable):
     mgmt_only = BooleanColumn()
     tags = TagColumn(url_name="dcim:interface_list")
+    virtual_device_context_count = LinkedCountColumn(
+        viewname="dcim:virtualdevicecontext_list",
+        url_params={"interfaces": "pk"},
+        verbose_name="Virtual Device Contexts",
+    )
 
     class Meta(ModularDeviceComponentTable.Meta):
         model = Interface
@@ -660,6 +675,7 @@ class InterfaceTable(ModularDeviceComponentTable, BaseInterfaceTable, PathEndpoi
             "tags",
             "ip_addresses",
             "untagged_vlan",
+            "virtual_device_context_count",
             "tagged_vlans",
         )
         default_columns = (
@@ -716,6 +732,7 @@ class DeviceModuleInterfaceTable(InterfaceTable):
             "ip_addresses",
             "untagged_vlan",
             "tagged_vlans",
+            "virtual_device_context_count",
             "actions",
         )
         default_columns = [
@@ -734,6 +751,7 @@ class DeviceModuleInterfaceTable(InterfaceTable):
             "mode",
             "description",
             "ip_addresses",
+            "virtual_device_context_count",
             "cable",
             "connection",
             "actions",
@@ -1339,6 +1357,7 @@ class ControllerTable(StatusTableMixin, RoleTableMixin, BaseTable):
     location = tables.Column(linkify=True)
     platform = tables.Column(linkify=True)
     tenant = TenantColumn()
+    capabilities = tables.Column()
     external_integration = tables.Column(linkify=True)
     controller_device = tables.Column(linkify=True)
     controller_device_redundancy_group = tables.Column(linkify=True)
@@ -1357,6 +1376,7 @@ class ControllerTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "platform",
             "role",
             "tenant",
+            "capabilities",
             "external_integration",
             "controller_device",
             "controller_device_redundancy_group",
@@ -1371,9 +1391,16 @@ class ControllerTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "platform",
             "role",
             "tenant",
+            "capabilities",
             "actions",
         )
 
+    def render_capabilities(self, value):
+        """Render capabilities."""
+        if not value:
+            return format_html("&mdash;")
+        return format_html_join(" ", '<span class="label label-default">{}</span>', ((v,) for v in value))
+
 
 class ControllerManagedDeviceGroupTable(BaseTable):
     """Table for list view."""
@@ -1382,6 +1409,8 @@ class ControllerManagedDeviceGroupTable(BaseTable):
     name = tables.TemplateColumn(template_code=TREE_LINK, attrs={"td": {"class": "text-nowrap"}})
     weight = tables.Column()
     controller = tables.Column(linkify=True)
+    tenant = TenantColumn()
+    capabilities = tables.Column()
     tags = TagColumn(url_name="dcim:controllermanageddevicegroup_list")
     actions = ButtonsColumn(ControllerManagedDeviceGroup)
     device_count = LinkedCountColumn(
@@ -1389,6 +1418,16 @@ class ControllerManagedDeviceGroupTable(BaseTable):
         url_params={"controller_managed_device_group": "pk"},
         verbose_name="Devices",
     )
+    radio_profiles_count = LinkedCountColumn(
+        viewname="wireless:radioprofile_list",
+        url_params={"controller_managed_device_groups": "pk"},
+        verbose_name="Radio Profiles",
+    )
+    wireless_networks_count = LinkedCountColumn(
+        viewname="wireless:wirelessnetwork_list",
+        url_params={"controller_managed_device_groups": "pk"},
+        verbose_name="Wireless Networks",
+    )
 
     class Meta(BaseTable.Meta):
         """Meta attributes."""
@@ -1398,8 +1437,12 @@ class ControllerManagedDeviceGroupTable(BaseTable):
             "pk",
             "name",
             "device_count",
+            "radio_profiles_count",
+            "wireless_networks_count",
             "controller",
             "weight",
+            "tenant",
+            "capabilities",
             "tags",
             "actions",
         )
@@ -1407,8 +1450,61 @@ class ControllerManagedDeviceGroupTable(BaseTable):
             "pk",
             "name",
             "device_count",
+            "radio_profiles_count",
+            "wireless_networks_count",
             "controller",
             "weight",
+            "capabilities",
             "tags",
             "actions",
         )
+
+    def render_capabilities(self, value):
+        """Render capabilities."""
+        if not value:
+            return format_html("&mdash;")
+        return format_html_join(" ", '<span class="label label-default">{}</span>', ((v,) for v in value))
+
+
+class VirtualDeviceContextTable(StatusTableMixin, RoleTableMixin, BaseTable):
+    pk = ToggleColumn()
+    name = tables.Column(linkify=True)
+    tenant = TenantColumn()
+    device = tables.Column(linkify=True)
+    primary_ip = tables.Column(linkify=True, order_by=("primary_ip6", "primary_ip4"), verbose_name="IP Address")
+    primary_ip4 = tables.Column(linkify=True, verbose_name="IPv4 Address")
+    primary_ip6 = tables.Column(linkify=True, verbose_name="IPv6 Address")
+    interface_count = LinkedCountColumn(
+        viewname="dcim:interface_list",
+        url_params={"virtual_device_contexts": "pk"},
+        verbose_name="Interfaces",
+    )
+    tags = TagColumn(url_name="dcim:device_list")
+
+    class Meta(BaseTable.Meta):
+        model = VirtualDeviceContext
+        fields = (
+            "pk",
+            "name",
+            "identifier",
+            "device",
+            "status",
+            "role",
+            "tenant",
+            "primary_ip",
+            "primary_ip4",
+            "primary_ip6",
+            "interface_count",
+            "tags",
+        )
+        default_columns = (
+            "pk",
+            "name",
+            "identifier",
+            "device",
+            "status",
+            "role",
+            "tenant",
+            "primary_ip",
+            "interface_count",
+        )

nautobot/dcim/tables/racks.py

@@ -15,10 +15,10 @@ from nautobot.tenancy.tables import TenantColumn
 from .template_code import RACKGROUP_ELEVATIONS, TREE_LINK, UTILIZATION_GRAPH
 
 __all__ = (
-    "RackTable",
     "RackDetailTable",
     "RackGroupTable",
     "RackReservationTable",
+    "RackTable",
 )
 
 

nautobot/dcim/templates/dcim/controller/base.html

@@ -0,0 +1,10 @@
+{% extends 'generic/object_retrieve.html' %}
+{% load helpers %}
+
+{% block extra_nav_tabs %}
+    {% if 'wireless' in object.capabilities %}
+        <li role="presentation" {% if active_tab == 'wireless-networks' %} class="active"{% endif %}>
+            <a href="{% url 'dcim:controller_wirelessnetworks' pk=object.pk %}">Wireless Networks</a>
+        </li>
+    {% endif %}
+{% endblock extra_nav_tabs %}

nautobot/dcim/templates/dcim/controller_create.html

@@ -10,6 +10,7 @@
             {% render_field form.role %}
             {% render_field form.location %}
             {% render_field form.platform %}
+            {% render_field form.capabilities %}
             {% render_field form.description %}
         </div>
     </div>
@@ -33,13 +34,7 @@
         {% endwith %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Tenancy</strong></div>
-        <div class="panel-body">
-            {% render_field form.tenant_group %}
-            {% render_field form.tenant %}
-        </div>
-    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' %}
 {% endblock form %}
 

nautobot/dcim/templates/dcim/controller_retrieve.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_retrieve.html' %}
+{% extends 'dcim/controller/base.html' %}
 {% load helpers %}
 
 {% block content_left_page %}
@@ -22,6 +22,10 @@
                             <td>Role</td>
                             <td>{{ object.role|hyperlinked_object_with_color }}</td>
                         </tr>
+                        <tr>
+                            <td>Capabilities</td>
+                            <td>{{ object.get_capabilities_display }}</td>
+                        </tr>
                         <tr>
                             <td>Location</td>
                             <td>{{ object.location|hyperlinked_object }}</td>
@@ -30,15 +34,7 @@
                             <td>Platform</td>
                             <td>{{ object.platform|hyperlinked_object }}</td>
                         </tr>
-                        <tr>
-                            <td>Tenant</td>
-                            <td>
-                                {% if object.tenant and object.tenant.tenant_group %}
-                                    {{ object.tenant.tenant_group|hyperlinked_object }} /
-                                {% endif %}
-                                {{ object.tenant|hyperlinked_object }}
-                            </td>
-                        </tr>
+                        {% include 'inc/tenant_table_row.html' %}
                         <tr>
                             <td>Description</td>
                             <td>{{ object.description|placeholder }}</td>