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

[4.4.x] Fix #868 - Fix query case issue in new set resolving (backport #869) #870

Merged
merged 1 commit into from
Oct 17, 2023
Merged

[4.4.x] Fix #868 - Fix query case issue in new set resolving (backport #869) #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions irrd/storage/preload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ def set_members(self, set_pk: str, sources: List[str], object_classes: List[str]
Returns the members and the found object class if the set exists, otherwise None.
Will block until the store is loaded.
"""
set_pk = set_pk.upper()
while not self._memory_loaded:
time.sleep(1) # pragma: no cover
if not object_classes or "as-set" in object_classes:
Expand Down
1 change: 1 addition & 0 deletions irrd/storage/tests/test_preload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ def test_set_members(self, mock_redis_keys):
assert preloader.set_members("AS-SET1", sources, classes) == SetMembers(["AS65530"], "as-set")
assert preloader.set_members("AS-SET1", sources, classes) == SetMembers(["AS65530"], "as-set")
assert preloader.set_members("AS-SET1", ["TEST1"], classes) == SetMembers(["AS65530"], "as-set")
assert preloader.set_members("AS-set1", ["TEST1"], classes) == SetMembers(["AS65530"], "as-set")
assert sorted(preloader.set_members("AS-SET2", sources, classes).members) == ["AS65531", "AS65532"]
assert preloader.set_members("RS-SET1", sources, classes) == SetMembers(["192.0.2.0/25"], "route-set")
assert preloader.set_members("RS-SET1", sources, ["route-set"]) == SetMembers(
Expand Down