NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-16 04:28:17 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Changed to use NONCONNECTABLE_IFACE_TYPES

Browse Source
This commit is contained in:
Daniel Sheppard 2019-09-24 10:39:38 -05:00
parent aed144fc19
commit d474fa6bcf
1 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
netbox/dcim/models.py
View File

@ -2861,40 +2861,24 @@ class Cable(ChangeLoggedModel):
# Virtual interfaces cannot be connected # Virtual interfaces cannot be connected
endpoint_a, endpoint_b, _ = self.get_path_endpoints() endpoint_a, endpoint_b, _ = self.get_path_endpoints()
if ( if (
( (
isinstance(endpoint_a, Interface) and isinstance(endpoint_a, Interface) and
endpoint_a.type == IFACE_TYPE_VIRTUAL endpoint_a.type in NONCONNECTABLE_IFACE_TYPES
) or ) or
( (
isinstance(endpoint_b, Interface) and isinstance(endpoint_b, Interface) and
endpoint_b.type == IFACE_TYPE_VIRTUAL endpoint_b.type in NONCONNECTABLE_IFACE_TYPES
) or ) or
( (
isinstance(self.termination_a, Interface) and isinstance(self.termination_a, Interface) and
self.termination_a.type == IFACE_TYPE_VIRTUAL self.termination_a.type in NONCONNECTABLE_IFACE_TYPES
) or ) or
( (
isinstance(self.termination_b, Interface) and isinstance(self.termination_b, Interface) and
self.termination_b.type == IFACE_TYPE_VIRTUAL self.termination_b.type in NONCONNECTABLE_IFACE_TYPES
) or )
(
isinstance(endpoint_b, Interface) and
endpoint_b.type in WIRELESS_IFACE_TYPES
) or
(
isinstance(endpoint_b, Interface) and
endpoint_b.type in WIRELESS_IFACE_TYPES
) or
(
isinstance(self.termination_a, Interface) and
self.termination_a.type in WIRELESS_IFACE_TYPES
) or
(
isinstance(self.termination_b, Interface) and
self.termination_b.type in WIRELESS_IFACE_TYPES
)
): ):
raise ValidationError("Cannot connect to a virtual interface") raise ValidationError("Cannot connect to a virtual or wireless interface")
# Validate length and length_unit # Validate length and length_unit
if self.length is not None and self.length_unit is None: if self.length is not None and self.length_unit is None: