nautobot 3.0.0a3__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

nautobot/ui/package-lock.json

@@ -17,7 +17,7 @@
         "graphiql": "2.4.7",
         "graphql": "16.10.0",
         "graphql-ws": "5.13.1",
-        "highlight.js": "11.9.0",
+        "highlight.js": "^11.11.1",
         "htmx.org": "^2.0.6",
         "jquery": "^3.7.1",
         "jquery-ui": "^1.14.1",
@@ -32,6 +32,7 @@
       "devDependencies": {
         "@eslint/js": "^9.32.0",
         "autoprefixer": "^10.4.20",
+        "copy-webpack-plugin": "^13.0.1",
         "css-loader": "^7.1.2",
         "eslint": "^9.32.0",
         "eslint-plugin-import": "^2.32.0",
@@ -2055,6 +2056,30 @@
         "toggle-selection": "^1.0.6"
       }
     },
+    "node_modules/copy-webpack-plugin": {
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-13.0.1.tgz",
+      "integrity": "sha512-J+YV3WfhY6W/Xf9h+J1znYuqTye2xkBUIGyTPWuBAT27qajBa5mR4f8WBmfDY3YjRftT2kqZZiLi1qf0H+UOFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "glob-parent": "^6.0.1",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.2.0",
+        "serialize-javascript": "^6.0.2",
+        "tinyglobby": "^0.2.12"
+      },
+      "engines": {
+        "node": ">= 18.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      }
+    },
     "node_modules/cosmiconfig": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
@@ -3507,9 +3532,9 @@
       }
     },
     "node_modules/highlight.js": {
-      "version": "11.9.0",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz",
-      "integrity": "sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==",
+      "version": "11.11.1",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.11.1.tgz",
+      "integrity": "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=12.0.0"
@@ -4467,6 +4492,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/normalize-range": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
@@ -6028,6 +6063,54 @@
       "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==",
       "license": "MIT"
     },
+    "node_modules/tinyglobby": {
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
+      }
+    },
+    "node_modules/tinyglobby/node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tinyglobby/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",

nautobot/ui/package.json

@@ -23,7 +23,7 @@
     "graphiql": "2.4.7",
     "graphql": "16.10.0",
     "graphql-ws": "5.13.1",
-    "highlight.js": "11.9.0",
+    "highlight.js": "^11.11.1",
     "htmx.org": "^2.0.6",
     "jquery": "^3.7.1",
     "jquery-ui": "^1.14.1",
