[uss_qualifier] oir_simple: check oir can be created without sub and attached to explicit sub #804

Shastick · 2024-10-15T09:56:02Z

Extend OIRSimple with a test case that:

checks we can create a subscription-free OIR
then checks an explicit subscription can be attached, and that the subscription needs to cover the OIR.

This covers point (4) on interuss/dss#1088

Note: this builds on top of #1012, only the last commit of this PR is relevant.

mickmis

Note: I've only reviewed the .md so far.

mickmis · 2024-10-16T11:12:30Z

monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_simple.py

 )
 from monitoring.uss_qualifier.suites.suite import ExecutionContext

+# The official DSS implementation will set an OIR's subscription ID to 00000000-0000-4000-8000-000000000000


Not relevant to this PR, but IMO that means the OpenAPI is wrong and the subscription ID should not be a mandatory field. We should consider fixing that.

Yes, that would be the correct approach.

I think this was used as an immediate stop-gap because the DSS needed to be made compliant (by allowing ACCEPTED OIRs without subscriptions, which the standard explicitly allows) without breaking the OpenAPI spec, but we lost track of this.

I created #806 to keep track of it

mickmis · 2024-10-16T11:16:32Z

monitoring/uss_qualifier/scenarios/astm/utm/dss/fragments/oir/oir_has_expected_subscription.md

 If the OIR returned by the DSS under test is not attached to the expected subscription,
 it is in violation of **[astm.f3548.v21.DSS0005,1](../../../../../../requirements/astm/f3548/v21.md)**
+
+## [Get referenced Subscription](../sub/crud/read_query.md)


Do I understand correctly that this should succeed if the the subscription does not exist? That warrants a separate check, or usage of a dedicated fragment 'check subscription does not exist'.

mickmis · 2024-10-16T11:17:25Z

monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_simple.md

+
+This step verifies that an OIR can be created in the ACCEPTED state without providing any subscription information (implicit or explicit) in the request.
+
+### [OIR is not attached to any subscription test step](./fragments/oir/oir_has_expected_subscription.md)


Sounds like this shouldn't be a step but rather included as a fragment under the above step.

mickmis · 2024-10-16T11:18:21Z

monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_simple.md


 Ensures that the explicit subscription provided upon creation of an OIR is properly validated and attached to the OIR.

+### [Ensure clean workspace test step](./clean_workspace.md)


Same comment as other PR: a 'clean workspace' step in middle of scenario is not a good idea IMO.

mickmis · 2024-10-16T11:20:05Z

monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_simple.md

+If the DSS under test allows the qualifier to attach an insufficient explicit subscription to a subscription-free OIR,
+it is in violation of **[astm.f3548.v21.DSS0005,1](../../../../requirements/astm/f3548/v21.md)**
+
+### [OIR is not attached to any subscription test step](./fragments/oir/oir_has_expected_subscription.md)


Sounds like this shouldn't be a step but rather included as a fragment under the above step.

mickmis · 2024-10-16T11:21:02Z

monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_simple.md

+### [Attach explicit subscription to OIR test step](./fragments/oir/crud/update_query.md)
+
+This step verifies that an explicit subscription covering the OIR can be attached to an OIR that currently has no subscription.
+
+### [OIR is attached to expected subscription test step](./fragments/oir/oir_has_expected_subscription.md)
+
+This step verifies that the OIR is attached to the subscription provided upon creation.


I don't feel like those belong in this test case?

The test case's intention is to:

check that a subscription that does not cover the OIR cannot be attached to it

check that a subscription that covers the OIR can be attached to it

The first step demonstrates that some validation indeed occurs. The second step demonstrates that the validation logic is correct (at least superficially). In other words, the test case demonstrates that validation occurs and is not buggy.

Possibly I could rename the test case to Properly validate explicit subscription being attached to OIR without subscription?

Shastick · 2024-10-16T13:50:50Z

Note: I've only reviewed the .md so far.

Thanks. I think we should first figure out the open points on #803 before diving deeper into this PR anyway.

Shastick · 2024-10-24T15:59:25Z

Moved to draft while we figure out things on the parent PR

