Skip to content

14033 raise validation error if A and B term go to same object #14050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 1, 2023
Merged

14033 raise validation error if A and B term go to same object #14050

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77d205d
14033 raise validation error if A and B term go to same object
arthanson Oct 16, 2023
002cb3c
14033 move check to cable model clean
arthanson Oct 17, 2023
88078df
14033 fix tests
arthanson Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions netbox/dcim/models/cables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,17 @@ def clean(self):
if b_type not in COMPATIBLE_TERMINATION_TYPES.get(a_type):
raise ValidationError(f"Incompatible termination types: {a_type} and {b_type}")

if a_type == b_type:
# can't directly use self.a_terminations here as possible they
# don't have pk yet
a_pks = set(obj.pk for obj in self.a_terminations if obj.pk)
b_pks = set(obj.pk for obj in self.b_terminations if obj.pk)

if (a_pks & b_pks):
raise ValidationError(
_("A and B terminations cannot connect to the same object.")
)

# Run clean() on any new CableTerminations
for termination in self.a_terminations:
CableTermination(cable=self, cable_end='A', termination=termination).clean()
Expand Down