mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

#9816: Misc cleanup

Browse Source
This commit is contained in:
Jeremy Stretch
2023-12-04 08:54:10 -05:00
parent 42ab8ee0a2
commit 3faf4857cb
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -196,7 +196,7 @@ class TunnelCreateForm(TunnelForm):
tunnel=instance, tunnel=instance,
role=self.cleaned_data['termination2_role'], role=self.cleaned_data['termination2_role'],
termination=self.cleaned_data['termination2_termination'], termination=self.cleaned_data['termination2_termination'],
outside_ip=self.cleaned_data.get('termination1_outside_ip'), outside_ip=self.cleaned_data.get('termination2_outside_ip'),
) )
return instance return instance

14
netbox/vpn/tables/tunnels.py
View File

@ -54,18 +54,18 @@ class TunnelTerminationTable(TenancyColumnsMixin, NetBoxTable):
role = columns.ChoiceFieldColumn( role = columns.ChoiceFieldColumn(
verbose_name=_('Role') verbose_name=_('Role')
) )
interface_parent = tables.Column( termination_parent = tables.Column(
accessor='interface__parent_object', accessor='termination__parent_object',
linkify=True, linkify=True,
orderable=False, orderable=False,
verbose_name=_('Host') verbose_name=_('Host')
) )
interface = tables.Column( termination = tables.Column(
verbose_name=_('Interface'), verbose_name=_('Interface'),
linkify=True linkify=True
) )
ip_addresses = tables.ManyToManyColumn( ip_addresses = tables.ManyToManyColumn(
accessor=tables.A('interface__ip_addresses'), accessor=tables.A('termination__ip_addresses'),
orderable=False, orderable=False,
linkify_item=True, linkify_item=True,
verbose_name=_('IP Addresses') verbose_name=_('IP Addresses')
@ -81,7 +81,9 @@ class TunnelTerminationTable(TenancyColumnsMixin, NetBoxTable):
class Meta(NetBoxTable.Meta): class Meta(NetBoxTable.Meta):
model = TunnelTermination model = TunnelTermination
fields = ( fields = (
'pk', 'id', 'tunnel', 'role', 'interface_parent', 'interface', 'ip_addresses', 'outside_ip', 'tags', 'pk', 'id', 'tunnel', 'role', 'termination_parent', 'termination', 'ip_addresses', 'outside_ip', 'tags',
'created', 'last_updated', 'created', 'last_updated',
) )
default_columns = ('pk', 'id', 'tunnel', 'role', 'interface_parent', 'interface', 'ip_addresses', 'outside_ip') default_columns = (
'pk', 'id', 'tunnel', 'role', 'termination_parent', 'termination', 'ip_addresses', 'outside_ip',
)

24
netbox/vpn/urls.py
View File

@ -31,12 +31,12 @@ urlpatterns = [
path('ike-proposals/<int:pk>/', include(get_model_urls('vpn', 'ikeproposal'))), path('ike-proposals/<int:pk>/', include(get_model_urls('vpn', 'ikeproposal'))),
# IKE policies # IKE policies
path('ike-policys/', views.IKEPolicyListView.as_view(), name='ikepolicy_list'), path('ike-policies/', views.IKEPolicyListView.as_view(), name='ikepolicy_list'),
path('ike-policys/add/', views.IKEPolicyEditView.as_view(), name='ikepolicy_add'), path('ike-policies/add/', views.IKEPolicyEditView.as_view(), name='ikepolicy_add'),
path('ike-policys/import/', views.IKEPolicyBulkImportView.as_view(), name='ikepolicy_import'), path('ike-policies/import/', views.IKEPolicyBulkImportView.as_view(), name='ikepolicy_import'),
path('ike-policys/edit/', views.IKEPolicyBulkEditView.as_view(), name='ikepolicy_bulk_edit'), path('ike-policies/edit/', views.IKEPolicyBulkEditView.as_view(), name='ikepolicy_bulk_edit'),
path('ike-policys/delete/', views.IKEPolicyBulkDeleteView.as_view(), name='ikepolicy_bulk_delete'), path('ike-policies/delete/', views.IKEPolicyBulkDeleteView.as_view(), name='ikepolicy_bulk_delete'),
path('ike-policys/<int:pk>/', include(get_model_urls('vpn', 'ikepolicy'))), path('ike-policies/<int:pk>/', include(get_model_urls('vpn', 'ikepolicy'))),
# IPSec proposals # IPSec proposals
path('ipsec-proposals/', views.IPSecProposalListView.as_view(), name='ipsecproposal_list'), path('ipsec-proposals/', views.IPSecProposalListView.as_view(), name='ipsecproposal_list'),
@ -47,12 +47,12 @@ urlpatterns = [
path('ipsec-proposals/<int:pk>/', include(get_model_urls('vpn', 'ipsecproposal'))), path('ipsec-proposals/<int:pk>/', include(get_model_urls('vpn', 'ipsecproposal'))),
# IPSec policies # IPSec policies
path('ipsec-policys/', views.IPSecPolicyListView.as_view(), name='ipsecpolicy_list'), path('ipsec-policies/', views.IPSecPolicyListView.as_view(), name='ipsecpolicy_list'),
path('ipsec-policys/add/', views.IPSecPolicyEditView.as_view(), name='ipsecpolicy_add'), path('ipsec-policies/add/', views.IPSecPolicyEditView.as_view(), name='ipsecpolicy_add'),
path('ipsec-policys/import/', views.IPSecPolicyBulkImportView.as_view(), name='ipsecpolicy_import'), path('ipsec-policies/import/', views.IPSecPolicyBulkImportView.as_view(), name='ipsecpolicy_import'),
path('ipsec-policys/edit/', views.IPSecPolicyBulkEditView.as_view(), name='ipsecpolicy_bulk_edit'), path('ipsec-policies/edit/', views.IPSecPolicyBulkEditView.as_view(), name='ipsecpolicy_bulk_edit'),
path('ipsec-policys/delete/', views.IPSecPolicyBulkDeleteView.as_view(), name='ipsecpolicy_bulk_delete'), path('ipsec-policies/delete/', views.IPSecPolicyBulkDeleteView.as_view(), name='ipsecpolicy_bulk_delete'),
path('ipsec-policys/<int:pk>/', include(get_model_urls('vpn', 'ipsecpolicy'))), path('ipsec-policies/<int:pk>/', include(get_model_urls('vpn', 'ipsecpolicy'))),
# IPSec profiles # IPSec profiles
path('ipsec-profiles/', views.IPSecProfileListView.as_view(), name='ipsecprofile_list'), path('ipsec-profiles/', views.IPSecProfileListView.as_view(), name='ipsecprofile_list'),