-
Notifications
You must be signed in to change notification settings - Fork 29
[mock_uss] Add uses_cmsa option #1304
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.
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
base: main
Are you sure you want to change the base?
Conversation
mickmis
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM modulo comments
monitoring/monitorlib/locality.py
Outdated
| def uses_cmsa(self) -> bool: | ||
| return True | ||
|
|
||
|
|
||
| class UnitedStatesIndustryCollaboration(Locality): | ||
| @classmethod | ||
| def locality_code(cls) -> str: | ||
| return "US.IndustryCollaboration" | ||
|
|
||
| def is_uspace_applicable(self) -> bool: | ||
| return False | ||
|
|
||
| def allows_same_priority_intersections(self, priority: int) -> bool: | ||
| return False | ||
|
|
||
| def lowest_bound_priority(self) -> int: | ||
| return -1 | ||
|
|
||
| def highest_priority(self) -> int: | ||
| return 100 | ||
|
|
||
| def uses_cmsa(self) -> bool: | ||
| return True |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do actually both Switzerland and UnitedStatesIndustryCollaboration support CMSA? @BenjaminPelletier @barroco
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No -- UnitedStatesIndustryCollaboration should not support CMSA. @barroco for Switzerland
BenjaminPelletier
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good to me too after working out which locality does what.
We may have to discuss what to do if Switzerland also doesn't support CMSA. In that case, we might consider adding another locality similar to one of the two existing localities, but supporting CMSA, and move a relevant CI test to the new locality. But, that could be a different PR as long as we at least manually verify the functionality in this PR not covered by CI.
I switched US's localitly's flag to off, and Switzerland one is still on, meaning this run should have tested both cases. US, test are skipped dues to absence of CMSA: https://github.com/interuss/monitoring/actions/runs/20425171089/job/58684069081?pr=1304#step:5:798 |
Fix #878
Add an option for the mock_uss to support or not cmsa.
This is done on flight injection level, preventing the injection of flights in the Nonconforming/Contingent state. This should prevent the mock_uss to do CMSA calls, but I may have missed some others cases.