@@ -38,6 +38,7 @@
   "devDependencies": {
     "@eslint/js": "^9.32.0",
     "autoprefixer": "^10.4.20",
+    "copy-webpack-plugin": "^13.0.1",
     "css-loader": "^7.1.2",
     "eslint": "^9.32.0",
     "eslint-plugin-import": "^2.32.0",

nautobot/ui/src/js/nautobot.js

@@ -15,7 +15,6 @@ import flatpickr from 'flatpickr';
 window.flatpickr = flatpickr;
 
 import hljs from 'highlight.js/lib/core';
-import 'highlight.js/styles/github.css';
 import graphql from 'highlight.js/lib/languages/graphql';
 import json from 'highlight.js/lib/languages/json';
 import xml from 'highlight.js/lib/languages/xml';

nautobot/ui/src/js/select2.js

@@ -81,7 +81,7 @@ const initializeSelect2 = (context, selector, options) =>
   [...getElement(context).querySelectorAll(selector)].forEach((element) =>
     $(element).select2({
       allowClear: true,
-      placeholder: element.getAttribute('placeholder') || '---------',
+      placeholder: '---------',
       selectionCssClass: 'select2--small',
       theme: 'bootstrap-5',
       width: 'off',
@@ -292,14 +292,65 @@ const initializeDynamicChoiceSelection = (context, dropdownParent = null) => {
   });
 };
 
-const initializeMultiValueChar = (context, dropdownParent = null) =>
+const initializeMultiValueChar = (context, dropdownParent = null) => {
   initializeSelect2(context, '.nautobot-select2-multi-value-char', {
     dropdownParent,
     language: { noResults: () => 'Type something to add it as an option' },
     multiple: true,
     tags: true,
+    tokenSeparators: [','],
   });
 
+  // Ensure pressing Enter in the Select2 search adds the current token instead of submitting the form
+  [...getElement(context).querySelectorAll('.nautobot-select2-multi-value-char')].forEach((element) => {
+    $(element).on('select2:open', () => {
+      const container = document.querySelector('.select2-container--open');
+      if (!container) {
+        return;
+      }
+      const search = container.querySelector('input.select2-search__field');
+      if (!search) {
+        return;
+      }
+
+      // Avoid stacking multiple handlers
+      if (search.getAttribute('data-enter-binds')) {
+        return;
+      }
+      search.setAttribute('data-enter-binds', '1');
+
+      search.addEventListener('keydown', (ev) => {
+        if (ev.key === 'Enter') {
+          ev.preventDefault();
+          ev.stopPropagation();
+          const val = search.value.trim();
+          if (!val) {
+            return;
+          }
+          const sel = $(element).get(0);
+          // If option doesn't exist, create it; otherwise select it
+          const found = Array.prototype.find.call(sel.options, (opt) => String(opt.value) === String(val));
+          if (found) {
+            found.selected = true;
+          } else {
+            sel.add(new Option(val, val, true, true));
+          }
+          // Clear the search box and notify Select2
+          search.value = '';
+          $(element).trigger('change');
+          // Close the dropdown so it doesn't linger after add
+          try {
+            $(element).select2('close');
+            // eslint-disable-next-line no-unused-vars
+          } catch (exception) {
+            // Intentional no-op
+          }
+        }
+      });
+    });
+  });
+};
+
 const initializeStaticChoiceSelection = (context, dropdownParent = null) =>
   initializeSelect2(context, '.nautobot-select2-static', { dropdownParent });
 

nautobot/ui/src/scss/nautobot.scss

@@ -907,6 +907,12 @@ $table-variants: (
 
     color: var(--#{$prefix}table-color);
     border-color: var(--#{$prefix}table-border-color);
+
+    @if $color == "primary" or $color == "info" {
+      a {
+        text-decoration: underline;
+      }
+    }
   }
 }
 
@@ -915,6 +921,10 @@ $table-variants: (
   white-space: nowrap;
 }
 
+table.attr-table td:nth-child(1) {
+  width: 25%;
+}
+
 /* Buttons */
 .btn {
   --#{$prefix}btn-box-shadow: #{$btn-box-shadow};
@@ -1262,6 +1272,18 @@ textarea {
   }
 }
 
+.card-body {
+  .nav-tabs {
+    margin-inline: $card-spacer-x * -1;
+  }
+
+  .tab-content {
+    > .tab-pane {
+      padding-block-start: $card-spacer-y;
+    }
+  }
+}
+
 .card-header {
   position: relative;
   text-transform: uppercase;
@@ -1397,6 +1419,11 @@ textarea {
   }
 }
 
+/* Alerts */
+.alert:is(.alert-primary, .alert-info) a {
+  text-decoration: underline;
+}
+
 /* Progress bars */
 .progress {
   td & {
@@ -1656,7 +1683,7 @@ body {
     }
 
     img {
-      height: 1.875rem; /* 30px */
+      height: 2rem; /* 32px */
     }
   }
 
@@ -1876,7 +1903,7 @@ body {
     @include fade-in;
     @include transition($transition-base);
     right: -0.8125rem; /* -13px */
-    top: 1.375rem; /* 22px */
+    top: 1.4375rem; /* 23px */
 
     &::before { /* Chevron icon */
       @include chevron(1rem, $navy-0); /* 16px */
@@ -2354,6 +2381,11 @@ pre code.hljs {
   border-radius: $border-radius;
 }
 
+/* Swagger docs */
+pre.version, pre.version-stamp {
+    background-color: inherit !important;
+}
+
 /* Rendered Markdown */
 .nb-rendered-markdown {
   table {
@@ -2469,3 +2501,20 @@ pre code.hljs {
 .d-none {
   display: none !important;
 }
+
+/* Dark mode workaround */
+@include color-mode(dark, true) {
+  .invert-in-dark-mode {
+    filter: invert(1) hue-rotate(180deg);
+  }
+}
+
+/*
+ * FIXME(norbert-mieczkowski-codilime): bootstrap-filestyle library, which is used by `ClearableFileInput` widget,
+ *   currently in version 1.2.3, still uses Bootstrap 3. This `.hidden` class "polyfill" is required until the library
+ *   is updated or removed/replaced completely. Bootstrap 5 supports file inputs out of the box, so it may be a good
+ *   time to get rid of bootstrap-filestyle.
+ */
+.hidden {
+  @extend .d-none;
+}

nautobot/ui/webpack.config.js

@@ -2,6 +2,7 @@
 
 import path from 'node:path';
 import autoprefixer from 'autoprefixer';
+import CopyPlugin from 'copy-webpack-plugin';
 import miniCssExtractPlugin from 'mini-css-extract-plugin'
 
 const __dirname = import.meta.dirname;
@@ -24,6 +25,18 @@ export default [
             }
         },
         plugins: [
+            new CopyPlugin({
+                patterns: [
+                    {
+                        from: path.resolve(__dirname, 'node_modules', 'highlight.js', 'styles', 'github.min.css'),
+                        to: path.resolve(__dirname, '..', 'project-static', 'dist', 'css'),
+                    },
+                    {
+                        from: path.resolve(__dirname, 'node_modules', 'highlight.js', 'styles', 'github-dark.min.css'),
+                        to: path.resolve(__dirname, '..', 'project-static', 'dist', 'css'),
+                    },
+                ],
+            }),
             new miniCssExtractPlugin(
                 {
                     filename: 'css/[name].css'

nautobot/users/templates/users/preferences.html

@@ -13,7 +13,11 @@
                             <table class="table table-striped">
                                 <thead>
                                     <tr>
-                                        <th><input type="checkbox" class="toggle" title="Toggle all"></th>
+                                        <th>
+                                            <input class="form-check-input nb-form-check-input-sm mt-2 toggle"
+                                                   title="Toggle all"
+                                                   type="checkbox">
+                                        </th>
                                         <th>Preference</th>
                                         <th>Value</th>
                                     </tr>
@@ -21,7 +25,12 @@
                                 <tbody>
                                     {% for key, value in preferences.items %}
                                         <tr>
-                                            <td class="nb-w-0"><input type="checkbox" name="pk" value="{{ key }}"></td>
+                                            <td class="nb-w-0">
+                                                <input class="form-check-input nb-form-check-input-sm mt-2"
+                                                       name="pk"
+                                                       type="checkbox"
+                                                       value="{{ key }}">
+                                            </td>
                                             <td><samp>{{ key }}</samp></td>
                                             <td><samp>{{ value }}</samp></td>
                                         </tr>

nautobot/virtualization/filters.py

@@ -22,7 +22,7 @@ from nautobot.extras.filters import (
     RoleModelFilterSetMixin,
     StatusModelFilterSetMixin,
 )
-from nautobot.ipam.models import IPAddress, Service, VLAN
+from nautobot.ipam.models import IPAddress, Service, VLAN, VRF
 from nautobot.tenancy.filters import TenancyModelFilterSetMixin
 
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
@@ -224,6 +224,11 @@ class VirtualMachineFilterSet(
         distinct=True,
     )
     has_ip_addresses = RelatedMembershipBooleanFilter(field_name="interfaces__ip_addresses", label="Has IP addresses")
+    vrfs = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=VRF.objects.all(),
+        to_field_name="rd",
+        label="VRFs (ID or RD)",
+    )
 
     def filter_ip_addresses(self, queryset, name, value):
         pk_values = set(item for item in value if is_uuid(item))

nautobot/virtualization/tests/test_filters.py

@@ -3,7 +3,7 @@ from nautobot.dcim.choices import InterfaceModeChoices
 from nautobot.dcim.models import Device, DeviceType, Location, LocationType, Manufacturer, Platform, SoftwareVersion
 from nautobot.extras.models import Role, Status, Tag
 from nautobot.ipam.choices import ServiceProtocolChoices
-from nautobot.ipam.models import IPAddress, Namespace, Prefix, Service, VLAN
+from nautobot.ipam.models import IPAddress, Namespace, Prefix, Service, VLAN, VRF, VRFDeviceAssignment
 from nautobot.tenancy.models import Tenant
 from nautobot.virtualization.filters import (
     ClusterFilterSet,
@@ -238,6 +238,8 @@ class VirtualMachineTestCase(FilterTestCases.FilterTestCase, FilterTestCases.Ten
         ("status", "status__id"),
         ("status", "status__name"),
         ("vcpus",),
+        ("vrfs", "vrfs__id"),
+        ("vrfs", "vrfs__rd"),
     )
 
     @classmethod
@@ -446,6 +448,13 @@ class VirtualMachineTestCase(FilterTestCases.FilterTestCase, FilterTestCases.Ten
         vms[0].tags.set(Tag.objects.get_for_model(VirtualMachine))
         vms[1].tags.set(Tag.objects.get_for_model(VirtualMachine)[:3])
 
+        vrfs = (
+            VRF.objects.create(name="VRF 1", rd="1:1"),
+            VRF.objects.create(name="VRF 2", rd="1:2"),
+        )
+        VRFDeviceAssignment.objects.create(virtual_machine=vms[0], vrf=vrfs[0])
+        VRFDeviceAssignment.objects.create(virtual_machine=vms[1], vrf=vrfs[1])
+
     def test_filters_generic(self):
         # Assign more than 2 different software versions to VirtualMachine before we test generic filters
         software_versions = list(SoftwareVersion.objects.all())

nautobot/virtualization/tests/test_models.py

@@ -145,6 +145,7 @@ class VMInterfaceTestCase(TestCase):  # TODO: change to BaseModelTestCase
             name="Int1", virtual_machine=self.virtualmachine, status=self.int_status
         )
         ips = list(IPAddress.objects.all()[:10])
+        self.assertEqual(len(ips), 10)
 
         # baseline (no vm_interface to ip address relationships exists)
         self.assertFalse(IPAddressToInterface.objects.filter(vm_interface=vm_interface).exists())

nautobot/virtualization/views.py

@@ -191,6 +191,8 @@ class VirtualMachineUIViewSet(NautobotUIViewSet):
                 table_class=VRFDeviceAssignmentTable,
                 table_filter="virtual_machine",
                 exclude_columns=["related_object_type", "related_object_name"],
+                related_list_url_name="ipam:vrf_list",
+                related_field_name="virtual_machines",
             ),
             object_detail.ObjectFieldsPanel(
                 weight=200,
@@ -262,6 +264,7 @@ class VirtualMachineUIViewSet(NautobotUIViewSet):
         detail=True,
         url_path="config-context",
         url_name="configcontext",
+        custom_view_base_action="view",
         custom_view_additional_permissions=["extras.view_configcontext"],
     )
     def config_context(self, request, pk):
@@ -288,7 +291,7 @@ class VirtualMachineUIViewSet(NautobotUIViewSet):
             "source_contexts": ConfigContext.objects.restrict(request.user, "view").get_for_object(instance),
             "format": data_format,
             "template": "extras/object_configcontext.html",
-            "base_template": "virtualization/virtualmachine.html",
+            "base_template": "generic/object_retrieve.html",
         }
 
         return Response(context)

nautobot/vpn/factory.py

@@ -1,3 +1,4 @@
+from django.contrib.contenttypes.models import ContentType
 import factory
 import faker
 
@@ -8,9 +9,9 @@ from nautobot.core.factory import (
     random_instance,
     UniqueFaker,
 )
-from nautobot.dcim.models import Device, Interface
+from nautobot.dcim.models import Interface
 from nautobot.extras.models import DynamicGroup, Role, SecretsGroup, Status
-from nautobot.ipam.models import IPAddress, Prefix
+from nautobot.ipam.models import Prefix
 from nautobot.tenancy.models import Tenant
 from nautobot.vpn import choices, models
 
@@ -163,24 +164,26 @@ class VPNTunnelFactory(PrimaryModelFactory):
 class VPNTunnelEndpointFactory(PrimaryModelFactory):
     class Meta:
         model = models.VPNTunnelEndpoint
-        exclude = ("has_device", "has_profile", "has_role", "has_tenant")
+        exclude = ("has_source_interface", "has_profile", "has_role", "has_tenant")
 
-    has_device = NautobotBoolIterator()
-    device = factory.Maybe("has_device", random_instance(Device), None)
+    has_source_interface = NautobotBoolIterator()
     source_interface = factory.Maybe(
-        "has_device",
+        "has_source_interface",
         random_instance(
             lambda: Interface.objects.filter(vpn_tunnel_endpoints_src_int__isnull=True, device__isnull=False)
         ),
         None,
     )
-    source_ipaddress = factory.Maybe("has_device", random_instance(IPAddress), None)
-    source_fqdn = factory.Maybe("has_device", "", factory.Faker("word"))
-    tunnel_interface = factory.Maybe(
-        "has_device",
-        random_instance(lambda: Interface.objects.filter(type="tunnel", vpn_tunnel_endpoints_tunnel__isnull=True)),
-        None,
-    )
+    source_fqdn = factory.Maybe("has_source_interface", "", factory.Faker("hostname"))
+
+    @factory.lazy_attribute
+    def tunnel_interface(self):
+        """Filter tunnel interfaces on the same device as source_interface."""
+        if self.has_source_interface:
+            qs = Interface.objects.filter(type="tunnel", device=self.source_interface.device)
+            return factory.random.randgen.choice(qs) if qs.exists() else None
+        return None
+
     has_profile = NautobotBoolIterator()
     vpn_profile = factory.Maybe("has_profile", random_instance(models.VPNProfile), None)
     has_role = NautobotBoolIterator()
@@ -198,7 +201,10 @@ class VPNTunnelEndpointFactory(PrimaryModelFactory):
             if extracted:
                 self.protected_prefixes.set(extracted)
             else:
-                self.protected_prefixes.set(get_random_instances(Prefix, minimum=0))
+                # TODO Investigate https://github.com/nautobot/nautobot/actions/runs/11019738391/job/30603271529
+                # to uncomment the line below.
+                # self.protected_prefixes.set(get_random_instances(Prefix))
+                self.protected_prefixes.set(get_random_instances(model_or_queryset_or_lambda=Prefix, maximum=1))
 
     @factory.post_generation
     def protected_prefixes_dg(self, create, extracted, **kwargs):
@@ -206,4 +212,8 @@ class VPNTunnelEndpointFactory(PrimaryModelFactory):
             if extracted:
                 self.protected_prefixes_dg.set(extracted)
             else:
-                self.protected_prefixes_dg.set(get_random_instances(DynamicGroup, minimum=0))
+                self.protected_prefixes_dg.set(
+                    get_random_instances(
+                        DynamicGroup.objects.filter(content_type=ContentType.objects.get_for_model(Prefix)), minimum=0
+                    )
+                )

nautobot/vpn/filters.py

@@ -193,6 +193,7 @@ class VPNTunnelEndpointFilterSet(TenancyModelFilterSetMixin, NautobotFilterSet):
     q = SearchFilter(
         filter_predicates={
             "source_fqdn": "icontains",
+            "device__name": "icontains",
         }
     )
     device = NaturalKeyOrPKMultipleChoiceFilter(

nautobot/vpn/forms.py

@@ -446,6 +446,7 @@ class VPNTunnelEndpointForm(NautobotModelForm, TenancyForm):  # pylint: disable=
         required=False,
         label="Protected Prefixes Dynamic Group",
         to_field_name="name",
+        query_params={"content_type": "ipam.prefix"},
         help_text="Protected Prefixes behind the tunnel endpoint.",
     )
 

nautobot/vpn/migrations/0001_initial.py

@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
         ("tenancy", "0009_update_all_charfields_max_length_to_255"),
         ("extras", "0130_jobresult_generate_log_entry_counts"),
         ("ipam", "0053_alter_vrfdeviceassignment_options_and_more"),
-        ("dcim", "0079_device_name_data_migration"),
+        ("dcim", "0080_device_name_data_migration"),
     ]
 
     operations = [

nautobot/vpn/models.py

@@ -497,11 +497,7 @@ class VPNTunnelEndpoint(PrimaryModel):  # pylint: disable=too-many-ancestors
     def _name(self):
         """Dynamic name field."""
         if self.source_interface:
-            if self.source_interface.parent:
-                parent_intf = f"{self.source_interface.parent.name} {self.source_interface.name}"
-            else:
-                # Interface on a module that isn't installed in a device at present
-                parent_intf = f"{self.source_interface.module} {self.source_interface.name}"
+            parent_intf = f"{self.source_interface.parent.name} {self.source_interface.name}"
             if self.source_ipaddress:
                 return f"{parent_intf} ({self.source_ipaddress.address})"
             return parent_intf
@@ -516,12 +512,24 @@ class VPNTunnelEndpoint(PrimaryModel):  # pylint: disable=too-many-ancestors
             raise ValidationError("Source IP Address and Source FQDN are mutually exclusive fields. Select only one.")
         if not any([self.source_interface, self.source_ipaddress, self.source_fqdn]):
             raise ValidationError("Source Interface or Source IP Address or Source FQDN Is required.")
-        if self.source_interface and not self.source_interface.device:
+        if self.source_interface and not self.source_interface.parent:
             raise ValidationError("Source Interface must belong to a device.")
+        if (
+            self.source_ipaddress
+            and self.source_interface
+            and (self.source_ipaddress not in self.source_interface.ip_addresses.all())
+        ):
+            raise ValidationError("Source IP address must be assigned to Source Interface.")
+        if (
+            self.tunnel_interface
+            and self.source_interface
+            and (self.tunnel_interface not in self.source_interface.parent.all_interfaces)
+        ):
+            raise ValidationError("Tunnel Interface and Source Interface must be on the same device")
         return super().clean()
 
     def save(self, *args, **kwargs):
-        if self.source_interface and not self.device:
-            self.device = self.source_interface.device
+        if self.source_interface:
+            self.device = self.source_interface.parent
         self.name = self._name()
         super().save(*args, **kwargs)

nautobot/vpn/tables.py

@@ -5,6 +5,7 @@ import django_tables2 as tables
 
 from nautobot.apps.tables import (
     BaseTable,
+    BooleanColumn,
     ButtonsColumn,
     LinkedCountColumn,
     RoleTableMixin,
@@ -25,17 +26,19 @@ class VPNProfileTable(RoleTableMixin, BaseTable):
     name = tables.Column(linkify=True)
     vpn_phase1_policy_count = LinkedCountColumn(
         viewname="vpn:vpnphase1policy_list",
-        verbose_name="VPN Phase 1 Policy",
+        verbose_name="Phase 1 Policies",
         url_params={"vpn_profiles": "pk"},
     )
     vpn_phase2_policy_count = LinkedCountColumn(
         viewname="vpn:vpnphase2policy_list",
-        verbose_name="VPN Phase 2 Policy",
+        verbose_name="Phase 2 Policies",
         url_params={"vpn_profiles": "pk"},
     )
     tenant = TenantColumn()
     actions = ButtonsColumn(models.VPNProfile)
     tags = TagColumn(url_name="vpn:vpnprofile_list")
+    keepalive_enabled = BooleanColumn()
+    nat_traversal = BooleanColumn()
 
     class Meta(BaseTable.Meta):
         """Meta attributes."""