Changed to use NONCONNECTABLE_IFACE_TYPES

This commit is contained in:
Daniel Sheppard 2019-09-24 10:39:38 -05:00
parent aed144fc19
commit d474fa6bcf

View File

@ -2861,40 +2861,24 @@ class Cable(ChangeLoggedModel):
# Virtual interfaces cannot be connected
endpoint_a, endpoint_b, _ = self.get_path_endpoints()
if (
(
isinstance(endpoint_a, Interface) and
endpoint_a.type == IFACE_TYPE_VIRTUAL
) or
(
isinstance(endpoint_b, Interface) and
endpoint_b.type == IFACE_TYPE_VIRTUAL
) or
(
isinstance(self.termination_a, Interface) and
self.termination_a.type == IFACE_TYPE_VIRTUAL
) or
(
isinstance(self.termination_b, Interface) and
self.termination_b.type == IFACE_TYPE_VIRTUAL
) 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
)
(
isinstance(endpoint_a, Interface) and
endpoint_a.type in NONCONNECTABLE_IFACE_TYPES
) or
(
isinstance(endpoint_b, Interface) and
endpoint_b.type in NONCONNECTABLE_IFACE_TYPES
) or
(
isinstance(self.termination_a, Interface) and
self.termination_a.type in NONCONNECTABLE_IFACE_TYPES
) or
(
isinstance(self.termination_b, Interface) and
self.termination_b.type in NONCONNECTABLE_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
if self.length is not None and self.length_unit is None: