nautobot 2.2.8__py3-none-any.whl → 2.3.0__py3-none-any.whl

nautobot/dcim/tables/devicetypes.py

@@ -17,6 +17,8 @@ from nautobot.dcim.models import (
     FrontPortTemplate,
     InterfaceTemplate,
     Manufacturer,
+    ModuleBayTemplate,
+    ModuleType,
     PowerOutletTemplate,
     PowerPortTemplate,
     RearPortTemplate,
@@ -31,6 +33,8 @@ __all__ = (
     "FrontPortTemplateTable",
     "InterfaceTemplateTable",
     "ManufacturerTable",
+    "ModuleBayTemplateTable",
+    "ModuleTypeTable",
     "PowerOutletTemplateTable",
     "PowerPortTemplateTable",
     "RearPortTemplateTable",
@@ -45,6 +49,9 @@ __all__ = (
 class ManufacturerTable(BaseTable):
     pk = ToggleColumn()
     name = tables.LinkColumn()
+    cloud_account_count = LinkedCountColumn(
+        viewname="cloud:cloudaccount_list", url_params={"provider": "name"}, verbose_name="Cloud Accounts"
+    )
     device_type_count = LinkedCountColumn(
         viewname="dcim:devicetype_list", url_params={"manufacturer": "name"}, verbose_name="Device Types"
     )
@@ -61,6 +68,7 @@ class ManufacturerTable(BaseTable):
         fields = (
             "pk",
             "name",
+            "cloud_account_count",
             "device_type_count",
             "inventory_item_count",
             "platform_count",
@@ -102,8 +110,8 @@ class DeviceFamilyTable(BaseTable):
 
 class DeviceTypeTable(BaseTable):
     pk = ToggleColumn()
-    model = tables.Column(linkify=True, verbose_name="Device Type")
     manufacturer = tables.Column(linkify=True)
+    model = tables.Column(linkify=True, verbose_name="Device Type")
     device_family = tables.Column(linkify=True)
     is_full_depth = BooleanColumn(verbose_name="Full Depth")
     device_count = LinkedCountColumn(
@@ -138,6 +146,41 @@ class DeviceTypeTable(BaseTable):
         )
 
 
+#
+# Module types
+#
+
+
+class ModuleTypeTable(BaseTable):
+    pk = ToggleColumn()
+    manufacturer = tables.Column(linkify=True)
+    model = tables.Column(linkify=True, verbose_name="Module Type")
+    module_count = LinkedCountColumn(
+        viewname="dcim:module_list",
+        url_params={"module_type": "pk"},
+        verbose_name="Modules",
+    )
+    tags = TagColumn(url_name="dcim:moduletype_list")
+
+    class Meta(BaseTable.Meta):
+        model = ModuleType
+        fields = (
+            "pk",
+            "model",
+            "manufacturer",
+            "part_number",
+            "module_count",
+            "tags",
+        )
+        default_columns = (
+            "pk",
+            "model",
+            "manufacturer",
+            "part_number",
+            "module_count",
+        )
+
+
 #
 # Device type components
 #
@@ -152,7 +195,7 @@ class ConsolePortTemplateTable(ComponentTemplateTable):
     actions = ButtonsColumn(
         model=ConsolePortTemplate,
         buttons=("edit", "delete"),
-        return_url_extra="%23tab_consoleports",
+        return_url_extra=r"%3Ftab=consoleports",
     )
 
     class Meta(BaseTable.Meta):
@@ -165,7 +208,7 @@ class ConsoleServerPortTemplateTable(ComponentTemplateTable):
     actions = ButtonsColumn(
         model=ConsoleServerPortTemplate,
         buttons=("edit", "delete"),
-        return_url_extra="%23tab_consoleserverports",
+        return_url_extra=r"%3Ftab=consoleserverports",
     )
 
     class Meta(BaseTable.Meta):
@@ -178,7 +221,7 @@ class PowerPortTemplateTable(ComponentTemplateTable):
     actions = ButtonsColumn(
         model=PowerPortTemplate,
         buttons=("edit", "delete"),
-        return_url_extra="%23tab_powerports",
+        return_url_extra=r"%3Ftab=powerports",
     )
 
     class Meta(BaseTable.Meta):
@@ -200,7 +243,7 @@ class PowerOutletTemplateTable(ComponentTemplateTable):
     actions = ButtonsColumn(
         model=PowerOutletTemplate,
         buttons=("edit", "delete"),
-        return_url_extra="%23tab_poweroutlets",
+        return_url_extra=r"%3Ftab=poweroutlets",
     )
 
     class Meta(BaseTable.Meta):
@@ -223,7 +266,7 @@ class InterfaceTemplateTable(ComponentTemplateTable):
     actions = ButtonsColumn(
         model=InterfaceTemplate,
         buttons=("edit", "delete"),
-        return_url_extra="%23tab_interfaces",
+        return_url_extra=r"%3Ftab=interfaces",
     )
 
     class Meta(BaseTable.Meta):
@@ -237,7 +280,7 @@ class FrontPortTemplateTable(ComponentTemplateTable):
     actions = ButtonsColumn(
         model=FrontPortTemplate,
         buttons=("edit", "delete"),
-        return_url_extra="%23tab_frontports",
+        return_url_extra=r"%3Ftab=frontports",
     )
 
     class Meta(BaseTable.Meta):
@@ -259,7 +302,7 @@ class RearPortTemplateTable(ComponentTemplateTable):
     actions = ButtonsColumn(
         model=RearPortTemplate,
         buttons=("edit", "delete"),
-        return_url_extra="%23tab_rearports",
+        return_url_extra=r"%3Ftab=rearports",
     )
 
     class Meta(BaseTable.Meta):
@@ -272,10 +315,23 @@ class DeviceBayTemplateTable(ComponentTemplateTable):
     actions = ButtonsColumn(
         model=DeviceBayTemplate,
         buttons=("edit", "delete"),
-        return_url_extra="%23tab_devicebays",
+        return_url_extra=r"%3Ftab=devicebays",
     )
 
     class Meta(BaseTable.Meta):
         model = DeviceBayTemplate
         fields = ("pk", "name", "label", "description", "actions")
         empty_text = "None"
+
+
+class ModuleBayTemplateTable(ComponentTemplateTable):
+    actions = ButtonsColumn(
+        model=ModuleBayTemplate,
+        buttons=("edit", "delete"),
+        return_url_extra=r"%3Ftab=modulebays",
+    )
+
+    class Meta(BaseTable.Meta):
+        model = ModuleBayTemplate
+        fields = ("pk", "name", "position", "label", "description", "actions")
+        empty_text = "None"

nautobot/dcim/tables/racks.py

@@ -31,7 +31,11 @@ class RackGroupTable(BaseTable):
     pk = ToggleColumn()
     name = tables.TemplateColumn(template_code=TREE_LINK, attrs={"td": {"class": "text-nowrap"}})
     location = tables.Column(linkify=True)
-    rack_count = tables.Column(verbose_name="Racks")
+    rack_count = LinkedCountColumn(
+        viewname="dcim:rack_list",
+        url_params={"rack_group": "pk"},
+        verbose_name="Racks",
+    )
     actions = ButtonsColumn(model=RackGroup, prepend_template=RACKGROUP_ELEVATIONS)
 
     class Meta(BaseTable.Meta):

nautobot/dcim/tables/template_code.py

@@ -41,6 +41,8 @@ CABLE_TERMINATION_PARENT = """
     <a href="{{ value.circuit.get_absolute_url }}">{{ value.circuit }}</a>
 {% elif value.power_panel %}
     <a href="{{ value.power_panel.get_absolute_url }}">{{ value.power_panel }}</a>
+{% elif value.module and value.module.device %}
+    <a href="{{ value.module.device.get_absolute_url }}">{{ value.module.device }}</a>
 {% endif %}
 """
 
@@ -137,9 +139,9 @@ CONSOLEPORT_BUTTONS = """
             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span>
         </button>
         <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="{% url 'dcim:consoleport_connect' termination_a_id=record.pk termination_b_type='console-server-port' %}?return_url={% url 'dcim:device_consoleports' pk=object.pk %}">Console Server Port</a></li>
-            <li><a href="{% url 'dcim:consoleport_connect' termination_a_id=record.pk termination_b_type='front-port' %}?return_url={% url 'dcim:device_consoleports' pk=object.pk %}">Front Port</a></li>
-            <li><a href="{% url 'dcim:consoleport_connect' termination_a_id=record.pk termination_b_type='rear-port' %}?return_url={% url 'dcim:device_consoleports' pk=object.pk %}">Rear Port</a></li>
+            <li><a href="{% url 'dcim:consoleport_connect' termination_a_id=record.pk termination_b_type='console-server-port' %}?return_url={{ request.path }}">Console Server Port</a></li>
+            <li><a href="{% url 'dcim:consoleport_connect' termination_a_id=record.pk termination_b_type='front-port' %}?return_url={{ request.path }}">Front Port</a></li>
+            <li><a href="{% url 'dcim:consoleport_connect' termination_a_id=record.pk termination_b_type='rear-port' %}?return_url={{ request.path }}">Rear Port</a></li>
         </ul>
     </span>
 {% endif %}
@@ -157,9 +159,9 @@ CONSOLESERVERPORT_BUTTONS = """
             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span>
         </button>
         <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=record.pk termination_b_type='console-port' %}?return_url={% url 'dcim:device_consoleserverports' pk=object.pk %}">Console Port</a></li>
-            <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=record.pk termination_b_type='front-port' %}?return_url={% url 'dcim:device_consoleserverports' pk=object.pk %}">Front Port</a></li>
-            <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=record.pk termination_b_type='rear-port' %}?return_url={% url 'dcim:device_consoleserverports' pk=object.pk %}">Rear Port</a></li>
+            <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=record.pk termination_b_type='console-port' %}?return_url={{ request.path }}">Console Port</a></li>
+            <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=record.pk termination_b_type='front-port' %}?return_url={{ request.path }}">Front Port</a></li>
+            <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=record.pk termination_b_type='rear-port' %}?return_url={{ request.path }}">Rear Port</a></li>
         </ul>
     </span>
 {% endif %}