Shastick · 2025-04-18T09:43:49Z

Updated on top of #1009 and #1012 to reflect new approach.

…attached to explicit sub

mickmis

LGTM modulo comments

monitoring/uss_qualifier/scenarios/astm/utm/dss/fragments/oir/oir_has_no_subscription.md

monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_explicit_sub_handling.md

monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_explicit_sub_handling.py

Shastick · 2025-05-14T12:31:59Z

Updated, and should be ready to merge

…attached to explicit sub (#804) 6038036

Shastick force-pushed the oir-simple-1-check-explicit-can-be-added-to-none branch from 9c1d145 to 358cde9 Compare October 15, 2024 10:05

Shastick mentioned this pull request Oct 15, 2024

[maintenance] scd improve readability of OIR upsertion logic and OIR subscription handling interuss/dss#1088

Open

13 tasks

Shastick force-pushed the oir-simple-1-check-explicit-can-be-added-to-none branch from 358cde9 to 6c9828a Compare October 15, 2024 10:51

Shastick mentioned this pull request Oct 15, 2024

[uss_qualifier] oir_simple: accepted oir can be detached from explicit subscription #805

Merged

Shastick marked this pull request as ready for review October 15, 2024 15:37

mickmis reviewed Oct 16, 2024

View reviewed changes

Shastick marked this pull request as draft October 24, 2024 15:59

Shastick force-pushed the oir-simple-1-check-explicit-can-be-added-to-none branch 4 times, most recently from 20e6029 to 64f99d1 Compare April 18, 2025 09:42

Shastick marked this pull request as ready for review April 18, 2025 09:43

Shastick mentioned this pull request Apr 28, 2025

[uss_qualifier] f3548/oir_simple: prepare scenario for new test cases #1009

Merged

Shastick marked this pull request as draft April 30, 2025 10:04

Shastick force-pushed the oir-simple-1-check-explicit-can-be-added-to-none branch 3 times, most recently from c02dc8a to 1ab0cfa Compare April 30, 2025 10:32

Shastick marked this pull request as ready for review April 30, 2025 10:36

Shastick marked this pull request as draft May 1, 2025 15:55

Shastick force-pushed the oir-simple-1-check-explicit-can-be-added-to-none branch 4 times, most recently from f3d3bcf to ef214ec Compare May 5, 2025 14:45

Shastick marked this pull request as ready for review May 5, 2025 14:46

Shastick requested a review from mickmis May 5, 2025 14:54

[uss_qualifier] oir_simple: check oir can be created without sub and …

f9e4621

…attached to explicit sub

Shastick force-pushed the oir-simple-1-check-explicit-can-be-added-to-none branch from ef214ec to f9e4621 Compare May 8, 2025 20:12

mickmis approved these changes May 13, 2025

View reviewed changes

comments

48e484b

mickmis merged commit 6038036 into interuss:main May 15, 2025
21 checks passed

github-actions bot added a commit that referenced this pull request May 15, 2025

[uss_qualifier] oir_simple: check oir can be created without sub and …

b94c3f0

…attached to explicit sub (#804) 6038036

mickmis deleted the oir-simple-1-check-explicit-can-be-added-to-none branch May 15, 2025 15:47


		This step verifies that an OIR can be created in the ACCEPTED state without providing any subscription information (implicit or explicit) in the request.

		### [OIR is not attached to any subscription test step](./fragments/oir/oir_has_expected_subscription.md)


		Ensures that the explicit subscription provided upon creation of an OIR is properly validated and attached to the OIR.

		### [Ensure clean workspace test step](./clean_workspace.md)

[uss_qualifier] oir_simple: check oir can be created without sub and attached to explicit sub #804

[uss_qualifier] oir_simple: check oir can be created without sub and attached to explicit sub #804

Uh oh!

Conversation

Shastick commented Oct 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mickmis left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Shastick commented Oct 16, 2024

Uh oh!

Shastick commented Oct 24, 2024

Uh oh!

Shastick commented Apr 18, 2025

Uh oh!

mickmis left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Shastick commented May 14, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Shastick commented Oct 15, 2024 •

edited

Loading