[uss_qualifier] make PlanningAreaResource a non-standard-specific resource

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:

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:

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: {

monitoring/uss_qualifier/resources/__init__.py

@@ -1 +1,2 @@
+from .planning_area import PlanningAreaResource
 from .vertices import VerticesResource

monitoring/uss_qualifier/resources/astm/f3548/v21/__init__.py

@@ -1,2 +1 @@
 from .dss import DSSInstanceResource, DSSInstancesResource
-from .planning_area import PlanningAreaResource

monitoring/uss_qualifier/resources/astm/f3548/v21/planning_area.py → 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

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
 

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 (

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,
 )

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,
 )

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,
 )

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
 

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

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
 

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,

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
 

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,

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
 

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

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
 

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,

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
 

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,

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
 

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,

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
 

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,

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
 

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,

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
 

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

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
 

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,

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
 

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,

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