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

Misc cleanup

Browse Source
This commit is contained in:
Jeremy Stretch 2023-11-27 14:57:57 -05:00
parent fd432e023d
commit 9038ed88fc
9 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/features/vpn-tunnels.md
View File

@ -1,6 +1,6 @@
# Tunnels # Tunnels
NetBox can model private tunnels formed among virtual termination points across your network. Typical tunnel implementations include GRE, IP-in-IP, or IPSec. A tunnel may be terminated to two or more device or virtual machine interfaces. NetBox can model private tunnels formed among virtual termination points across your network. Typical tunnel implementations include GRE, IP-in-IP, and IPSec. A tunnel may be terminated to two or more device or virtual machine interfaces.
```mermaid ```mermaid
flowchart TD flowchart TD

2
docs/models/vpn/tunneltermination.md
View File

@ -21,7 +21,7 @@ The functional role of the attached interface. The following options are availab
!!! note !!! note
Multiple hub terminations may be attached to a tunnel. Multiple hub terminations may be attached to a tunnel.
### Interface ### Termination
The device or virtual machine interface terminated to the tunnel. The device or virtual machine interface terminated to the tunnel.

5
netbox/dcim/models/device_components.py
View File

@ -551,11 +551,6 @@ class BaseInterface(models.Model):
blank=True, blank=True,
verbose_name=_('bridge interface') verbose_name=_('bridge interface')
) )
tunnel_terminations = GenericRelation(
to='vpn.TunnelTermination',
content_type_field='interface_type',
object_id_field='interface_id'
)
class Meta: class Meta:
abstract = True abstract = True

20
netbox/templates/vpn/tunnel.html
View File

@ -26,6 +26,10 @@
<th scope="row">{% trans "Status" %}</th> <th scope="row">{% trans "Status" %}</th>
<td>{% badge object.get_status_display bg_color=object.get_status_color %}</td> <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
</tr> </tr>
<tr>
<th scope="row">{% trans "Description" %}</th>
<td>{{ object.description|placeholder }}</td>
</tr>
<tr> <tr>
<th scope="row">{% trans "Encapsulation" %}</th> <th scope="row">{% trans "Encapsulation" %}</th>
<td>{{ object.get_encapsulation_display }}</td> <td>{{ object.get_encapsulation_display }}</td>
@ -34,6 +38,10 @@
<th scope="row">{% trans "IPSec profile" %}</th> <th scope="row">{% trans "IPSec profile" %}</th>
<td>{{ object.ipsec_profile|linkify|placeholder }}</td> <td>{{ object.ipsec_profile|linkify|placeholder }}</td>
</tr> </tr>
<tr>
<th scope="row">{% trans "Tunnel ID" %}</th>
<td>{{ object.tunnel_id|placeholder }}</td>
</tr>
<tr> <tr>
<th scope="row">{% trans "Tenant" %}</th> <th scope="row">{% trans "Tenant" %}</th>
<td> <td>
@ -43,18 +51,6 @@
{{ object.tenant|linkify|placeholder }} {{ object.tenant|linkify|placeholder }}
</td> </td>
</tr> </tr>
<tr>
<th scope="row">{% trans "Pre-shared key" %}</th>
<td>{{ object.preshared_key|placeholder }}</td>
</tr>
<tr>
<th scope="row">{% trans "Tunnel ID" %}</th>
<td>{{ object.tunnel_id|placeholder }}</td>
</tr>
<tr>
<th scope="row">{% trans "Description" %}</th>
<td>{{ object.description|placeholder }}</td>
</tr>
</table> </table>
</div> </div>
</div> </div>

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

@ -148,7 +148,7 @@ class IPSecProposalSerializer(NetBoxModelSerializer):
model = IPSecProposal model = IPSecProposal
fields = ( fields = (
'id', 'url', 'display', 'name', 'description', 'encryption_algorithm', 'authentication_algorithm', 'id', 'url', 'display', 'name', 'description', 'encryption_algorithm', 'authentication_algorithm',
'sa_lifetime_data', 'sa_lifetime_seconds', 'tags', 'custom_fields', 'created', 'last_updated', 'sa_lifetime_seconds', 'sa_lifetime_data', 'tags', 'custom_fields', 'created', 'last_updated',
) )

2
netbox/vpn/filtersets.py
View File

@ -145,7 +145,7 @@ class IKEPolicyFilterSet(NetBoxModelFilterSet):
class Meta: class Meta:
model = IKEPolicy model = IKEPolicy
fields = ['id', 'name'] fields = ['id', 'name', 'preshared_key']
def search(self, queryset, name, value): def search(self, queryset, name, value):
if not value.strip(): if not value.strip():

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

@ -70,9 +70,6 @@ class TunnelTerminationBulkEditForm(NetBoxModelBulkEditForm):
) )
model = TunnelTermination model = TunnelTermination
fieldsets = (
(None, ('role',)),
)
class IKEProposalBulkEditForm(NetBoxModelBulkEditForm): class IKEProposalBulkEditForm(NetBoxModelBulkEditForm):

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

@ -190,7 +190,7 @@ class IPSecProposalImportForm(NetBoxModelImportForm):
class IPSecPolicyImportForm(NetBoxModelImportForm): class IPSecPolicyImportForm(NetBoxModelImportForm):
pfs_group = CSVChoiceField( pfs_group = CSVChoiceField(
label=_('PFS group'), label=_('Diffie-Hellman group for Perfect Forward Secrecy'),
choices=DHGroupChoices choices=DHGroupChoices
) )
proposals = CSVModelMultipleChoiceField( proposals = CSVModelMultipleChoiceField(

2
netbox/vpn/tables.py
View File

@ -48,7 +48,7 @@ class TunnelTable(TenancyColumnsMixin, NetBoxTable):
'pk', 'id', 'name', 'status', 'encapsulation', 'ipsec_profile', 'tenant', 'tenant_group', 'tunnel_id', 'pk', 'id', 'name', 'status', 'encapsulation', 'ipsec_profile', 'tenant', 'tenant_group', 'tunnel_id',
'termination_count', 'description', 'comments', 'tags', 'created', 'last_updated', 'termination_count', 'description', 'comments', 'tags', 'created', 'last_updated',
) )
default_columns = ('pk', 'name', 'status', 'encapsulation', 'tenant', 'terminations_count') default_columns = ('pk', 'name', 'status', 'encapsulation', 'ipsec_profile', 'tenant', 'terminations_count')
class TunnelTerminationTable(TenancyColumnsMixin, NetBoxTable): class TunnelTerminationTable(TenancyColumnsMixin, NetBoxTable):