Skip to content
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

Fix host info for host with multiple IPs on same MAC #338

Merged
merged 9 commits into from
Nov 21, 2024
Merged

Fix host info for host with multiple IPs on same MAC #338

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3501a0f
Fix `host info` for host with multiple IPs on same MAC
pederhan Nov 21, 2024
10d8201
Remove WIP stuff oops
pederhan Nov 21, 2024
579a260
Add `host info` test for host with ipv4 and ipv6
pederhan Nov 21, 2024
2082d36
Improve exception message
pederhan Nov 21, 2024
bd18e3a
Short circuit faster in equality check
pederhan Nov 21, 2024
c3fd562
Fix tests, exception name, add test for duplicate results
pederhan Nov 21, 2024
44f714a
Merge branch 'master' into check-multiple-results-equal
pederhan Nov 21, 2024
5ad2158
Update changelog
pederhan Nov 21, 2024
4ceb2aa
Refactor `Host.get_by_any_means`, fall back on existing `MultipleEnti…
pederhan Nov 21, 2024
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
2 changes: 1 addition & 1 deletion mreg_cli/utilities/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ def get_list_generic(
if expect_one_result:
if len(ret) == 0:
return {}
if len(ret) != 1:
if len(ret) > 1 and not all(ret[0] == x for x in ret):
pederhan marked this conversation as resolved.
Show resolved Hide resolved
raise MultipleEntititesFound(f"Expected exactly one result, got {len(ret)}.")
terjekv marked this conversation as resolved.
Show resolved Hide resolved
return ret[0]
return ret
Expand Down