[monitorlib/flight_planning] Ignore wrong body on non-200 responses when a flight is deleted #1104
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mickmis
reviewed
Aug 12, 2025
Contributor
mickmis
left a comment
mickmis
left a comment
There was a problem hiding this comment.
In client_scd.py we have (and had already before) a different behavior.
Why not reject here the 404 and adapt callers to catch and interpret the 404 as acceptable?
That way both implementations of the interface will behave the same.
the-glu
force-pushed
the
fix_1100_p2
branch
2 times, most recently
from
ce96aa2 to
73cadd2
Compare
…hen a flight is deleted
the-glu
commented
Aug 13, 2025
| f"Deletion of {flight_id}", | ||
| f"Deletion of flight {flight_id} returned a status of '{resp.flight_plan_status}' ({FlightPlanStatus.Closed} wanted)", | ||
| ) | ||
|
|
Contributor
Author
There was a problem hiding this comment.
NB: I removed the if for the status code: it's not possible to get there without a status_code == 200
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contrib to #1100 , point 1
It change try_end_flight behavior by ignoring wrong responses when the status code of the query is not 200.
In such cases, the response will have a limited field available. It's up to the caller to handle such cases.
The code base already handle this situation correctly, by ignoring 404 errors when doing wild cleanup: https://github.com/interuss/monitoring/blob/main/monitoring/uss_qualifier/scenarios/flight_planning/test_steps.py#L424
We don't have a rogue-dss implementation / tests, so I tested locally the new behavior with a special mock uss:
Another test for the new behavior:
We can see that the remove valid flight complained about the wrong response and the cleanup part happily ignored the 404 :)