From fe0d6d6173fa6a503dc944200f219c0345599b98 Mon Sep 17 00:00:00 2001 From: Julien Perrochet Date: Tue, 10 Jun 2025 17:58:46 +0200 Subject: [PATCH 1/2] [uss_qualifier] make PlanningAreaResource a non-standard-specific resource --- .../configurations/dev/f3548_self_contained.yaml | 2 +- .../configurations/dev/library/resources.yaml | 4 ++-- .../uss_qualifier/configurations/dev/netrid_v19.yaml | 2 ++ .../uss_qualifier/configurations/dev/netrid_v22a.yaml | 2 ++ .../dev/utm_implementation_us_lib/baseline.libsonnet | 2 +- monitoring/uss_qualifier/resources/__init__.py | 1 + .../uss_qualifier/resources/astm/f3548/v21/__init__.py | 1 - .../resources/{astm/f3548/v21 => }/planning_area.py | 2 +- .../utm/dss/authentication/authentication_validation.md | 2 +- .../utm/dss/authentication/authentication_validation.py | 4 +--- .../astm/utm/dss/authentication/cr_api_validator.py | 8 +------- .../astm/utm/dss/authentication/oir_api_validator.py | 4 +--- .../astm/utm/dss/authentication/sub_api_validator.py | 4 +--- .../scenarios/astm/utm/dss/constraint_ref_simple.md | 2 +- .../scenarios/astm/utm/dss/constraint_ref_simple.py | 6 ++---- .../scenarios/astm/utm/dss/dss_interoperability.md | 2 +- .../scenarios/astm/utm/dss/dss_interoperability.py | 2 +- .../scenarios/astm/utm/dss/oir_explicit_sub_handling.md | 2 +- .../scenarios/astm/utm/dss/oir_explicit_sub_handling.py | 6 ++---- .../scenarios/astm/utm/dss/oir_implicit_sub_handling.md | 2 +- .../scenarios/astm/utm/dss/oir_implicit_sub_handling.py | 2 +- .../astm/utm/dss/op_intent_ref_key_validation.md | 2 +- .../astm/utm/dss/op_intent_ref_key_validation.py | 2 +- .../scenarios/astm/utm/dss/op_intent_ref_simple.md | 2 +- .../scenarios/astm/utm/dss/op_intent_ref_simple.py | 6 ++---- .../scenarios/astm/utm/dss/subscription_interactions.md | 2 +- .../scenarios/astm/utm/dss/subscription_interactions.py | 2 +- .../astm/utm/dss/subscription_interactions_deletion.md | 2 +- .../astm/utm/dss/subscription_interactions_deletion.py | 2 +- .../scenarios/astm/utm/dss/subscription_simple.md | 2 +- .../scenarios/astm/utm/dss/subscription_simple.py | 7 ++----- .../scenarios/astm/utm/dss/subscription_validation.md | 2 +- .../scenarios/astm/utm/dss/subscription_validation.py | 4 ++-- .../dss/synchronization/constraint_ref_synchronization.md | 2 +- .../dss/synchronization/constraint_ref_synchronization.py | 2 +- .../dss/synchronization/op_intent_ref_synchronization.md | 2 +- .../dss/synchronization/op_intent_ref_synchronization.py | 2 +- .../dss/synchronization/subscription_synchronization.md | 2 +- .../dss/synchronization/subscription_synchronization.py | 6 ++---- .../scenarios/interuss/ovn_request/dss_ovn_request.md | 2 +- .../scenarios/interuss/ovn_request/dss_ovn_request.py | 2 +- monitoring/uss_qualifier/suites/astm/utm/dss_probing.yaml | 2 +- monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml | 2 +- monitoring/uss_qualifier/suites/astm/utm/prod_probe.yaml | 4 ++-- .../uss_qualifier/suites/faa/uft/message_signing.yaml | 2 +- .../uss_qualifier/suites/interuss/dss/all_tests.yaml | 2 +- monitoring/uss_qualifier/suites/uspace/flight_auth.yaml | 2 +- .../uss_qualifier/suites/uspace/required_services.yaml | 2 +- .../v21 => }/planning_area/PlanningAreaSpecification.json | 6 +++--- 49 files changed, 60 insertions(+), 79 deletions(-) rename monitoring/uss_qualifier/resources/{astm/f3548/v21 => }/planning_area.py (97%) rename schemas/monitoring/uss_qualifier/resources/{astm/f3548/v21 => }/planning_area/PlanningAreaSpecification.json (63%) diff --git a/monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml b/monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml index aad5c0e3e9..f1965d2849 100644 --- a/monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml +++ b/monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml @@ -195,7 +195,7 @@ v1: # Area that will be used for queries and resource creation that are geo-located planning_area: $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.astm.f3548.v21.PlanningAreaResource + resource_type: resources.PlanningAreaResource specification: base_url: https://testdummy.interuss.org/interuss/monitoring/uss_qualifier/configurations/dev/f3548_self_contained/planning_area volume: diff --git a/monitoring/uss_qualifier/configurations/dev/library/resources.yaml b/monitoring/uss_qualifier/configurations/dev/library/resources.yaml index 5b3a48093f..7431467a5a 100644 --- a/monitoring/uss_qualifier/configurations/dev/library/resources.yaml +++ b/monitoring/uss_qualifier/configurations/dev/library/resources.yaml @@ -43,7 +43,7 @@ kentland_service_area: kentland_planning_area: $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.astm.f3548.v21.PlanningAreaResource + resource_type: resources.PlanningAreaResource specification: base_url: https://testdummy.interuss.org/interuss/monitoring/uss_qualifier/configurations/dev/library/resources/kentland_planning_area volume: @@ -145,7 +145,7 @@ kml_storage_config: che_planning_area: $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.astm.f3548.v21.PlanningAreaResource + resource_type: resources.PlanningAreaResource specification: base_url: https://testdummy.interuss.org/interuss/monitoring/uss_qualifier/configurations/dev/library/resources/che_planning_area volume: diff --git a/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml b/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml index 76d306bd83..83889ae017 100644 --- a/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml +++ b/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml @@ -8,6 +8,7 @@ v1: utm_client_identity: {$ref: 'library/resources.yaml#/utm_client_identity'} id_generator: {$ref: 'library/resources.yaml#/id_generator'} kentland_service_area: {$ref: 'library/resources.yaml#/kentland_service_area'} + kentland_planning_area: {$ref: 'library/resources.yaml#/kentland_planning_area'} au_problematically_big_area: {$ref: 'library/resources.yaml#/au_problematically_big_area'} utm_auth: {$ref: 'library/environment.yaml#/utm_auth'} @@ -40,6 +41,7 @@ v1: id_generator: id_generator service_area: kentland_service_area problematically_big_area: au_problematically_big_area + planning_area: kentland_planning_area test_exclusions: test_exclusions uss_identification: uss_identification execution: diff --git a/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml b/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml index dbaa8d7e4a..54e719e49d 100644 --- a/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml +++ b/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml @@ -8,6 +8,7 @@ v1: utm_client_identity: {$ref: 'library/resources.yaml#/utm_client_identity'} id_generator: {$ref: 'library/resources.yaml#/id_generator'} kentland_service_area: {$ref: 'library/resources.yaml#/kentland_service_area'} + kentland_planning_area: {$ref: 'library/resources.yaml#/kentland_planning_area'} au_problematically_big_area: {$ref: 'library/resources.yaml#/au_problematically_big_area'} utm_auth: {$ref: 'library/environment.yaml#/utm_auth'} @@ -40,6 +41,7 @@ v1: id_generator: id_generator service_area: kentland_service_area problematically_big_area: au_problematically_big_area + planning_area: kentland_planning_area test_exclusions: test_exclusions uss_identification: uss_identification execution: diff --git a/monitoring/uss_qualifier/configurations/dev/utm_implementation_us_lib/baseline.libsonnet b/monitoring/uss_qualifier/configurations/dev/utm_implementation_us_lib/baseline.libsonnet index 0b0eb8690e..54f6e57c66 100644 --- a/monitoring/uss_qualifier/configurations/dev/utm_implementation_us_lib/baseline.libsonnet +++ b/monitoring/uss_qualifier/configurations/dev/utm_implementation_us_lib/baseline.libsonnet @@ -104,7 +104,7 @@ function(env) { // Area that will be used for queries and resource creation that are geo-located planning_area: { - resource_type: 'resources.astm.f3548.v21.PlanningAreaResource', + resource_type: 'resources.PlanningAreaResource', specification: { volume: { outline_polygon: { diff --git a/monitoring/uss_qualifier/resources/__init__.py b/monitoring/uss_qualifier/resources/__init__.py index e9c7a3bcd9..7f37d9cf85 100644 --- a/monitoring/uss_qualifier/resources/__init__.py +++ b/monitoring/uss_qualifier/resources/__init__.py @@ -1 +1,2 @@ +from .planning_area import PlanningAreaResource from .vertices import VerticesResource diff --git a/monitoring/uss_qualifier/resources/astm/f3548/v21/__init__.py b/monitoring/uss_qualifier/resources/astm/f3548/v21/__init__.py index 1a70d7175f..6da048f501 100644 --- a/monitoring/uss_qualifier/resources/astm/f3548/v21/__init__.py +++ b/monitoring/uss_qualifier/resources/astm/f3548/v21/__init__.py @@ -1,2 +1 @@ from .dss import DSSInstanceResource, DSSInstancesResource -from .planning_area import PlanningAreaResource diff --git a/monitoring/uss_qualifier/resources/astm/f3548/v21/planning_area.py b/monitoring/uss_qualifier/resources/planning_area.py similarity index 97% rename from monitoring/uss_qualifier/resources/astm/f3548/v21/planning_area.py rename to monitoring/uss_qualifier/resources/planning_area.py index 36d6a10f3a..30eab9612d 100644 --- a/monitoring/uss_qualifier/resources/astm/f3548/v21/planning_area.py +++ b/monitoring/uss_qualifier/resources/planning_area.py @@ -23,7 +23,7 @@ class PlanningAreaSpecification(ImplicitDict): - """Specifies an area and USS related information to create test resources that require them.""" + """Specifies a 2D or 3D volume along with USS related information to create test resources that require them.""" base_url: Optional[str] """Base URL for the USS diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/authentication_validation.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/authentication_validation.md index 1caaf74f9c..76e24fe375 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/authentication_validation.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/authentication_validation.md @@ -36,7 +36,7 @@ Optional scopes that will allow the scenario to provide additional coverage: ### planning_area -[`PlanningAreaResource`](../../../../../resources/astm/f3548/v21/planning_area.py) describes the 3D volume in which entities will be created. +[`PlanningAreaResource`](../../../../../resources/planning_area.py) describes the 3D volume in which entities will be created. ## Setup test case diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/authentication_validation.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/authentication_validation.py index 9ee05ea386..390333ec37 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/authentication_validation.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/authentication_validation.py @@ -13,10 +13,8 @@ DSSInstance, DSSInstanceResource, ) -from monitoring.uss_qualifier.resources.astm.f3548.v21.planning_area import ( - PlanningAreaResource, -) from monitoring.uss_qualifier.resources.interuss.id_generator import IDGeneratorResource +from monitoring.uss_qualifier.resources.planning_area import PlanningAreaResource from monitoring.uss_qualifier.resources.resource import MissingResourceError from monitoring.uss_qualifier.scenarios.astm.utm.dss import test_step_fragments from monitoring.uss_qualifier.scenarios.astm.utm.dss.authentication.availability_api_validator import ( diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/cr_api_validator.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/cr_api_validator.py index 6805e8775e..e82513f9f4 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/cr_api_validator.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/cr_api_validator.py @@ -5,14 +5,10 @@ from uas_standards.astm.f3548.v21.api import ( OPERATIONS, ChangeConstraintReferenceResponse, - ChangeOperationalIntentReferenceResponse, - OperationalIntentState, OperationID, PutConstraintReferenceParameters, - PutOperationalIntentReferenceParameters, QueryConstraintReferenceParameters, QueryConstraintReferencesResponse, - QueryOperationalIntentReferenceParameters, Time, ) @@ -21,9 +17,7 @@ from monitoring.monitorlib.geotemporal import Volume4D from monitoring.monitorlib.infrastructure import UTMClientSession from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import DSSInstance -from monitoring.uss_qualifier.resources.astm.f3548.v21.planning_area import ( - PlanningAreaSpecification, -) +from monitoring.uss_qualifier.resources.planning_area import PlanningAreaSpecification from monitoring.uss_qualifier.scenarios.astm.utm.dss.authentication.generic import ( GenericAuthValidator, ) diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/oir_api_validator.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/oir_api_validator.py index a188b8589f..cd9ccc3235 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/oir_api_validator.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/oir_api_validator.py @@ -17,9 +17,7 @@ from monitoring.monitorlib.geotemporal import Volume4D from monitoring.monitorlib.infrastructure import UTMClientSession from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import DSSInstance -from monitoring.uss_qualifier.resources.astm.f3548.v21.planning_area import ( - PlanningAreaSpecification, -) +from monitoring.uss_qualifier.resources.planning_area import PlanningAreaSpecification from monitoring.uss_qualifier.scenarios.astm.utm.dss.authentication.generic import ( GenericAuthValidator, ) diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/sub_api_validator.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/sub_api_validator.py index 1571fbd2df..8033303c29 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/sub_api_validator.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/sub_api_validator.py @@ -14,9 +14,7 @@ from monitoring.monitorlib.mutate import scd as mutate from monitoring.monitorlib.mutate.scd import MutatedSubscription from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import DSSInstance -from monitoring.uss_qualifier.resources.astm.f3548.v21.planning_area import ( - PlanningAreaSpecification, -) +from monitoring.uss_qualifier.resources.planning_area import PlanningAreaSpecification from monitoring.uss_qualifier.scenarios.astm.utm.dss.authentication.generic import ( GenericAuthValidator, ) diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/constraint_ref_simple.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/constraint_ref_simple.md index 70922b3202..704a23091e 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/constraint_ref_simple.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/constraint_ref_simple.md @@ -20,7 +20,7 @@ Verifies the behavior of a DSS for simple interactions pertaining to constraint ### planning_area -[`PlanningAreaResource`](../../../../resources/astm/f3548/v21/planning_area.py) describes the 3D volume in which constraint references will be created. +[`PlanningAreaResource`](../../../../resources/planning_area.py) describes the 3D volume in which constraint references will be created. ## Setup test case diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/constraint_ref_simple.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/constraint_ref_simple.py index 63fc53b800..bdf52c8196 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/constraint_ref_simple.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/constraint_ref_simple.py @@ -6,16 +6,14 @@ from monitoring.monitorlib.fetch import QueryError from monitoring.monitorlib.geotemporal import Volume4D from monitoring.prober.infrastructure import register_resource_type -from monitoring.uss_qualifier.resources.astm.f3548.v21 import PlanningAreaResource +from monitoring.uss_qualifier.resources import PlanningAreaResource from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import ( DSSInstance, DSSInstanceResource, ) -from monitoring.uss_qualifier.resources.astm.f3548.v21.planning_area import ( - PlanningAreaSpecification, -) from monitoring.uss_qualifier.resources.communications import ClientIdentityResource from monitoring.uss_qualifier.resources.interuss.id_generator import IDGeneratorResource +from monitoring.uss_qualifier.resources.planning_area import PlanningAreaSpecification from monitoring.uss_qualifier.scenarios.astm.utm.dss import test_step_fragments from monitoring.uss_qualifier.scenarios.scenario import TestScenario from monitoring.uss_qualifier.suites.suite import ExecutionContext diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/dss_interoperability.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/dss_interoperability.md index b8407b7766..368ef7c85d 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/dss_interoperability.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/dss_interoperability.md @@ -18,7 +18,7 @@ A [resources.astm.f3548.v21.DSSInstancesResource](../../../../resources/astm/f35 ### planning_area -A [resources.astm.f3548.v21.PlanningAreaResource](../../../../resources/astm/f3548/v21/planning_area.py) containing a planning area that covers the area of interest for this +A [resources.PlanningAreaResource](../../../../resources/planning_area.py) containing a planning area that covers the area of interest for this ### test_exclusions diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/dss_interoperability.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/dss_interoperability.py index c0409ff5cf..679e00f0f5 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/dss_interoperability.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/dss_interoperability.py @@ -7,7 +7,7 @@ from uas_standards.astm.f3548.v21.constants import Scope from monitoring.monitorlib.fetch import QueryError -from monitoring.uss_qualifier.resources.astm.f3548.v21 import PlanningAreaResource +from monitoring.uss_qualifier.resources import PlanningAreaResource from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import ( DSSInstance, DSSInstanceResource, diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_explicit_sub_handling.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_explicit_sub_handling.md index ffc7ecc84e..78e7ae8411 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_explicit_sub_handling.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_explicit_sub_handling.md @@ -20,7 +20,7 @@ Verifies the behavior of a DSS for interactions pertaining to operational intent ### planning_area -[`PlanningAreaResource`](../../../../resources/astm/f3548/v21/planning_area.py) describes the 3D volume in which operational intent references will be created. +[`PlanningAreaResource`](../../../../resources/planning_area.py) describes the 3D volume in which operational intent references will be created. ## Setup test case diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_explicit_sub_handling.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_explicit_sub_handling.py index 232e6c9eb4..2fa3bc64d4 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_explicit_sub_handling.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_explicit_sub_handling.py @@ -14,19 +14,17 @@ from monitoring.monitorlib.fetch import QueryError from monitoring.monitorlib.geotemporal import Volume4D from monitoring.prober.infrastructure import register_resource_type -from monitoring.uss_qualifier.resources.astm.f3548.v21 import PlanningAreaResource +from monitoring.uss_qualifier.resources import PlanningAreaResource from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import ( DSSInstance, DSSInstanceResource, ) -from monitoring.uss_qualifier.resources.astm.f3548.v21.planning_area import ( - PlanningAreaSpecification, -) from monitoring.uss_qualifier.resources.astm.f3548.v21.subscription_params import ( SubscriptionParams, ) from monitoring.uss_qualifier.resources.communications import ClientIdentityResource from monitoring.uss_qualifier.resources.interuss.id_generator import IDGeneratorResource +from monitoring.uss_qualifier.resources.planning_area import PlanningAreaSpecification from monitoring.uss_qualifier.scenarios.astm.utm.dss import test_step_fragments from monitoring.uss_qualifier.scenarios.astm.utm.dss.fragments.oir import ( crud as oir_fragments, diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_implicit_sub_handling.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_implicit_sub_handling.md index 41245cf2f4..74b4346826 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_implicit_sub_handling.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_implicit_sub_handling.md @@ -16,7 +16,7 @@ Checks that implicit subscriptions are properly created, mutated and cleaned up. ### planning_area -[`PlanningAreaResource`](../../../../resources/astm/f3548/v21/planning_area.py) describes the 3D volume in which subscriptions will be created. +[`PlanningAreaResource`](../../../../resources/planning_area.py) describes the 3D volume in which subscriptions will be created. ### utm_client_identity diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_implicit_sub_handling.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_implicit_sub_handling.py index c5ac2b9325..9a475a1a58 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_implicit_sub_handling.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/oir_implicit_sub_handling.py @@ -16,7 +16,7 @@ from monitoring.monitorlib.geotemporal import Volume4D from monitoring.monitorlib.testing import make_fake_url from monitoring.prober.infrastructure import register_resource_type -from monitoring.uss_qualifier.resources.astm.f3548.v21 import PlanningAreaResource +from monitoring.uss_qualifier.resources import PlanningAreaResource from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import DSSInstanceResource from monitoring.uss_qualifier.resources.communications import ClientIdentityResource from monitoring.uss_qualifier.resources.interuss.id_generator import IDGeneratorResource diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_key_validation.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_key_validation.md index b61dba15d1..3d561b6ced 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_key_validation.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_key_validation.md @@ -21,7 +21,7 @@ provide all OVNs for all currently relevant entities. ### planning_area -[`PlanningAreaResource`](../../../../resources/astm/f3548/v21/planning_area.py) describes the 3D volume in which operational intent references will be created. +[`PlanningAreaResource`](../../../../resources/planning_area.py) describes the 3D volume in which operational intent references will be created. ## Setup test case diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_key_validation.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_key_validation.py index c9082e0e74..66983b9903 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_key_validation.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_key_validation.py @@ -14,7 +14,7 @@ from monitoring.monitorlib.geotemporal import Volume4D from monitoring.monitorlib.schema_validation import F3548_21 from monitoring.prober.infrastructure import register_resource_type -from monitoring.uss_qualifier.resources.astm.f3548.v21 import PlanningAreaResource +from monitoring.uss_qualifier.resources import PlanningAreaResource from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import ( DSSInstance, DSSInstanceResource, diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_simple.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_simple.md index 978324848d..322843cf2d 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_simple.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_simple.md @@ -20,7 +20,7 @@ Verifies the behavior of a DSS for simple interactions pertaining to operational ### planning_area -[`PlanningAreaResource`](../../../../resources/astm/f3548/v21/planning_area.py) describes the 3D volume in which operational intent references will be created. +[`PlanningAreaResource`](../../../../resources/planning_area.py) describes the 3D volume in which operational intent references will be created. ## Setup test case diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_simple.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_simple.py index 6fef2c3a57..a459b0e30f 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_simple.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/op_intent_ref_simple.py @@ -13,16 +13,14 @@ from monitoring.monitorlib.fetch import QueryError from monitoring.monitorlib.geotemporal import Volume4D from monitoring.prober.infrastructure import register_resource_type -from monitoring.uss_qualifier.resources.astm.f3548.v21 import PlanningAreaResource +from monitoring.uss_qualifier.resources import PlanningAreaResource from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import ( DSSInstance, DSSInstanceResource, ) -from monitoring.uss_qualifier.resources.astm.f3548.v21.planning_area import ( - PlanningAreaSpecification, -) from monitoring.uss_qualifier.resources.communications import ClientIdentityResource from monitoring.uss_qualifier.resources.interuss.id_generator import IDGeneratorResource +from monitoring.uss_qualifier.resources.planning_area import PlanningAreaSpecification from monitoring.uss_qualifier.scenarios.astm.utm.dss import test_step_fragments from monitoring.uss_qualifier.scenarios.astm.utm.dss.fragments.oir import ( crud as oir_fragments, diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.md index 66d9e44b51..be8382e9b2 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.md @@ -20,7 +20,7 @@ Create and mutate subscriptions as well as entities, and verify that the DSS han ### planning_area -[`PlanningAreaResource`](../../../../resources/astm/f3548/v21/planning_area.py) describes the 3D volume in which subscriptions will be created. +[`PlanningAreaResource`](../../../../resources/planning_area.py) describes the 3D volume in which subscriptions will be created. ### utm_client_identity diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.py index 25efe3b726..542f88a44d 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions.py @@ -18,7 +18,7 @@ from monitoring.monitorlib.testing import make_fake_url from monitoring.prober.infrastructure import register_resource_type from monitoring.uss_qualifier.configurations.configuration import ParticipantID -from monitoring.uss_qualifier.resources.astm.f3548.v21 import PlanningAreaResource +from monitoring.uss_qualifier.resources import PlanningAreaResource from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import ( DSSInstanceResource, DSSInstancesResource, diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions_deletion.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions_deletion.md index a6df042ac0..b0b450ed70 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions_deletion.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions_deletion.md @@ -20,7 +20,7 @@ Create and mutate subscriptions as well as entities, and verify that the DSS han ### planning_area -[`PlanningAreaResource`](../../../../resources/astm/f3548/v21/planning_area.py) describes the 3D volume in which subscriptions will be created. +[`PlanningAreaResource`](../../../../resources/planning_area.py) describes the 3D volume in which subscriptions will be created. ### utm_client_identity diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions_deletion.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions_deletion.py index 619c570bf8..1be1e7193c 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions_deletion.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_interactions_deletion.py @@ -13,7 +13,7 @@ from monitoring.monitorlib.fetch import QueryError from monitoring.monitorlib.geotemporal import Volume4D from monitoring.monitorlib.testing import make_fake_url -from monitoring.uss_qualifier.resources.astm.f3548.v21 import PlanningAreaResource +from monitoring.uss_qualifier.resources import PlanningAreaResource from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import ( DSSInstanceResource, DSSInstancesResource, diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_simple.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_simple.md index 329955a3b9..949fa52dab 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_simple.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_simple.md @@ -16,7 +16,7 @@ Perform basic operations on a single DSS instance to create, update and delete s ### planning_area -[`PlanningAreaResource`](../../../../resources/astm/f3548/v21/planning_area.py) describes the 3D volume in which subscriptions will be created. +[`PlanningAreaResource`](../../../../resources/planning_area.py) describes the 3D volume in which subscriptions will be created. ### problematically_big_area diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_simple.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_simple.py index 57246bc1e2..1e4d941fca 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_simple.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_simple.py @@ -9,13 +9,10 @@ from monitoring.monitorlib.geotemporal import Volume4D from monitoring.monitorlib.mutate.scd import MutatedSubscription from monitoring.prober.infrastructure import register_resource_type -from monitoring.uss_qualifier.resources import VerticesResource -from monitoring.uss_qualifier.resources.astm.f3548.v21 import PlanningAreaResource +from monitoring.uss_qualifier.resources import PlanningAreaResource, VerticesResource from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import DSSInstanceResource -from monitoring.uss_qualifier.resources.astm.f3548.v21.planning_area import ( - SubscriptionParams, -) from monitoring.uss_qualifier.resources.interuss.id_generator import IDGeneratorResource +from monitoring.uss_qualifier.resources.planning_area import SubscriptionParams from monitoring.uss_qualifier.scenarios.astm.utm.dss import test_step_fragments from monitoring.uss_qualifier.scenarios.astm.utm.dss.fragments.sub.crud import ( sub_create_query, diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_validation.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_validation.md index a271198d68..95fc9fc391 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_validation.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_validation.md @@ -16,7 +16,7 @@ Ensures that a DSS properly enforces limitations on created subscriptions ### planning_area -[`PlanningAreaResource`](../../../../resources/astm/f3548/v21/planning_area.py) describes the 3D volume in which subscriptions will be created. +[`PlanningAreaResource`](../../../../resources/planning_area.py) describes the 3D volume in which subscriptions will be created. ## Setup test case diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_validation.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_validation.py index b3e6fd034f..265e3eb756 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_validation.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/subscription_validation.py @@ -10,11 +10,11 @@ from monitoring.monitorlib.mutate.scd import MutatedSubscription from monitoring.prober.infrastructure import register_resource_type from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import DSSInstanceResource -from monitoring.uss_qualifier.resources.astm.f3548.v21.planning_area import ( +from monitoring.uss_qualifier.resources.interuss.id_generator import IDGeneratorResource +from monitoring.uss_qualifier.resources.planning_area import ( PlanningAreaResource, PlanningAreaSpecification, ) -from monitoring.uss_qualifier.resources.interuss.id_generator import IDGeneratorResource from monitoring.uss_qualifier.scenarios.astm.utm.dss import test_step_fragments from monitoring.uss_qualifier.scenarios.scenario import PendingCheck, TestScenario from monitoring.uss_qualifier.suites.suite import ExecutionContext diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/constraint_ref_synchronization.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/constraint_ref_synchronization.md index b3b38f886d..a95cd5dbf4 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/constraint_ref_synchronization.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/constraint_ref_synchronization.md @@ -21,7 +21,7 @@ are properly propagated to every other DSS instance participating in the deploym ### planning_area -[`PlanningAreaResource`](../../../../../resources/astm/f3548/v21/planning_area.py) describes the 3D volume in which constraint reference will be created. +[`PlanningAreaResource`](../../../../../resources/planning_area.py) describes the 3D volume in which constraint reference will be created. ### client_identity diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/constraint_ref_synchronization.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/constraint_ref_synchronization.py index d399c6fcd8..b9b695e879 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/constraint_ref_synchronization.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/constraint_ref_synchronization.py @@ -11,7 +11,7 @@ from monitoring.monitorlib.fetch import Query, QueryError from monitoring.monitorlib.geotemporal import Volume4D, Volume4DCollection from monitoring.prober.infrastructure import register_resource_type -from monitoring.uss_qualifier.resources.astm.f3548.v21 import PlanningAreaResource +from monitoring.uss_qualifier.resources import PlanningAreaResource from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import ( DSSInstance, DSSInstanceResource, diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/op_intent_ref_synchronization.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/op_intent_ref_synchronization.md index cb417cc94c..71d6f4afa6 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/op_intent_ref_synchronization.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/op_intent_ref_synchronization.md @@ -21,7 +21,7 @@ are properly propagated to every other DSS instance participating in the deploym ### planning_area -[`PlanningAreaResource`](../../../../../resources/astm/f3548/v21/planning_area.py) describes the 3D volume in which operational intent reference will be created. +[`PlanningAreaResource`](../../../../../resources/planning_area.py) describes the 3D volume in which operational intent reference will be created. ### client_identity diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/op_intent_ref_synchronization.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/op_intent_ref_synchronization.py index 0486dab70e..1ee0534fe8 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/op_intent_ref_synchronization.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/op_intent_ref_synchronization.py @@ -12,7 +12,7 @@ from monitoring.monitorlib.fetch import Query, QueryError from monitoring.monitorlib.geotemporal import Volume4D, Volume4DCollection from monitoring.prober.infrastructure import register_resource_type -from monitoring.uss_qualifier.resources.astm.f3548.v21 import PlanningAreaResource +from monitoring.uss_qualifier.resources import PlanningAreaResource from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import ( DSSInstance, DSSInstanceResource, diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/subscription_synchronization.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/subscription_synchronization.md index bee475a406..37f1ac53f1 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/subscription_synchronization.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/subscription_synchronization.md @@ -20,7 +20,7 @@ Verifies that all subscription CRUD operations performed on a single DSS instanc ### planning_area -[`PlanningAreaResource`](../../../../../resources/astm/f3548/v21/planning_area.py) describes the 3D volume in which subscriptions will be created. +[`PlanningAreaResource`](../../../../../resources/planning_area.py) describes the 3D volume in which subscriptions will be created. ### second_utm_auth diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/subscription_synchronization.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/subscription_synchronization.py index 00cfcf3aeb..f7cd3aa454 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/subscription_synchronization.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/subscription_synchronization.py @@ -11,17 +11,15 @@ from monitoring.monitorlib.mutate.scd import MutatedSubscription from monitoring.monitorlib.schema_validation import F3548_21 from monitoring.prober.infrastructure import register_resource_type -from monitoring.uss_qualifier.resources.astm.f3548.v21 import PlanningAreaResource +from monitoring.uss_qualifier.resources import PlanningAreaResource from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import ( DSSInstance, DSSInstanceResource, DSSInstancesResource, ) -from monitoring.uss_qualifier.resources.astm.f3548.v21.planning_area import ( - SubscriptionParams, -) from monitoring.uss_qualifier.resources.communications import AuthAdapterResource from monitoring.uss_qualifier.resources.interuss.id_generator import IDGeneratorResource +from monitoring.uss_qualifier.resources.planning_area import SubscriptionParams from monitoring.uss_qualifier.scenarios.astm.utm.dss import test_step_fragments from monitoring.uss_qualifier.scenarios.astm.utm.dss.fragments.sub.crud import ( sub_create_query, diff --git a/monitoring/uss_qualifier/scenarios/interuss/ovn_request/dss_ovn_request.md b/monitoring/uss_qualifier/scenarios/interuss/ovn_request/dss_ovn_request.md index e6efc2a151..9e13dc2a07 100644 --- a/monitoring/uss_qualifier/scenarios/interuss/ovn_request/dss_ovn_request.md +++ b/monitoring/uss_qualifier/scenarios/interuss/ovn_request/dss_ovn_request.md @@ -15,7 +15,7 @@ This test validates that a DSS correctly implements the [OVN Request Optional Ex [`ClientIdentityResource`](../../../resources/communications/client_identity.py) the client identity that will be used to create and update operational intent references. ### planning_area -[`PlanningAreaResource`](../../../resources/astm/f3548/v21/planning_area.py) describes the 3D volume in which operational intent references will be created. +[`PlanningAreaResource`](../../../resources/planning_area.py) describes the 3D volume in which operational intent references will be created. ## Setup test case diff --git a/monitoring/uss_qualifier/scenarios/interuss/ovn_request/dss_ovn_request.py b/monitoring/uss_qualifier/scenarios/interuss/ovn_request/dss_ovn_request.py index 160ac7d517..62c852f80b 100644 --- a/monitoring/uss_qualifier/scenarios/interuss/ovn_request/dss_ovn_request.py +++ b/monitoring/uss_qualifier/scenarios/interuss/ovn_request/dss_ovn_request.py @@ -12,7 +12,7 @@ from monitoring.monitorlib import geotemporal from monitoring.monitorlib.fetch import QueryError from monitoring.prober.infrastructure import register_resource_type -from monitoring.uss_qualifier.resources.astm.f3548.v21 import PlanningAreaResource +from monitoring.uss_qualifier.resources import PlanningAreaResource from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import DSSInstanceResource from monitoring.uss_qualifier.resources.communications import ClientIdentityResource from monitoring.uss_qualifier.resources.interuss import IDGeneratorResource diff --git a/monitoring/uss_qualifier/suites/astm/utm/dss_probing.yaml b/monitoring/uss_qualifier/suites/astm/utm/dss_probing.yaml index 41e38f1fb5..0efc578914 100644 --- a/monitoring/uss_qualifier/suites/astm/utm/dss_probing.yaml +++ b/monitoring/uss_qualifier/suites/astm/utm/dss_probing.yaml @@ -7,7 +7,7 @@ resources: dss_datastore_cluster: resources.interuss.datastore.DatastoreDBClusterResource? flight_intents: resources.flight_planning.FlightIntentsResource id_generator: resources.interuss.IDGeneratorResource - planning_area: resources.astm.f3548.v21.PlanningAreaResource + planning_area: resources.PlanningAreaResource problematically_big_area: resources.VerticesResource test_exclusions: resources.dev.TestExclusionsResource? actions: diff --git a/monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml b/monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml index 6fad228aee..4ddcaeab86 100644 --- a/monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml +++ b/monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml @@ -18,7 +18,7 @@ resources: utm_client_identity: resources.communications.ClientIdentityResource mock_uss: resources.interuss.mock_uss.client.MockUSSResource? id_generator: resources.interuss.IDGeneratorResource - planning_area: resources.astm.f3548.v21.PlanningAreaResource + planning_area: resources.PlanningAreaResource problematically_big_area: resources.VerticesResource system_identity: resources.versioning.SystemIdentityResource? test_exclusions: resources.dev.TestExclusionsResource? diff --git a/monitoring/uss_qualifier/suites/astm/utm/prod_probe.yaml b/monitoring/uss_qualifier/suites/astm/utm/prod_probe.yaml index 16bb53a21e..a82a1896ab 100644 --- a/monitoring/uss_qualifier/suites/astm/utm/prod_probe.yaml +++ b/monitoring/uss_qualifier/suites/astm/utm/prod_probe.yaml @@ -4,7 +4,7 @@ resources: dss_instances: resources.astm.f3548.v21.DSSInstancesResource? dss_datastore_cluster: resources.interuss.datastore.DatastoreDBClusterResource? id_generator: resources.interuss.IDGeneratorResource - planning_area: resources.astm.f3548.v21.PlanningAreaResource + planning_area: resources.PlanningAreaResource test_exclusions: resources.dev.TestExclusionsResource? utm_client_identity: resources.communications.ClientIdentityResource actions: @@ -41,7 +41,7 @@ actions: all_dss_instances: resources.astm.f3548.v21.DSSInstancesResource? dss_datastore_cluster: resources.interuss.datastore.DatastoreDBClusterResource? id_generator: resources.interuss.IDGeneratorResource - planning_area: resources.astm.f3548.v21.PlanningAreaResource + planning_area: resources.PlanningAreaResource test_exclusions: resources.dev.TestExclusionsResource? actions: - test_scenario: diff --git a/monitoring/uss_qualifier/suites/faa/uft/message_signing.yaml b/monitoring/uss_qualifier/suites/faa/uft/message_signing.yaml index 4c596201fe..7c33a92d0d 100644 --- a/monitoring/uss_qualifier/suites/faa/uft/message_signing.yaml +++ b/monitoring/uss_qualifier/suites/faa/uft/message_signing.yaml @@ -13,7 +13,7 @@ resources: id_generator: resources.interuss.IDGeneratorResource utm_client_identity: resources.communications.ClientIdentityResource second_utm_auth: resources.communications.AuthAdapterResource? - planning_area: resources.astm.f3548.v21.PlanningAreaResource + planning_area: resources.PlanningAreaResource problematically_big_area: resources.VerticesResource test_exclusions: resources.dev.TestExclusionsResource? actions: diff --git a/monitoring/uss_qualifier/suites/interuss/dss/all_tests.yaml b/monitoring/uss_qualifier/suites/interuss/dss/all_tests.yaml index 3059db9efc..1ebbfe6655 100644 --- a/monitoring/uss_qualifier/suites/interuss/dss/all_tests.yaml +++ b/monitoring/uss_qualifier/suites/interuss/dss/all_tests.yaml @@ -9,7 +9,7 @@ resources: id_generator: resources.interuss.IDGeneratorResource service_area: resources.netrid.ServiceAreaResource? - planning_area: resources.astm.f3548.v21.PlanningAreaResource? + planning_area: resources.PlanningAreaResource? problematically_big_area: resources.VerticesResource? second_utm_auth: resources.communications.AuthAdapterResource? diff --git a/monitoring/uss_qualifier/suites/uspace/flight_auth.yaml b/monitoring/uss_qualifier/suites/uspace/flight_auth.yaml index 1ce7742246..eea9035f43 100644 --- a/monitoring/uss_qualifier/suites/uspace/flight_auth.yaml +++ b/monitoring/uss_qualifier/suites/uspace/flight_auth.yaml @@ -16,7 +16,7 @@ resources: utm_client_identity: resources.communications.ClientIdentityResource utm_auth: resources.communications.AuthAdapterResource? second_utm_auth: resources.communications.AuthAdapterResource? - planning_area: resources.astm.f3548.v21.PlanningAreaResource + planning_area: resources.PlanningAreaResource problematically_big_area: resources.VerticesResource system_identity: resources.versioning.SystemIdentityResource? test_exclusions: resources.dev.TestExclusionsResource? diff --git a/monitoring/uss_qualifier/suites/uspace/required_services.yaml b/monitoring/uss_qualifier/suites/uspace/required_services.yaml index 73bbfd8db7..01b0b4941a 100644 --- a/monitoring/uss_qualifier/suites/uspace/required_services.yaml +++ b/monitoring/uss_qualifier/suites/uspace/required_services.yaml @@ -26,7 +26,7 @@ resources: second_utm_auth: resources.communications.AuthAdapterResource? id_generator: resources.interuss.IDGeneratorResource service_area: resources.netrid.ServiceAreaResource - planning_area: resources.astm.f3548.v21.PlanningAreaResource + planning_area: resources.PlanningAreaResource problematically_big_area: resources.VerticesResource test_exclusions: resources.dev.TestExclusionsResource? diff --git a/schemas/monitoring/uss_qualifier/resources/astm/f3548/v21/planning_area/PlanningAreaSpecification.json b/schemas/monitoring/uss_qualifier/resources/planning_area/PlanningAreaSpecification.json similarity index 63% rename from schemas/monitoring/uss_qualifier/resources/astm/f3548/v21/planning_area/PlanningAreaSpecification.json rename to schemas/monitoring/uss_qualifier/resources/planning_area/PlanningAreaSpecification.json index 24d0437c5c..4a6b1946eb 100644 --- a/schemas/monitoring/uss_qualifier/resources/astm/f3548/v21/planning_area/PlanningAreaSpecification.json +++ b/schemas/monitoring/uss_qualifier/resources/planning_area/PlanningAreaSpecification.json @@ -1,7 +1,7 @@ { - "$id": "https://github.com/interuss/monitoring/blob/main/schemas/monitoring/uss_qualifier/resources/astm/f3548/v21/planning_area/PlanningAreaSpecification.json", + "$id": "https://github.com/interuss/monitoring/blob/main/schemas/monitoring/uss_qualifier/resources/planning_area/PlanningAreaSpecification.json", "$schema": "https://json-schema.org/draft/2020-12/schema", - "description": "Specifies an area and USS related information to create test resources that require them.\n\nmonitoring.uss_qualifier.resources.astm.f3548.v21.planning_area.PlanningAreaSpecification, as defined in monitoring/uss_qualifier/resources/astm/f3548/v21/planning_area.py", + "description": "Specifies a 2D or 3D volume along with USS related information to create test resources that require them.\n\nmonitoring.uss_qualifier.resources.planning_area.PlanningAreaSpecification, as defined in monitoring/uss_qualifier/resources/planning_area.py", "properties": { "$ref": { "description": "Path to content that replaces the $ref", @@ -15,7 +15,7 @@ ] }, "volume": { - "$ref": "../../../../../../monitorlib/geo/Volume3D.json", + "$ref": "../../../monitorlib/geo/Volume3D.json", "description": "3D volume of service area" } }, From f626936f7a0e027d6f04533064354507855452e9 Mon Sep 17 00:00:00 2001 From: Julien Perrochet Date: Thu, 12 Jun 2025 15:01:47 +0200 Subject: [PATCH 2/2] revert non-belonging changes --- monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml | 2 -- monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml | 2 -- 2 files changed, 4 deletions(-) diff --git a/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml b/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml index 83889ae017..76d306bd83 100644 --- a/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml +++ b/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml @@ -8,7 +8,6 @@ v1: utm_client_identity: {$ref: 'library/resources.yaml#/utm_client_identity'} id_generator: {$ref: 'library/resources.yaml#/id_generator'} kentland_service_area: {$ref: 'library/resources.yaml#/kentland_service_area'} - kentland_planning_area: {$ref: 'library/resources.yaml#/kentland_planning_area'} au_problematically_big_area: {$ref: 'library/resources.yaml#/au_problematically_big_area'} utm_auth: {$ref: 'library/environment.yaml#/utm_auth'} @@ -41,7 +40,6 @@ v1: id_generator: id_generator service_area: kentland_service_area problematically_big_area: au_problematically_big_area - planning_area: kentland_planning_area test_exclusions: test_exclusions uss_identification: uss_identification execution: diff --git a/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml b/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml index 54e719e49d..dbaa8d7e4a 100644 --- a/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml +++ b/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml @@ -8,7 +8,6 @@ v1: utm_client_identity: {$ref: 'library/resources.yaml#/utm_client_identity'} id_generator: {$ref: 'library/resources.yaml#/id_generator'} kentland_service_area: {$ref: 'library/resources.yaml#/kentland_service_area'} - kentland_planning_area: {$ref: 'library/resources.yaml#/kentland_planning_area'} au_problematically_big_area: {$ref: 'library/resources.yaml#/au_problematically_big_area'} utm_auth: {$ref: 'library/environment.yaml#/utm_auth'} @@ -41,7 +40,6 @@ v1: id_generator: id_generator service_area: kentland_service_area problematically_big_area: au_problematically_big_area - planning_area: kentland_planning_area test_exclusions: test_exclusions uss_identification: uss_identification execution: