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

Fix up some PEP errors

Browse Source
This commit is contained in:
Daniel Sheppard
2022-06-29 16:14:30 -05:00
parent 3be9f6c4f3
commit 6e983d1542
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/ipam/api/nested_serializers.py
View File

@ -218,4 +218,3 @@ class NestedL2VPNTerminationSerializer(WritableNestedSerializer):
fields = [ fields = [
'id', 'url', 'display', 'l2vpn' 'id', 'url', 'display', 'l2vpn'
] ]

31
netbox/ipam/choices.py
View File

@ -192,26 +192,25 @@ class L2VPNTypeChoices(ChoiceSet):
(TYPE_VPLS, 'VPLS'), (TYPE_VPLS, 'VPLS'),
)), )),
('E-Line', ( ('E-Line', (
(TYPE_EPL, 'EPL'), (TYPE_EPL, 'EPL'),
(TYPE_EVPL, 'EVPL'), (TYPE_EVPL, 'EVPL'),
)), )),
('E-LAN', ( ('E-LAN', (
(TYPE_EPLAN, 'Ethernet Private LAN'), (TYPE_EPLAN, 'Ethernet Private LAN'),
(TYPE_EVPLAN, 'Ethernet Virtual Private LAN'), (TYPE_EVPLAN, 'Ethernet Virtual Private LAN'),
)), )),
('E-Tree', ( ('E-Tree', (
(TYPE_EPTREE, 'Ethernet Private Tree'), (TYPE_EPTREE, 'Ethernet Private Tree'),
(TYPE_EVPTREE, 'Ethernet Virtual Private Tree'), (TYPE_EVPTREE, 'Ethernet Virtual Private Tree'),
)), )),
('VXLAN', ( ('VXLAN', (
(TYPE_VXLAN, 'VXLAN'), (TYPE_VXLAN, 'VXLAN'),
(TYPE_VXLAN_EVPN, 'VXLAN-EVPN'), (TYPE_VXLAN_EVPN, 'VXLAN-EVPN'),
)), )),
('L2VPN E-VPN', ( ('L2VPN E-VPN', (
(TYPE_MPLS_EVPN, 'MPLS EVPN'), (TYPE_MPLS_EVPN, 'MPLS EVPN'),
(TYPE_PBB_EVPN, 'PBB EVPN'), (TYPE_PBB_EVPN, 'PBB EVPN'),
)) ))
) )
P2P = ( P2P = (

1
netbox/ipam/tests/test_models.py
View File

@ -612,4 +612,3 @@ class TestL2VPNTermination(TestCase):
L2VPNTermination.objects.create(l2vpn=l2vpn, assigned_object=vlan) L2VPNTermination.objects.create(l2vpn=l2vpn, assigned_object=vlan)
duplicate = L2VPNTermination(l2vpn=l2vpn, assigned_object=vlan) duplicate = L2VPNTermination(l2vpn=l2vpn, assigned_object=vlan)
self.assertRaises(ValidationError, duplicate.clean) self.assertRaises(ValidationError, duplicate.clean)