@@ -177,8 +179,8 @@ POWERPORT_BUTTONS = """
             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span>
         </button>
         <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="{% url 'dcim:powerport_connect' termination_a_id=record.pk termination_b_type='power-outlet' %}?return_url={% url 'dcim:device_powerports' pk=object.pk %}">Power Outlet</a></li>
-            <li><a href="{% url 'dcim:powerport_connect' termination_a_id=record.pk termination_b_type='power-feed' %}?return_url={% url 'dcim:device_powerports' pk=object.pk %}">Power Feed</a></li>
+            <li><a href="{% url 'dcim:powerport_connect' termination_a_id=record.pk termination_b_type='power-outlet' %}?return_url={{ request.path }}">Power Outlet</a></li>
+            <li><a href="{% url 'dcim:powerport_connect' termination_a_id=record.pk termination_b_type='power-feed' %}?return_url={{ request.path }}">Power Feed</a></li>
         </ul>
     </span>
 {% endif %}
@@ -191,7 +193,7 @@ POWEROUTLET_BUTTONS = """
 {% elif perms.dcim.add_cable %}
     <a href="#" class="btn btn-default btn-xs disabled"><i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i></a>
     <a href="#" class="btn btn-default btn-xs disabled"><i class="mdi mdi-lan-connect" aria-hidden="true"></i></a>
