Skip to content

Conversation

@the-glu
Copy link
Contributor

@the-glu the-glu commented Dec 16, 2025

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.

Copy link
Contributor

@mickmis mickmis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM modulo comments

Comment on lines 77 to 99
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
Copy link
Contributor

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

Copy link
Member

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

Copy link
Member

@BenjaminPelletier BenjaminPelletier left a 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.

@the-glu
Copy link
Contributor Author

the-glu commented Dec 22, 2025

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
CH, test are not skipped: https://github.com/interuss/monitoring/actions/runs/20425171089/job/58684069089?pr=1304#step:5:919

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add CMSA support flag to mock_uss

3 participants