Drop certificate field from IKEPolicy

This commit is contained in:
Jeremy Stretch 2023-11-22 09:14:17 -05:00
parent 624fcbff8e
commit c929fa380a
8 changed files with 9 additions and 28 deletions

View File

@ -67,10 +67,6 @@
<th scope="row">{% trans "Pre-Shared Key" %}</th>
<td>{% checkmark object.ike_policy.preshared_key %}</td>
</tr>
<tr>
<th scope="row">{% trans "Certificate" %}</th>
<td>{% checkmark object.ike_policy.certificate %}</td>
</tr>
</table>
</div>
</div>

View File

@ -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',
)

View File

@ -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',
)

View File

@ -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',
)

View File

@ -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',
]

View File

@ -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',

View File

@ -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',

View File

@ -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',