-    <a href="{% url 'dcim:poweroutlet_connect' termination_a_id=record.pk termination_b_type='power-port' %}?return_url={% url 'dcim:device_poweroutlets' pk=object.pk %}" title="Connect" class="btn btn-success btn-xs">
+    <a href="{% url 'dcim:poweroutlet_connect' termination_a_id=record.pk termination_b_type='power-port' %}?return_url={{ request.path }}" title="Connect" class="btn btn-success btn-xs">
         <i class="mdi mdi-ethernet-cable" aria-hidden="true"></i>
     </a>
 {% endif %}
@@ -199,7 +201,7 @@ POWEROUTLET_BUTTONS = """
 
 INTERFACE_BUTTONS = """
 {% if perms.ipam.add_ipaddress and perms.dcim.change_interface %}
-    <a href="{% url 'ipam:ipaddress_add' %}?interface={{ record.pk }}&return_url={% url 'dcim:device_interfaces' pk=object.pk %}" class="btn btn-xs btn-success" title="Add IP address">
+    <a href="{% url 'ipam:ipaddress_add' %}?interface={{ record.pk }}&return_url={{ request.path }}" class="btn btn-xs btn-success" title="Add IP address">
         <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
     </a>
 {% endif %}
@@ -214,10 +216,10 @@ INTERFACE_BUTTONS = """
             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span>
         </button>
         <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="{% url 'dcim:interface_connect' termination_a_id=record.pk termination_b_type='interface' %}?return_url={% url 'dcim:device_interfaces' pk=object.pk %}">Interface</a></li>
-            <li><a href="{% url 'dcim:interface_connect' termination_a_id=record.pk termination_b_type='front-port' %}?return_url={% url 'dcim:device_interfaces' pk=object.pk %}">Front Port</a></li>
-            <li><a href="{% url 'dcim:interface_connect' termination_a_id=record.pk termination_b_type='rear-port' %}?return_url={% url 'dcim:device_interfaces' pk=object.pk %}">Rear Port</a></li>
-            <li><a href="{% url 'dcim:interface_connect' termination_a_id=record.pk termination_b_type='circuit-termination' %}?return_url={% url 'dcim:device_interfaces' pk=object.pk %}">Circuit Termination</a></li>
+            <li><a href="{% url 'dcim:interface_connect' termination_a_id=record.pk termination_b_type='interface' %}?return_url={{ request.path }}">Interface</a></li>
+            <li><a href="{% url 'dcim:interface_connect' termination_a_id=record.pk termination_b_type='front-port' %}?return_url={{ request.path }}">Front Port</a></li>
+            <li><a href="{% url 'dcim:interface_connect' termination_a_id=record.pk termination_b_type='rear-port' %}?return_url={{ request.path }}">Rear Port</a></li>
+            <li><a href="{% url 'dcim:interface_connect' termination_a_id=record.pk termination_b_type='circuit-termination' %}?return_url={{ request.path }}">Circuit Termination</a></li>
         </ul>
     </span>
 {% endif %}
@@ -235,12 +237,12 @@ FRONTPORT_BUTTONS = """
             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span>
         </button>
         <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=record.pk termination_b_type='interface' %}?return_url={% url 'dcim:device_frontports' pk=object.pk %}">Interface</a></li>
