NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-17 04:32:51 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fixes #4604: Multi-position rear ports may only be connected to other rear ports

Browse Source
This commit is contained in:
Jeremy Stretch 2020-05-07 16:22:04 -04:00
parent b7a96a33ef
commit e14e217fcd
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.8.md
View File

@ -5,6 +5,7 @@ v2.8.4 (FUTURE)
### Bug Fixes ### Bug Fixes
* [#4598](https://github.com/netbox-community/netbox/issues/4598) - Display error message when invalid cable length is specified * [#4598](https://github.com/netbox-community/netbox/issues/4598) - Display error message when invalid cable length is specified
* [#4604](https://github.com/netbox-community/netbox/issues/4604) - Multi-position rear ports may only be connected to other rear ports
--- ---

30
netbox/dcim/models/__init__.py
View File

@ -2182,23 +2182,29 @@ class Cable(ChangeLoggedModel):
# Check that termination types are compatible # Check that termination types are compatible
if type_b not in COMPATIBLE_TERMINATION_TYPES.get(type_a): if type_b not in COMPATIBLE_TERMINATION_TYPES.get(type_a):
raise ValidationError("Incompatible termination types: {} and {}".format( raise ValidationError(
self.termination_a_type, self.termination_b_type f"Incompatible termination types: {self.termination_a_type} and {self.termination_b_type}"
)) )
# A RearPort with multiple positions must be connected to a component with an equal number of positions # A RearPort with multiple positions must be connected to a RearPort with an equal number of positions
if isinstance(self.termination_a, RearPort) and isinstance(self.termination_b, RearPort): for term_a, term_b in [
if self.termination_a.positions != self.termination_b.positions: (self.termination_a, self.termination_b),
raise ValidationError( (self.termination_b, self.termination_a)
"{} has {} positions and {} has {}. Both terminations must have the same number of positions.".format( ]:
self.termination_a, self.termination_a.positions, if isinstance(term_a, RearPort) and term_a.positions > 1:
self.termination_b, self.termination_b.positions if not isinstance(term_b, RearPort):
raise ValidationError(
"Rear ports with multiple positions may only be connected to other rear ports"
)
elif term_a.positions != term_b.positions:
raise ValidationError(
f"{term_a} has {term_a.positions} position(s) but {term_b} has {term_b.positions}. "
f"Both terminations must have the same number of positions."
) )
)
# A termination point cannot be connected to itself # A termination point cannot be connected to itself
if self.termination_a == self.termination_b: if self.termination_a == self.termination_b:
raise ValidationError("Cannot connect {} to itself".format(self.termination_a_type)) raise ValidationError(f"Cannot connect {self.termination_a_type} to itself")
# A front port cannot be connected to its corresponding rear port # A front port cannot be connected to its corresponding rear port
if ( if (