NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-22 23:46:44 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Drop certificate field from IKEPolicy

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/templates/vpn/ipsecprofile.html
View File

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

4
netbox/vpn/api/serializers.py
View File

@ -128,8 +128,8 @@ class IKEPolicySerializer(NetBoxModelSerializer):
class Meta: class Meta:
model = IKEPolicy model = IKEPolicy
fields = ( fields = (
'id', 'url', 'display', 'name', 'description', 'version', 'mode', 'proposals', 'preshared_key', 'id', 'url', 'display', 'name', 'description', 'version', 'mode', 'proposals', 'preshared_key', 'tags',
'certificate', 'tags', 'custom_fields', 'created', 'last_updated', 'custom_fields', 'created', 'last_updated',
) )

8
netbox/vpn/forms/bulk_edit.py
View File

@ -134,10 +134,6 @@ class IKEPolicyBulkEditForm(NetBoxModelBulkEditForm):
label=_('Pre-shared key'), label=_('Pre-shared key'),
required=False required=False
) )
certificate = forms.CharField(
label=_('Certificate'),
required=False
)
description = forms.CharField( description = forms.CharField(
label=_('Description'), label=_('Description'),
max_length=200, max_length=200,
@ -148,11 +144,11 @@ class IKEPolicyBulkEditForm(NetBoxModelBulkEditForm):
model = IKEPolicy model = IKEPolicy
fieldsets = ( fieldsets = (
(None, ( (None, (
'version', 'mode', 'preshared_key', 'certificate', 'description', 'version', 'mode', 'preshared_key', 'description',
)), )),
) )
nullable_fields = ( nullable_fields = (
'preshared_key', 'certificate', 'description', 'comments', 'preshared_key', 'description', 'comments',
) )

2
netbox/vpn/forms/bulk_import.py
View File

@ -166,7 +166,7 @@ class IKEPolicyImportForm(NetBoxModelImportForm):
class Meta: class Meta:
model = IKEPolicy model = IKEPolicy
fields = ( fields = (
'name', 'description', 'version', 'mode', 'proposals', 'preshared_key', 'certificate', 'tags', 'name', 'description', 'version', 'mode', 'proposals', 'preshared_key', 'tags',
) )

5
netbox/vpn/forms/model_forms.py
View File

@ -289,14 +289,13 @@ class IKEPolicyForm(NetBoxModelForm):
fieldsets = ( fieldsets = (
(_('Policy'), ('name', 'description', 'tags')), (_('Policy'), ('name', 'description', 'tags')),
(_('Parameters'), ('version', 'mode', 'proposals')), (_('Parameters'), ('version', 'mode', 'proposals', 'preshared_key')),
(_('Authentication'), ('preshared_key', 'certificate')),
) )
class Meta: class Meta:
model = IKEPolicy model = IKEPolicy
fields = [ fields = [
'name', 'description', 'version', 'mode', 'proposals', 'preshared_key', 'certificate', 'tags', 'name', 'description', 'version', 'mode', 'proposals', 'preshared_key', 'tags',
] ]

3
netbox/vpn/migrations/0001_initial.py
View File

@ -1,5 +1,3 @@
# Generated by Django 4.2.7 on 2023-11-21 13:55
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
import taggit.managers import taggit.managers
@ -30,7 +28,6 @@ class Migration(migrations.Migration):
('version', models.PositiveSmallIntegerField(default=2)), ('version', models.PositiveSmallIntegerField(default=2)),
('mode', models.CharField()), ('mode', models.CharField()),
('preshared_key', models.TextField(blank=True)), ('preshared_key', models.TextField(blank=True)),
('certificate', models.TextField(blank=True)),
], ],
options={ options={
'verbose_name': 'IKE policy', 'verbose_name': 'IKE policy',

4
netbox/vpn/models/crypto.py
View File

@ -98,10 +98,6 @@ class IKEPolicy(NetBoxModel):
verbose_name=_('pre-shared key'), verbose_name=_('pre-shared key'),
blank=True blank=True
) )
certificate = models.TextField(
verbose_name=_('certificate'),
blank=True
)
clone_fields = ( clone_fields = (
'version', 'mode', 'proposals', 'version', 'mode', 'proposals',

7
netbox/vpn/tables.py
View File

@ -146,9 +146,6 @@ class IKEPolicyTable(NetBoxTable):
preshared_key = tables.Column( preshared_key = tables.Column(
verbose_name=_('Pre-shared Key') verbose_name=_('Pre-shared Key')
) )
certificate = tables.Column(
verbose_name=_('Certificate')
)
tags = columns.TagColumn( tags = columns.TagColumn(
url_name='vpn:ikepolicy_list' url_name='vpn:ikepolicy_list'
) )
@ -156,8 +153,8 @@ class IKEPolicyTable(NetBoxTable):
class Meta(NetBoxTable.Meta): class Meta(NetBoxTable.Meta):
model = IKEPolicy model = IKEPolicy
fields = ( fields = (
'pk', 'id', 'name', 'version', 'mode', 'proposals', 'preshared_key', 'certificate', 'description', 'tags', 'pk', 'id', 'name', 'version', 'mode', 'proposals', 'preshared_key', 'description', 'tags', 'created',
'created', 'last_updated', 'last_updated',
) )
default_columns = ( default_columns = (
'pk', 'name', 'version', 'mode', 'proposals', 'description', 'pk', 'name', 'version', 'mode', 'proposals', 'description',