-            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=record.pk termination_b_type='console-server-port' %}?return_url={% url 'dcim:device_frontports' pk=object.pk %}">Console Server Port</a></li>
-            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=record.pk termination_b_type='console-port' %}?return_url={% url 'dcim:device_frontports' pk=object.pk %}">Console Port</a></li>
-            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=record.pk termination_b_type='front-port' %}?return_url={% url 'dcim:device_frontports' pk=object.pk %}">Front Port</a></li>
-            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=record.pk termination_b_type='rear-port' %}?return_url={% url 'dcim:device_frontports' pk=object.pk %}">Rear Port</a></li>
-            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=record.pk termination_b_type='circuit-termination' %}?return_url={% url 'dcim:device_frontports' pk=object.pk %}">Circuit Termination</a></li>
+            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=record.pk termination_b_type='interface' %}?return_url={{ request.path }}">Interface</a></li>
+            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=record.pk termination_b_type='console-server-port' %}?return_url={{ request.path }}">Console Server Port</a></li>
+            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=record.pk termination_b_type='console-port' %}?return_url={{ request.path }}">Console Port</a></li>
+            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=record.pk termination_b_type='front-port' %}?return_url={{ request.path }}">Front Port</a></li>
+            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=record.pk termination_b_type='rear-port' %}?return_url={{ request.path }}">Rear Port</a></li>
+            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=record.pk termination_b_type='circuit-termination' %}?return_url={{ request.path }}">Circuit Termination</a></li>
         </ul>
     </span>
 {% endif %}
