diff --git a/netbox/templates/vpn/ipsecprofile.html b/netbox/templates/vpn/ipsecprofile.html
index 07d1c15f0..08fa3074e 100644
--- a/netbox/templates/vpn/ipsecprofile.html
+++ b/netbox/templates/vpn/ipsecprofile.html
@@ -67,10 +67,6 @@
{% trans "Pre-Shared Key" %} |
{% checkmark object.ike_policy.preshared_key %} |
-
- {% trans "Certificate" %} |
- {% checkmark object.ike_policy.certificate %} |
-
diff --git a/netbox/vpn/api/serializers.py b/netbox/vpn/api/serializers.py
index 30cfc5dce..1c80d1f34 100644
--- a/netbox/vpn/api/serializers.py
+++ b/netbox/vpn/api/serializers.py
@@ -128,8 +128,8 @@ class IKEPolicySerializer(NetBoxModelSerializer):
class Meta:
model = IKEPolicy
fields = (
- 'id', 'url', 'display', 'name', 'description', 'version', 'mode', 'proposals', 'preshared_key',
- 'certificate', 'tags', 'custom_fields', 'created', 'last_updated',
+ 'id', 'url', 'display', 'name', 'description', 'version', 'mode', 'proposals', 'preshared_key', 'tags',
+ 'custom_fields', 'created', 'last_updated',
)
diff --git a/netbox/vpn/forms/bulk_edit.py b/netbox/vpn/forms/bulk_edit.py
index 9a6b87c31..9dee70418 100644
--- a/netbox/vpn/forms/bulk_edit.py
+++ b/netbox/vpn/forms/bulk_edit.py
@@ -134,10 +134,6 @@ class IKEPolicyBulkEditForm(NetBoxModelBulkEditForm):
label=_('Pre-shared key'),
required=False
)
- certificate = forms.CharField(
- label=_('Certificate'),
- required=False
- )
description = forms.CharField(
label=_('Description'),
max_length=200,
@@ -148,11 +144,11 @@ class IKEPolicyBulkEditForm(NetBoxModelBulkEditForm):
model = IKEPolicy
fieldsets = (
(None, (
- 'version', 'mode', 'preshared_key', 'certificate', 'description',
+ 'version', 'mode', 'preshared_key', 'description',
)),
)
nullable_fields = (
- 'preshared_key', 'certificate', 'description', 'comments',
+ 'preshared_key', 'description', 'comments',
)
diff --git a/netbox/vpn/forms/bulk_import.py b/netbox/vpn/forms/bulk_import.py
index a815aa10b..e31df31d1 100644
--- a/netbox/vpn/forms/bulk_import.py
+++ b/netbox/vpn/forms/bulk_import.py
@@ -166,7 +166,7 @@ class IKEPolicyImportForm(NetBoxModelImportForm):
class Meta:
model = IKEPolicy
fields = (
- 'name', 'description', 'version', 'mode', 'proposals', 'preshared_key', 'certificate', 'tags',
+ 'name', 'description', 'version', 'mode', 'proposals', 'preshared_key', 'tags',
)
diff --git a/netbox/vpn/forms/model_forms.py b/netbox/vpn/forms/model_forms.py
index 79d029172..e5cdcd42d 100644
--- a/netbox/vpn/forms/model_forms.py
+++ b/netbox/vpn/forms/model_forms.py
@@ -289,14 +289,13 @@ class IKEPolicyForm(NetBoxModelForm):
fieldsets = (
(_('Policy'), ('name', 'description', 'tags')),
- (_('Parameters'), ('version', 'mode', 'proposals')),
- (_('Authentication'), ('preshared_key', 'certificate')),
+ (_('Parameters'), ('version', 'mode', 'proposals', 'preshared_key')),
)
class Meta:
model = IKEPolicy
fields = [
- 'name', 'description', 'version', 'mode', 'proposals', 'preshared_key', 'certificate', 'tags',
+ 'name', 'description', 'version', 'mode', 'proposals', 'preshared_key', 'tags',
]
diff --git a/netbox/vpn/migrations/0001_initial.py b/netbox/vpn/migrations/0001_initial.py
index 46055e985..ac0658b74 100644
--- a/netbox/vpn/migrations/0001_initial.py
+++ b/netbox/vpn/migrations/0001_initial.py
@@ -1,5 +1,3 @@
-# Generated by Django 4.2.7 on 2023-11-21 13:55
-
from django.db import migrations, models
import django.db.models.deletion
import taggit.managers
@@ -30,7 +28,6 @@ class Migration(migrations.Migration):
('version', models.PositiveSmallIntegerField(default=2)),
('mode', models.CharField()),
('preshared_key', models.TextField(blank=True)),
- ('certificate', models.TextField(blank=True)),
],
options={
'verbose_name': 'IKE policy',
diff --git a/netbox/vpn/models/crypto.py b/netbox/vpn/models/crypto.py
index 84a010a3e..1954dc6a0 100644
--- a/netbox/vpn/models/crypto.py
+++ b/netbox/vpn/models/crypto.py
@@ -98,10 +98,6 @@ class IKEPolicy(NetBoxModel):
verbose_name=_('pre-shared key'),
blank=True
)
- certificate = models.TextField(
- verbose_name=_('certificate'),
- blank=True
- )
clone_fields = (
'version', 'mode', 'proposals',
diff --git a/netbox/vpn/tables.py b/netbox/vpn/tables.py
index b375674c9..23a1481fb 100644
--- a/netbox/vpn/tables.py
+++ b/netbox/vpn/tables.py
@@ -146,9 +146,6 @@ class IKEPolicyTable(NetBoxTable):
preshared_key = tables.Column(
verbose_name=_('Pre-shared Key')
)
- certificate = tables.Column(
- verbose_name=_('Certificate')
- )
tags = columns.TagColumn(
url_name='vpn:ikepolicy_list'
)
@@ -156,8 +153,8 @@ class IKEPolicyTable(NetBoxTable):
class Meta(NetBoxTable.Meta):
model = IKEPolicy
fields = (
- 'pk', 'id', 'name', 'version', 'mode', 'proposals', 'preshared_key', 'certificate', 'description', 'tags',
- 'created', 'last_updated',
+ 'pk', 'id', 'name', 'version', 'mode', 'proposals', 'preshared_key', 'description', 'tags', 'created',
+ 'last_updated',
)
default_columns = (
'pk', 'name', 'version', 'mode', 'proposals', 'description',