Repository navigation
[uss_qualifier] Add resource environments - #1775
Merged
BenjaminPelletier merged 5 commits intoOct 9, 2026
Merged
Conversation
BenjaminPelletier
marked this pull request as ready for review
October 7, 2026 05:57
mickmis
approved these changes
Oct 8, 2026
| remaining_generators = generators.copy() | ||
| self._generators = [] | ||
| if ( | ||
| "environments_sequence" in specification |
Member
Author
There was a problem hiding this comment.
Indeed; I've removed after merging main :)
Contributor
There was a problem hiding this comment.
IIUC this change is not breaking for users of this test suite, correct?
If not, this would warrant a note in the 'next release notes'.
Member
Author
There was a problem hiding this comment.
Correct, no change for test suite users.
| flight_intents2: FlightIntentsResource | None = None, | ||
| flight_intents3: FlightIntentsResource | None = None, | ||
| flight_intents4: FlightIntentsResource | None = None, | ||
| flight_intents_provider: ResourceProvidingResource[ |
Contributor
There was a problem hiding this comment.
Does this change warrants a note in the 'next release notes'? Scenarios may be used directly in configurations.
Member
Author
There was a problem hiding this comment.
Sounds good; I had assumed effectively no one would use the scenarios directly, but probably not good to make that assumption. Note added.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 is a follow-up to #1749 to fix the challenge of clearing all the areas (in PrepareFlightPlanners) that will later be used in ConflictHigherPriority after offsetting each instance to avoid conflicts. The approach taken in this PR is:
flight_intentsin the generated environmentspriority_preemption_flights_providerresource in the F3548-21 test suite to inform both PrepareFlightPlanners and ConflictHigherPriority:flowchart TD conflicting_flights[conflicting_flights<br>FlightIntentsResource] priority_preemption_flights_provider[priority_preemption_flights_provider<br>TriangularCascadeSoutheastResource<br>ResourceProvidingResource] priority_preemption_combinations[priority_preemption_combinations<br>ResourceCombinationsResource<br>ResourceEnvironmentsGenerator] flight_planners[flight_planners<br>FlightPlannersResource<br>PluralResource] priority_preemption_environments[priority_preemption_environments<br>EnvironmentAugmentationResource<br>ResourceEnvironmentsGenerator] flight_intents_environments[flight_intents_environments<br>ConcatenatedResourceEnvironmentsResource<br>ResourceEnvironmentsGenerator] other_envs["Other (future) flight-intent-providing environments"] style other_envs stroke-dasharray: 5 5 PrepareFlightPlanners ActionGenerator[ResourceEnvironmentsActionGenerator] ConflictHigherPriority@{ shape: procs, label: "ConflictHigherPriority"} conflicting_flights -->|flight_intents| priority_preemption_flights_provider flight_planners -->|uss1| priority_preemption_combinations flight_planners -->|uss2| priority_preemption_combinations priority_preemption_combinations -->|uss1,uss1<br>uss1,uss2<br>...| priority_preemption_environments priority_preemption_flights_provider -->|flight_intents, ...| priority_preemption_environments priority_preemption_environments -->|flight_intents,uss1,uss1<br>flight_intents,uss1,uss2<br>...| flight_intents_environments other_envs -->|flight_intents,...<br>...| flight_intents_environments flight_intents_environments -->|flight_intents| PrepareFlightPlanners priority_preemption_environments -->|flight_intents,uss1,uss1<br>flight_intents,uss1,uss2<br>...| ActionGenerator --> ConflictHigherPriorityThis PR also adjusts resource instantiation to allow optional resources to be specified as keyword-based resource dependencies even though keyword-based resource dependencies can't specify a default value when the resource isn't provided (we assume it's None).
My intent after this PR is to extend this approach to other similar situations: certainly ConflictEqualPriorityNotPermitted, but likely also deprecating all special-purpose action generators.