@@ -258,10 +260,10 @@ REARPORT_BUTTONS = """
             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span>
         </button>
         <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="{% url 'dcim:rearport_connect' termination_a_id=record.pk termination_b_type='interface' %}?return_url={% url 'dcim:device_rearports' pk=object.pk %}">Interface</a></li>
-            <li><a href="{% url 'dcim:rearport_connect' termination_a_id=record.pk termination_b_type='front-port' %}?return_url={% url 'dcim:device_rearports' pk=object.pk %}">Front Port</a></li>
-            <li><a href="{% url 'dcim:rearport_connect' termination_a_id=record.pk termination_b_type='rear-port' %}?return_url={% url 'dcim:device_rearports' pk=object.pk %}">Rear Port</a></li>
-            <li><a href="{% url 'dcim:rearport_connect' termination_a_id=record.pk termination_b_type='circuit-termination' %}?return_url={% url 'dcim:device_rearports' pk=object.pk %}">Circuit Termination</a></li>
+            <li><a href="{% url 'dcim:rearport_connect' termination_a_id=record.pk termination_b_type='interface' %}?return_url={{ request.path }}">Interface</a></li>
+            <li><a href="{% url 'dcim:rearport_connect' termination_a_id=record.pk termination_b_type='front-port' %}?return_url={{ request.path }}">Front Port</a></li>
+            <li><a href="{% url 'dcim:rearport_connect' termination_a_id=record.pk termination_b_type='rear-port' %}?return_url={{ request.path }}">Rear Port</a></li>
+            <li><a href="{% url 'dcim:rearport_connect' termination_a_id=record.pk termination_b_type='circuit-termination' %}?return_url={{ request.path }}">Circuit Termination</a></li>
         </ul>
     </span>
 {% endif %}
@@ -270,13 +272,31 @@ REARPORT_BUTTONS = """
 DEVICEBAY_BUTTONS = """
 {% if perms.dcim.change_devicebay %}
     {% if record.installed_device %}
-        <a href="{% url 'dcim:devicebay_depopulate' pk=record.pk %}?return_url={% url 'dcim:device_devicebays' pk=object.pk %}" class="btn btn-danger btn-xs">
+        <a href="{% url 'dcim:devicebay_depopulate' pk=record.pk %}?return_url={{ request.path }}" class="btn btn-danger btn-xs">
             <i class="mdi mdi-minus-thick" aria-hidden="true" title="Remove device"></i>
         </a>
     {% else %}
-        <a href="{% url 'dcim:devicebay_populate' pk=record.pk %}?return_url={% url 'dcim:device_devicebays' pk=object.pk %}" class="btn btn-success btn-xs">
+        <a href="{% url 'dcim:devicebay_populate' pk=record.pk %}?return_url={{ request.path }}" class="btn btn-success btn-xs">
             <i class="mdi mdi-plus-thick" aria-hidden="true" title="Install device"></i>
         </a>
     {% endif %}
 {% endif %}
 """
+
+MODULE_BUTTONS = """
+<a href="{% url 'dcim:module' pk=record.pk %}" class="btn btn-default btn-xs" title="Details"><i class="mdi mdi-information-outline" aria-hidden="true"></i></a>
+"""
+
+MODULEBAY_BUTTONS = """
+{% if perms.dcim.change_modulebay and perms.dcim.add_module %}
+    {% if not record.installed_module %}
+        <a href="{% url 'dcim:module_add' %}?parent_module_bay={{ record.pk }}&return_url={{ request.path }}" class="btn btn-success btn-xs">
+            <i class="mdi mdi-plus-thick" aria-hidden="true" title="Install module"></i>
+        </a>
+    {% else %}
+        <a href="{% url 'dcim:module_delete' pk=record.installed_module.pk %}?return_url={{ request.path }}" class="btn btn-danger btn-xs">
+            <i class="mdi mdi-minus-thick" aria-hidden="true" title="Delete installed module"></i>
+        </a>
+    {% endif %}
+{% endif %}
+"""

nautobot/dcim/templates/dcim/cable_connect.html

@@ -22,7 +22,15 @@
         </div>
     {% endif %}
     {% with termination_a=form.instance.termination_a %}
-        <h3>{% block title %}Connect {{ termination_a.device }} {{ termination_a }} to {{ termination_b_type|bettertitle }}{% endblock %}</h3>
+        <h3>
+            {% block title %}
+                {% if termination_a.module %}
+                    Connect {{ termination_a.module.display }} {{ termination_a }} to {{ termination_b_type|bettertitle }}
+                {% else %}
+                    Connect {{ termination_a.device }} {{ termination_a }} to {{ termination_b_type|bettertitle }}
+                {% endif %}
+            {% endblock %}
+        </h3>
         <div class="row">
             <div class="col-md-5">
                 <div class="panel panel-default">
@@ -53,7 +61,58 @@
                             <div class="form-group">
                                 <label class="col-md-3 control-label required">Type</label>
                                 <div class="col-md-9">
