nautobot 2.0.0a2__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

nautobot/ipam/tables.py

@@ -20,6 +20,7 @@ from nautobot.tenancy.tables import TenantColumn
 from nautobot.virtualization.models import VMInterface
 from .models import (
     IPAddress,
+    Namespace,
     Prefix,
     RIR,
     RouteTarget,
@@ -27,6 +28,8 @@ from .models import (
     VLAN,
     VLANGroup,
     VRF,
+    VRFDeviceAssignment,
+    VRFPrefixAssignment,
 )
 
 AVAILABLE_LABEL = mark_safe('<span class="label label-success">Available</span>')
@@ -38,7 +41,7 @@ UTILIZATION_GRAPH = """
 
 PREFIX_LINK = """
 {% load helpers %}
-{% for i in record.parents|as_range %}
+{% for i in record.ancestors.count|as_range %}
     <i class="mdi mdi-circle-small"></i>
 {% endfor %}
     <a href="\
@@ -46,8 +49,7 @@ PREFIX_LINK = """
 {% url 'ipam:prefix' pk=record.pk %}\
 {% else %}\
 {% url 'ipam:prefix_add' %}\
-?prefix={{ record }}\
-{% if object.vrf %}&vrf={{ object.vrf.pk }}{% endif %}\
+?prefix={{ record }}&namespace={{ object.namespace.pk }}\
 {% if object.location %}&location={{ object.location.pk }}{% endif %}\
 {% if object.tenant %}&tenant_group={{ object.tenant.tenant_group.pk }}&tenant={{ object.tenant.pk }}{% endif %}\
 {% endif %}\
@@ -56,7 +58,7 @@ PREFIX_LINK = """
 
 PREFIX_COPY_LINK = """
 {% load helpers %}
-{% for i in record.parents|as_range %}
+{% for i in record.ancestors.count|as_range %}
     <i class="mdi mdi-circle-small"></i>
 {% endfor %}
 <span class="hover_copy">
@@ -65,8 +67,7 @@ PREFIX_COPY_LINK = """
 {% url 'ipam:prefix' pk=record.pk %}\
 {% else %}\
 {% url 'ipam:prefix_add' %}\
-?prefix={{ record }}\
-{% if object.vrf %}&vrf={{ object.vrf.pk }}{% endif %}\
+?prefix={{ record }}&namespace={{ object.namespace.pk }}\
 {% if object.location %}&location={{ object.location.pk }}{% endif %}\
 {% if object.tenant %}&tenant_group={{ object.tenant.tenant_group.pk }}&tenant={{ object.tenant.pk }}{% endif %}\
 {% endif %}\
@@ -211,6 +212,22 @@ VLANGROUP_ADD_VLAN = """
 {% endwith %}
 """
 
+
+#
+# Namespaces
+#
+
+
+class NamespaceTable(BaseTable):
+    pk = ToggleColumn()
+    name = tables.LinkColumn()
+    tags = TagColumn(url_name="ipam:namespace_list")
+
+    class Meta(BaseTable.Meta):
+        model = Namespace
+        fields = ("pk", "name", "description", "location")
+
+
 #
 # VRFs
 #
@@ -219,9 +236,8 @@ VLANGROUP_ADD_VLAN = """
 class VRFTable(BaseTable):
     pk = ToggleColumn()
     name = tables.LinkColumn()
-    rd = tables.Column(verbose_name="RD")
+    # rd = tables.Column(verbose_name="RD")
     tenant = TenantColumn()
-    enforce_unique = BooleanColumn(verbose_name="Unique")
     import_targets = tables.TemplateColumn(template_code=VRF_TARGETS, orderable=False)
     export_targets = tables.TemplateColumn(template_code=VRF_TARGETS, orderable=False)
     tags = TagColumn(url_name="ipam:vrf_list")
@@ -231,19 +247,54 @@ class VRFTable(BaseTable):
         fields = (
             "pk",
             "name",
-            "rd",
+            # "rd",
+            "namespace",
             "tenant",
-            "enforce_unique",
             "description",
             "import_targets",
             "export_targets",
             "tags",
         )
-        default_columns = ("pk", "name", "rd", "tenant", "description")
+        # default_columns = ("pk", "name", "rd", "namespace", "tenant", "description")
+        default_columns = ("pk", "name", "namespace", "tenant", "description")
+
 
+class VRFDeviceAssignmentTable(BaseTable):
+    """Table for displaying VRF Device Assignments with RD."""
 
+    vrf = tables.Column(verbose_name="VRF", linkify=lambda record: record.vrf.get_absolute_url(), accessor="vrf.name")
+    device = tables.Column(
+        linkify=lambda record: record.device.get_absolute_url(), accessor="device.name", verbose_name="Device"
+    )
+    virtual_machine = tables.Column(
+        linkify=lambda record: record.virtual_machine.get_absolute_url(),
+        accessor="virtual_machine.name",
+        verbose_name="Virtual Machine",
+    )
+    rd = tables.Column(verbose_name="VRF RD")
+    tenant = TenantColumn(accessor="vrf.tenant")
+
+    class Meta(BaseTable.Meta):
+        model = VRFDeviceAssignment
+        orderable = False
+        fields = ("vrf", "device", "virtual_machine", "rd", "tenant")
+
+
+class VRFPrefixAssignmentTable(BaseTable):
+    """Table for displaying VRF Prefix Assignments."""
+
+    vrf = tables.Column(verbose_name="VRF", linkify=lambda record: record.vrf.get_absolute_url(), accessor="vrf.name")
+    prefix = tables.Column(linkify=True)
+    rd = tables.Column(accessor="vrf.rd", verbose_name="RD")
+    tenant = TenantColumn(accessor="vrf.tenant")
+
+    class Meta(BaseTable.Meta):
+        model = VRFPrefixAssignment
+        fields = ("vrf", "prefix", "rd", "tenant")
+
+
+#
 #
-# Route targets
 #
 
 
@@ -270,17 +321,16 @@ class RIRTable(BaseTable):
     is_private = BooleanColumn(verbose_name="Private")
     assigned_prefix_count = LinkedCountColumn(
         viewname="ipam:prefix_list",
-        url_params={"rir": "slug"},
+        url_params={"rir": "name"},
         verbose_name="Assigned Prefixes",
     )
-    actions = ButtonsColumn(RIR, pk_field="slug")
+    actions = ButtonsColumn(RIR)
 
     class Meta(BaseTable.Meta):
         model = RIR
         fields = (
             "pk",
             "name",
-            "slug",
             "is_private",
             "assigned_prefix_count",
             "description",
@@ -306,22 +356,26 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
     prefix = tables.TemplateColumn(
         template_code=PREFIX_COPY_LINK, attrs={"td": {"class": "text-nowrap"}}, order_by=("network", "prefix_length")
     )
-    vrf = tables.TemplateColumn(template_code=VRF_LINK, verbose_name="VRF")
+    # vrf = tables.TemplateColumn(template_code=VRF_LINK, verbose_name="VRF")
     tenant = TenantColumn()
     location = tables.Column(linkify=True)
+    namespace = tables.Column(linkify=True)
     vlan = tables.Column(linkify=True, verbose_name="VLAN")
     rir = tables.Column(linkify=True)
+    children = tables.Column(accessor="descendants_count")
     date_allocated = tables.DateTimeColumn()
 
     class Meta(BaseTable.Meta):
         model = Prefix
+        orderable = False
         fields = (
             "pk",
             "prefix",
             "type",
             "status",
             "children",
-            "vrf",
+            # "vrf",
+            "namespace",
             "tenant",
             "location",
             "vlan",
@@ -335,7 +389,8 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "prefix",
             "type",
             "status",
-            "vrf",
+            # "vrf",
+            "namespace",
             "tenant",
             "location",
             "vlan",
@@ -355,11 +410,12 @@ class PrefixDetailTable(PrefixTable):
     class Meta(PrefixTable.Meta):
         fields = (
             "pk",
+            "namespace",
             "prefix",
             "type",
             "status",
             "children",
-            "vrf",
+            # "vrf",
             "utilization",
             "tenant",
             "location",
@@ -370,11 +426,12 @@ class PrefixDetailTable(PrefixTable):
         )
         default_columns = (
             "pk",
+            "namespace",
             "prefix",
             "type",
             "status",
             "children",
-            "vrf",
+            # "vrf",
             "utilization",
             "tenant",
             "location",
@@ -392,9 +449,9 @@ class PrefixDetailTable(PrefixTable):
 class IPAddressTable(StatusTableMixin, RoleTableMixin, BaseTable):
     pk = ToggleColumn()
     address = tables.TemplateColumn(
-        template_code=IPADDRESS_COPY_LINK, verbose_name="IP Address", order_by=("host", "prefix_length")
+        template_code=IPADDRESS_COPY_LINK, verbose_name="IP Address", order_by=("host", "mask_length")
     )
-    vrf = tables.TemplateColumn(template_code=VRF_LINK, verbose_name="VRF")
+    # vrf = tables.TemplateColumn(template_code=VRF_LINK, verbose_name="VRF")
     tenant = TenantColumn()
     # TODO: add interface M2M
 
@@ -403,7 +460,7 @@ class IPAddressTable(StatusTableMixin, RoleTableMixin, BaseTable):
         fields = (
             "pk",
             "address",
-            "vrf",
+            # "vrf",
             "status",
             "role",
             "tenant",
@@ -425,7 +482,7 @@ class IPAddressDetailTable(IPAddressTable):
         fields = (
             "pk",
             "address",
-            "vrf",
+            # "vrf",
             "status",
             "role",
             "tenant",
@@ -438,7 +495,7 @@ class IPAddressDetailTable(IPAddressTable):
         default_columns = (
             "pk",
             "address",
-            "vrf",
+            # "vrf",
             "status",
             "role",
             "tenant",
@@ -457,7 +514,7 @@ class IPAddressAssignTable(StatusTableMixin, BaseTable):
         fields = (
             "address",
             "dns_name",
-            "vrf",
+            # "vrf",
             "status",
             "role",
             "tenant",
@@ -472,12 +529,13 @@ class InterfaceIPAddressTable(StatusTableMixin, BaseTable):
     """
 
     address = tables.TemplateColumn(template_code=IPADDRESS_ASSIGN_COPY_LINK, verbose_name="IP Address")
-    vrf = tables.TemplateColumn(template_code=VRF_LINK, verbose_name="VRF")
+    # vrf = tables.TemplateColumn(template_code=VRF_LINK, verbose_name="VRF")
     tenant = TenantColumn()
 
     class Meta(BaseTable.Meta):
         model = IPAddress
-        fields = ("address", "vrf", "status", "role", "tenant", "description")
+        # fields = ("address", "vrf", "status", "role", "tenant", "description")
+        fields = ("address", "status", "role", "tenant", "description")
 
 
 class IPAddressInterfaceTable(InterfaceTable):

nautobot/ipam/templates/ipam/ipaddress.html

@@ -3,9 +3,7 @@
 {% load render_table from django_tables2 %}
 
 {% block extra_breadcrumbs %}
-                {% if object.vrf %}
-                    <li>{{ object.vrf|hyperlinked_object }}</li>
-                {% endif %}
+                    <li>{{ object.parent.namespace|hyperlinked_object }}</li>
 {% endblock extra_breadcrumbs %}
 
 {% block masthead %}
@@ -34,8 +32,12 @@
             </div>
             <table class="table table-hover panel-body attr-table">
                 <tr>
-                    <td>Family</td>
-                    <td>IPv{{ object.family }}</td>
+                    <td>Namespace</td>
+                    <td>{{ object.parent.namespace|hyperlinked_object }}</td>
+                </tr>
+                <tr>
+                    <td>IP Version</td>
+                    <td>IPv{{ object.ip_version }}</td>
                 </tr>
                 <tr>
                     <td>Status</td>
@@ -50,12 +52,14 @@
                     </td>
                 </tr>
                 <tr>
-                    <td>VRF</td>
+                    <td>VRFs</td>
                     <td>
-                        {% if object.vrf %}
-                            {{ object.vrf|hyperlinked_object }}
-                        {% else %}
-                            <span>Global</span>
+                        {% if object.parent.vrfs.exists %}
+                        <ul class="list-unstyled">
+                            {% for vrf in object.parent.vrfs.all %}
+                            <li>{{ vrf|hyperlinked_object }}</li>
+                            {% endfor %}
+                        </ul>
                         {% endif %}
                     </td>
                 </tr>
@@ -131,25 +135,5 @@
 {% endblock content_right_page %}
 
 {% block content_full_width_page %}
-        {% if duplicate_ips_table.rows %}
-            {# Custom version of panel_table.html #}
-            <div class="panel panel-danger">
-                <div class="panel-heading">
-                    <strong>Duplicate IP Addresses</strong>
-                    {% if more_duplicate_ips %}
-                    <div class="pull-right">
-                        <a type="button" class="btn btn-primary btn-xs"
-                        {% if object.vrf %}
-                        href="{% url 'ipam:ipaddress_list' %}?address={{ object.address.ip }}&vrf_id={{ object.vrf.pk }}"
-                        {% else %}
-                        href="{% url 'ipam:ipaddress_list' %}?address={{ object.address.ip }}&vrf_id=null"
-                        {% endif %}
-                        >Show all</a>
-                    </div>
-                    {% endif %}
-                </div>
-                {% render_table duplicate_ips_table 'inc/table.html' %}
-            </div>
-        {% endif %}
         {% include 'utilities/obj_table.html' with table=related_ips_table table_template='panel_table.html' heading='Related IP Addresses' panel_class='default' %}
 {% endblock content_full_width_page %}

nautobot/ipam/templates/ipam/ipaddress_edit.html

@@ -14,6 +14,7 @@
         <div class="panel-heading"><strong>IP Address</strong></div>
         <div class="panel-body">
             {% render_field form.address %}
+            {% render_field form.namespace %}
             {% render_field form.status %}
             {% render_field form.role %}
             {% render_field form.vrf %}

nautobot/ipam/templates/ipam/namespace_ipaddresses.html

@@ -0,0 +1,11 @@
+{% extends 'ipam/namespace_retrieve.html' %}
+
+{% block title %}{{ block.super }} - IP Addresses{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-12">
+            {% include 'utilities/obj_table.html' with table=ip_address_table table_template='panel_table.html' heading='IP Addresses' bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %}
+        </div>
+    </div>
+{% endblock %}

nautobot/ipam/templates/ipam/namespace_prefixes.html

@@ -0,0 +1,11 @@
+{% extends 'ipam/namespace_retrieve.html' %}
+
+{% block title %}{{ block.super }} - Prefixes{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-12">
+            {% include 'utilities/obj_table.html' with table=prefix_table table_template='panel_table.html' heading='Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
+        </div>
+    </div>
+{% endblock %}

nautobot/ipam/templates/ipam/namespace_retrieve.html

@@ -0,0 +1,42 @@
+{% extends 'generic/object_retrieve.html' %}
+{% load helpers %}
+
+{% block content_left_page %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Namespace</strong>
+            </div>
+            <table class="table table-hover panel-body attr-table">
+                <tr>
+                    <td>Name</td>
+                    <td>{{ object.name }}</td>
+                </tr>
+                <tr>
+                    <td>Description</td>
+                    <td>{{ object.description }}</td>
+                </tr>
+                <tr>
+                    <td>Location</td>
+                    <td>{{ object.location | hyperlinked_object }}</td>
+                </tr>
+            </table>
+        </div>
+{% endblock content_left_page %}
+
+{% block extra_nav_tabs %}
+{% if perms.ipam.view_vrf %}
+    <li role="presentation"{% if active_tab == 'vrfs' %} class="active"{% endif %}>
+        <a href="{% url 'ipam:namespace_vrfs' pk=object.pk %}">VRFs <span class="badge">{{ vrf_count }}</span></a>
+    </li>
+{% endif %}
+{% if perms.ipam.view_prefix %}
+    <li role="presentation"{% if active_tab == 'prefixes' %} class="active"{% endif %}>
+        <a href="{% url 'ipam:namespace_prefixes' pk=object.pk %}">Prefixes <span class="badge">{{ prefix_count }}</span></a>
+    </li>
+{% endif %}
+{% if perms.ipam.view_ipaddress %}
+    <li role="presentation"{% if active_tab == 'ip-addresses' %} class="active"{% endif %}>
+        <a href="{% url 'ipam:namespace_ipaddresses' pk=object.pk %}">IP Addresses <span class="badge">{{ ip_address_count }}</span></a>
+    </li>
+{% endif %}
+{% endblock extra_nav_tabs %}

nautobot/ipam/templates/ipam/namespace_vrfs.html

@@ -0,0 +1,11 @@
+{% extends 'ipam/namespace_retrieve.html' %}
+
+{% block title %}{{ block.super }} - VRFs{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-12">
+            {% include 'utilities/obj_table.html' with table=vrf_table table_template='panel_table.html' heading='VRFs' bulk_edit_url='ipam:vrf_bulk_edit' bulk_delete_url='ipam:vrf_bulk_delete' %}
+        </div>
+    </div>
+{% endblock %}

nautobot/ipam/templates/ipam/prefix.html

@@ -1,11 +1,13 @@
 {% extends 'generic/object_detail.html' %}
 {% load helpers %}
 
-{% block extra_breadcrumbs %}
-                {% if object.vrf %}
-                    <li>{{ object.vrf|hyperlinked_object }}</li>
-                {% endif %}
-{% endblock extra_breadcrumbs %}
+{% block breadcrumbs %}
+    <li><a href="{% url 'ipam:namespace_list' %}">Namespaces</a></li>
+    <li>{{ object.namespace | hyperlinked_object }}</li>
+    <li><a href="{% url list_url %}?namespace={{ object.namespace.pk }}">{{ verbose_name_plural|bettertitle }}</a></li>
+    {% block extra_breadcrumbs %}{% endblock extra_breadcrumbs %}
+    <li>{{ object|hyperlinked_object }}</li>
+{% endblock breadcrumbs %}
 
 {% block masthead %}
 <h1>
@@ -18,12 +20,12 @@
 
 {% block extra_buttons %}
         {% if perms.ipam.add_prefix and active_tab == 'prefixes' and first_available_prefix %}
-        <a href="{% url 'ipam:prefix_add' %}?prefix={{ first_available_prefix }}&vrf={{ object.vrf.pk }}&location={{ object.location.pk }}&tenant_group={{ object.tenant.tenant_group.pk }}&tenant={{ object.tenant.pk }}" class="btn btn-success">
+        <a href="{% url 'ipam:prefix_add' %}?prefix={{ first_available_prefix }}&namespace={{ object.namespace.pk }}&location={{ object.location.pk }}&tenant_group={{ object.tenant.tenant_group.pk }}&tenant={{ object.tenant.pk }}" class="btn btn-success">
                 <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add Child Prefix
             </a>
         {% endif %}
         {% if perms.ipam.add_ipaddress and active_tab == 'ip-addresses' and first_available_ip %}
-            <a href="{% url 'ipam:ipaddress_add' %}?address={{ first_available_ip }}&vrf={{ object.vrf.pk }}&tenant_group={{ object.tenant.tenant_group.pk }}&tenant={{ object.tenant.pk }}" class="btn btn-success">
+            <a href="{% url 'ipam:ipaddress_add' %}?address={{ first_available_ip }}&namespace={{ object.namespace.pk }}&tenant_group={{ object.tenant.tenant_group.pk }}&tenant={{ object.tenant.pk }}" class="btn btn-success">
                 <span class="mdi mdi-plus-thick" aria-hidden="true"></span>
                 Add an IP Address
             </a>
@@ -36,11 +38,11 @@
 
 {% block extra_nav_tabs %}
         <li role="presentation"{% if active_tab == 'prefixes' %} class="active"{% endif %}>
-            <a href="{% url 'ipam:prefix_prefixes' pk=object.pk %}">Child Prefixes <span class="badge">{{ object.get_child_prefixes.count }}</span></a>
+            <a href="{% url 'ipam:prefix_prefixes' pk=object.pk %}">Child Prefixes <span class="badge">{{ object.descendants_count }}</span></a>
         </li>
-        {% if perms.ipam.view_ipaddress and object.type != 'container' %}
+        {% if perms.ipam.view_ipaddress %}
             <li role="presentation"{% if active_tab == 'ip-addresses' %} class="active"{% endif %}>
-                <a href="{% url 'ipam:prefix_ipaddresses' pk=object.pk %}">IP Addresses <span class="badge">{{ object.get_child_ips.count }}</span></a>
+                <a href="{% url 'ipam:prefix_ipaddresses' pk=object.pk %}">IP Addresses <span class="badge">{{ object.ip_addresses.count }}</span></a>
             </li>
         {% endif %}
 {% endblock extra_nav_tabs %}
@@ -52,23 +54,27 @@
                 </div>
                 <table class="table table-hover panel-body attr-table">
                     <tr>
-                        <td>Family</td>
-                        <td>IPv{{ object.family }}</td>
+                        <td>Namespace</td>
+                        <td>{{ object.namespace|hyperlinked_object }}</td>
                     </tr>
                     <tr>
-                        <td>Type</td>
+                        <td>IP Version</td>
+                        <td>IPv{{ object.ip_version }}</td>
+                    </tr>
+                    <tr>
+                        <td>Status</td>
                         <td>
-                            {{ object.get_type_display }}
+                            {{ object.status| hyperlinked_object_with_color }}
                         </td>
                     </tr>
                     <tr>
-                        <td>VRF</td>
+                        <td>Role</td>
+                        <td>{{ object.role | hyperlinked_object_with_color }}</td>
+                    </tr>
+                    <tr>
+                        <td>Type</td>
                         <td>
-                            {% if object.vrf %}
-                                {{ object.vrf|hyperlinked_object }} ({{ object.vrf.rd }})
-                            {% else %}
-                                <span>Global</span>
-                            {% endif %}
+                            {{ object.get_type_display }}
                         </td>
                     </tr>
                     <tr>
@@ -93,16 +99,6 @@
                             {{ object.vlan|hyperlinked_object }}
                         </td>
                     </tr>
-                    <tr>
-                        <td>Status</td>
-                        <td>
-                            {{ object.status| hyperlinked_object_with_color }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Role</td>
-                        <td>{{ object.role | hyperlinked_object_with_color }}</td>
-                    </tr>
                     <tr>
                         <td>RIR</td>
                         <td>{{ object.rir|hyperlinked_object }}</td>
@@ -124,8 +120,6 @@
 {% endblock content_left_page %}
 
 {% block content_right_page %}
-            {% if duplicate_prefix_table.rows %}
-                {% include 'panel_table.html' with table=duplicate_prefix_table heading='Duplicate Prefixes' panel_class='danger' %}
-            {% endif %}
             {% include 'panel_table.html' with table=parent_prefix_table heading='Parent Prefixes' panel_class='default' %}
+            {% include "utilities/obj_table.html" with table=vrf_table table_template="panel_table.html" heading="Assigned VRFs" disable_pagination=False %}
 {% endblock content_right_page %}

nautobot/ipam/templates/ipam/prefix_edit.html

@@ -6,15 +6,21 @@
         <div class="panel-heading"><strong>Prefix</strong></div>
         <div class="panel-body">
             {% render_field form.prefix %}
+            {% render_field form.namespace %}
             {% render_field form.type %}
             {% render_field form.status %}
-            {% render_field form.vrf %}
             {% render_field form.role %}
             {% render_field form.rir %}
             {% render_field form.date_allocated %}
             {% render_field form.description %}
         </div>
     </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>VRF Assignment</strong></div>
+        <div class="panel-body">
+            {% render_field form.vrfs %}
+        </div>
+    </div>
     <div class="panel panel-default">
         <div class="panel-heading"><strong>Location/VLAN Assignment</strong></div>
         <div class="panel-body">

nautobot/ipam/templates/ipam/vlangroup.html

@@ -3,19 +3,6 @@
 {% load helpers %}
 {% load plugins %}
 
-{% block buttons %}
-        {% plugin_buttons object %}
-        {% if perms.ipam.add_vlangroup %}
-            {% clone_button object %}
-        {% endif %}
-        {% if perms.ipam.change_vlangroup %}
-            {% edit_button object key="pk" %}
-        {% endif %}
-        {% if perms.ipam.delete_vlangroup %}
-            {% delete_button object key="pk" %}
-        {% endif %}
-{% endblock buttons %}
-
 {% block content_left_page %}
         <div class="panel panel-default">
             <div class="panel-heading">

nautobot/ipam/templates/ipam/vrf.html

@@ -7,6 +7,10 @@
                 <strong>VRF</strong>
             </div>
             <table class="table table-hover panel-body attr-table">
+                <tr>
+                    <td>Namespace</td>
+                    <td>{{ object.namespace|hyperlinked_object }}</td>
+                </tr>
                 <tr>
                     <td>Route Distinguisher</td>
                     <td>{{ object.rd }}</td>
@@ -15,10 +19,6 @@
                     <td>Tenant</td>
                     <td>{{ object.tenant|hyperlinked_object }}</td>
                 </tr>
-                <tr>
-                    <td>Unique IP Space</td>
-                    <td>{{ object.enforce_unique | render_boolean }}</td>
-                </tr>
                 <tr>
                     <td>Description</td>
                     <td>{{ object.description|placeholder }}</td>
@@ -36,4 +36,6 @@
 {% block content_right_page %}
         {% include 'panel_table.html' with table=import_targets_table heading="Import Route Targets" %}
         {% include 'panel_table.html' with table=export_targets_table heading="Export Route Targets" %}
+	{% include 'panel_table.html' with table=prefix_table heading="Assigned Prefixes" %}
+	{% include 'panel_table.html' with table=device_table heading="Assigned Devices" %}
 {% endblock content_right_page %}