-                                    <p class="form-control-static">{{ termination_a|meta:"verbose_name"|capfirst }}</p>
+                                    <p class="form-control-static">{{ termination_a|meta:"verbose_name"|bettertitle }}</p>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-md-3 control-label required">Name</label>
+                                <div class="col-md-9">
+                                    <p class="form-control-static">{{ termination_a }}</p>
+                                </div>
+                            </div>
+                        {% elif termination_a.module %}
+                            {# Module component #}
+                            {% if not termination_a.module.device %}
+                                <div class="alert alert-warning">
+                                    This {{ termination_a|meta:"verbose_name"|bettertitle }} belongs
+                                    to a module not installed in any device.
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-md-3 control-label required">Location</label>
+                                    <div class="col-md-9">
+                                        <p class="form-control-static">{{ termination_a.module.location }}</p>
+                                    </div>
+                                </div>
+                            {% else %}
+                                <div class="form-group">
+                                    <label class="col-md-3 control-label required">Location</label>
+                                    <div class="col-md-9">
+                                        <p class="form-control-static">{{ termination_a.module.device.location }}</p>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-md-3 control-label required">Rack</label>
+                                    <div class="col-md-9">
+                                        <p class="form-control-static">{{ termination_a.module.device.rack|default:"None" }}</p>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-md-3 control-label required">Device</label>
+                                    <div class="col-md-9">
+                                        <p class="form-control-static">{{ termination_a.module.device }}</p>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-md-3 control-label required">Module</label>
+                                    <div class="col-md-9">
+                                        <p class="form-control-static">{{ termination_a.module.display }}</p>
+                                    </div>
+                                </div>
+                            {% endif %}
+                            <div class="form-group">
+                                <label class="col-md-3 control-label required">Type</label>
+                                <div class="col-md-9">
+                                    <p class="form-control-static">{{ termination_a|meta:"verbose_name"|bettertitle }}</p>
                                 </div>
                             </div>
                             <div class="form-group">
@@ -123,6 +182,9 @@
                         {% if 'termination_b_device' in form.fields %}
                             {% render_field form.termination_b_device %}
                         {% endif %}
+                        {% if 'termination_b_module' in form.fields %}
+                            {% render_field form.termination_b_module %}
+                        {% endif %}
                         {% if 'termination_b_type' in form.fields %}
                             {% render_field form.termination_b_type %}
                         {% endif %}
@@ -135,7 +197,7 @@
                         <div class="form-group">
                             <label class="col-md-3 control-label required">Type</label>
                             <div class="col-md-9">
-                                <p class="form-control-static">{{ termination_b_type|capfirst }}</p>
+                                <p class="form-control-static">{{ termination_b_type|bettertitle }}</p>
                             </div>
                         </div>
                         {% render_field form.termination_b_id %}
@@ -170,5 +232,16 @@
             $('#id_termination_b_id').find("option").remove();
         });
     });
+
+    // clear the select2 widget for the module when a new device is selected
+    // jQuery required for select2
+    document.addEventListener("DOMContentLoaded", function() {
+        $('select#id_termination_b_device').select2();
+        $('select#id_termination_b_module').select2();
+
+        $('select#id_termination_b_device').on('change', function (e) {
+            $('select#id_termination_b_module').val(null).trigger('change');
+        });
+    });
 </script>
 {% endblock %}

nautobot/dcim/templates/dcim/console_port_connection_list.html

@@ -1,7 +1,9 @@
 {% extends 'generic/object_list.html' %}
 
-{% block export_button %}
-<a href="{% url 'dcim-api:cable-list' %}?{% if request.GET %}{{ request.GET.urlencode }}&{% endif %}termination_type=dcim.consoleport&format=csv" class="btn btn-success">
-    <span class="mdi mdi-database-export" aria-hidden="true"></span> Export
-</a>
-{% endblock export_button %}
+{% block export_list_element %}
+<li>
+    <a href="{% url 'dcim-api:cable-list' %}?{% if request.GET %}{{ request.GET.urlencode }}&{% endif %}termination_type=dcim.consoleport&format=csv">
+        <span class="mdi mdi-database-export text-muted" aria-hidden="true"></span> Export as CSV
+    </a>
+</li>
+{% endblock export_list_element %}

nautobot/dcim/templates/dcim/device/base.html

@@ -43,6 +43,9 @@
                     {% if perms.dcim.add_devicebay %}
                         <li><a href="{% url 'dcim:devicebay_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_devicebays' pk=object.pk %}">Device Bays</a></li>
                     {% endif %}
+                    {% if perms.dcim.add_modulebay %}
+                        <li><a href="{% url 'dcim:modulebay_add' %}?parent_device={{ object.pk }}&return_url={% url 'dcim:device_modulebays' pk=object.pk %}">Module Bays</a></li>
+                    {% endif %}
                     {% if perms.dcim.add_inventoryitem %}
                         <li><a href="{% url 'dcim:inventoryitem_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_inventory' pk=object.pk %}">Inventory Items</a></li>
                     {% endif %}
@@ -63,6 +66,11 @@
 {% endblock masthead %}
 
 {% block extra_nav_tabs %}
+        {% if modulebay_count %}
+            <li role="presentation" {% if active_tab == 'module-bays' %} class="active"{% endif %}>
+                <a href="{% url 'dcim:device_modulebays' pk=object.pk %}">Modules {% badge module_count %}</a>
+            </li>
+        {% endif %}
         {% with interface_count=object.vc_interfaces.count %}
             {% if interface_count %}
                 <li role="presentation" {% if active_tab == 'interfaces' %} class="active"{% endif %}>
@@ -70,42 +78,42 @@
                 </li>
             {% endif %}
         {% endwith %}
-        {% with frontport_count=object.front_ports.count %}
+        {% with frontport_count=object.all_front_ports.count %}
             {% if frontport_count %}
                 <li role="presentation" {% if active_tab == 'front-ports' %} class="active"{% endif %}>
                     <a href="{% url 'dcim:device_frontports' pk=object.pk %}">Front Ports {% badge frontport_count %}</a>
                 </li>
             {% endif %}
         {% endwith %}
-        {% with rearport_count=object.rear_ports.count %}
+        {% with rearport_count=object.all_rear_ports.count %}
             {% if rearport_count %}
                 <li role="presentation" {% if active_tab == 'rear-ports' %} class="active"{% endif %}>
                     <a href="{% url 'dcim:device_rearports' pk=object.pk %}">Rear Ports {% badge rearport_count %}</a>
                 </li>
             {% endif %}
         {% endwith %}
-        {% with consoleport_count=object.console_ports.count %}
+        {% with consoleport_count=object.all_console_ports.count %}
             {% if consoleport_count %}
                 <li role="presentation" {% if active_tab == 'console-ports' %} class="active"{% endif %}>
                     <a href="{% url 'dcim:device_consoleports' pk=object.pk %}">Console Ports {% badge consoleport_count %}</a>
                 </li>
             {% endif %}
         {% endwith %}
-        {% with consoleserverport_count=object.console_server_ports.count %}
+        {% with consoleserverport_count=object.all_console_server_ports.count %}
             {% if consoleserverport_count %}
                 <li role="presentation" {% if active_tab == 'console-server-ports' %} class="active"{% endif %}>
                     <a href="{% url 'dcim:device_consoleserverports' pk=object.pk %}">Console Server Ports {% badge consoleserverport_count %}</a>
                 </li>
             {% endif %}
         {% endwith %}
-        {% with powerport_count=object.power_ports.count %}
+        {% with powerport_count=object.all_power_ports.count %}
             {% if powerport_count %}
                 <li role="presentation" {% if active_tab == 'power-ports' %} class="active"{% endif %}>
                     <a href="{% url 'dcim:device_powerports' pk=object.pk %}">Power Ports {% badge powerport_count %}</a>
                 </li>
             {% endif %}
         {% endwith %}
-        {% with poweroutlet_count=object.power_outlets.count %}
+        {% with poweroutlet_count=object.all_power_outlets.count %}
             {% if poweroutlet_count %}
                 <li role="presentation" {% if active_tab == 'power-outlets' %} class="active"{% endif %}>
                     <a href="{% url 'dcim:device_poweroutlets' pk=object.pk %}">Power Outlets {% badge poweroutlet_count %}</a>

nautobot/dcim/templates/dcim/device/consoleports.html

@@ -1,7 +1,6 @@
 {% extends 'dcim/device/base.html' %}
 {% load helpers %}
 {% load static %}
-{% load render_table from django_tables2 %}
 
 {% block content %}
     <form method="post">
@@ -11,11 +10,11 @@
                 <strong>Console Ports</strong>
                 <div class="pull-right noprint">
                     {% if request.user.is_authenticated %}
-                        <button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#DeviceConsolePortTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
+                        {% table_config_button_small consoleport_table %}
                     {% endif %}
                 </div>
             </div>
-            {% render_table consoleport_table 'inc/table.html' %}
+            {% include 'responsive_table.html' with table=consoleport_table %}
             <div class="panel-footer noprint">
                 {% if perms.dcim.change_consoleport %}
                     <button type="submit" name="_rename" formaction="{% url 'dcim:consoleport_bulk_rename' %}?return_url={% url 'dcim:device_consoleports' pk=object.pk %}" class="btn btn-warning btn-xs">

nautobot/dcim/templates/dcim/device/consoleserverports.html

@@ -1,6 +1,5 @@
 {% extends 'dcim/device/base.html' %}
 {% load helpers %}
-{% load render_table from django_tables2 %}
 {% load static %}
 
 {% block content %}
@@ -11,11 +10,11 @@
                 <strong>Console Server Ports</strong>
                 <div class="pull-right noprint">
                     {% if request.user.is_authenticated %}
-                        <button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#DeviceConsoleServerPortTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
+                        {% table_config_button_small consoleserverport_table %}
                     {% endif %}
                 </div>
             </div>
-            {% render_table consoleserverport_table 'inc/table.html' %}
+            {% include 'responsive_table.html' with table=consoleserverport_table %}
             <div class="panel-footer noprint">
                 {% if perms.dcim.change_consoleserverport %}
                     <button type="submit" name="_rename" formaction="{% url 'dcim:consoleserverport_bulk_rename' %}?return_url={% url 'dcim:device_consoleserverports' pk=object.pk %}" class="btn btn-warning btn-xs">

nautobot/dcim/templates/dcim/device/devicebays.html

@@ -1,6 +1,5 @@
 {% extends 'dcim/device/base.html' %}
 {% load helpers %}
-{% load render_table from django_tables2 %}
 {% load static %}
 
 {% block content %}
@@ -11,28 +10,28 @@
                 <strong>Device Bays</strong>
                 <div class="pull-right noprint">
                     {% if request.user.is_authenticated %}
-                        <button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#DeviceDeviceBayTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
+                        {% table_config_button_small devicebay_table %}
                     {% endif %}
                 </div>
             </div>
-            {% render_table devicebay_table 'inc/table.html' %}
+            {% include 'responsive_table.html' with table=devicebay_table %}
             <div class="panel-footer noprint">
                 {% if perms.dcim.change_devicebay %}
-                    <button type="submit" name="_rename" formaction="{% url 'dcim:devicebay_bulk_rename' %}?return_url={{ object.get_absolute_url }}%23tab_devicebays" class="btn btn-warning btn-xs">
+                    <button type="submit" name="_rename" formaction="{% url 'dcim:devicebay_bulk_rename' %}?return_url={{ request.path }}" class="btn btn-warning btn-xs">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
                     </button>
-                    <button type="submit" name="_edit" formaction="{% url 'dcim:devicebay_bulk_edit' %}?device={{ object.pk }}&return_url={{ object.get_absolute_url }}%23tab_devicebays" class="btn btn-warning btn-xs">
+                    <button type="submit" name="_edit" formaction="{% url 'dcim:devicebay_bulk_edit' %}?device={{ object.pk }}&return_url={{ request.path }}" class="btn btn-warning btn-xs">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
                     </button>
                 {% endif %}
                 {% if perms.dcim.delete_devicebay %}
-                    <button type="submit" formaction="{% url 'dcim:devicebay_bulk_delete' %}?return_url={{ object.get_absolute_url }}%23tab_devicebays" class="btn btn-danger btn-xs">
+                    <button type="submit" formaction="{% url 'dcim:devicebay_bulk_delete' %}?return_url={{ request.path }}" class="btn btn-danger btn-xs">
                         <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete selected
                     </button>
                 {% endif %}
                 {% if perms.dcim.add_devicebay %}
                     <div class="pull-right">
-                        <a href="{% url 'dcim:devicebay_add' %}?device={{ object.pk }}&return_url={{ object.get_absolute_url }}%23tab_devicebays" class="btn btn-primary btn-xs">
+                        <a href="{% url 'dcim:devicebay_add' %}?device={{ object.pk }}&return_url={{ request.path }}" class="btn btn-primary btn-xs">
                             <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add device bays
                         </a>
                     </div>