Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEXT_RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,5 @@ The release notes should contain at least the following sections:
## Optional migration tasks

## Important information

In uss_qualifier test suite definitions, `on_failure` has been removed, so test suite actions with `Abort` will change behavior under check failures.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
from monitoring.uss_qualifier.suites.definitions import TestSuiteActionDeclaration
from monitoring.uss_qualifier.suites.suite import (
ActionGenerator,
ReactionToFailure,
TestSuiteAction,
)

Expand Down Expand Up @@ -105,7 +104,6 @@ def __init__(
action_to_wrap = ImplicitDict.parse(
specification.action_to_wrap, TestSuiteActionDeclaration
)
action_to_wrap.on_failure = ReactionToFailure.Continue

self._actions = [
TestSuiteAction(
Expand All @@ -117,7 +115,6 @@ def __init__(
"locality": specification.locality_source,
},
),
on_failure=ReactionToFailure.Abort,
),
resources,
),
Expand All @@ -128,7 +125,6 @@ def __init__(
scenario_type=get_scenario_type_name(UnconfigureLocality),
resources={},
),
on_failure=ReactionToFailure.Continue,
),
resources,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ v1:
auth_adapter: auth_adapter
token_expectations: token_expectations
adapter_expectations: adapter_expectations
on_failure: Continue
resources:
auth_adapter: utm_auth
token_expectations: access_token_expectations
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,22 @@ v1:
resources:
flights_data: adjacent_circular_flights_data
storage_configuration: adjacent_circular_storage_config
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.StoreFlightData
resources:
flights_data: kml_flights_data
storage_configuration: kml_storage_config
on_failure: Continue
resources:
adjacent_circular_flights_data: adjacent_circular_flights_data
adjacent_circular_storage_config: adjacent_circular_storage_config
kml_flights_data: kml_flights_data
kml_storage_config: kml_storage_config
on_failure: Abort
times_to_repeat: 2
resources:
adjacent_circular_flights_data: adjacent_circular_flights_data
adjacent_circular_storage_config: adjacent_circular_storage_config
kml_flights_data: kml_flights_data
kml_storage_config: kml_storage_config
on_failure: Continue
execution:
stop_fast: true
validation:
Expand Down
1 change: 0 additions & 1 deletion monitoring/uss_qualifier/configurations/dev/noop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ v1:
scenario_type: scenarios.dev.NoOp
resources:
noop_config: noop_config
on_failure: Continue
resources:
noop_config: noop_config

Expand Down
9 changes: 0 additions & 9 deletions monitoring/uss_qualifier/suites/astm/netrid/f3411_19.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ actions:
flights_data: flights_data
service_providers: service_providers
evaluation_configuration: evaluation_configuration
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v19.DisplayProviderBehavior
resources:
Expand All @@ -32,22 +31,19 @@ actions:
dss_pool: dss_instances
isa: service_area
uss_identification: uss_identification?
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v19.NetworkedUASDisconnect
resources:
flights_data: flights_data
service_providers: service_providers
evaluation_configuration: evaluation_configuration
dss_pool: dss_instances
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v19.SpOperatorNotifyMissingFields
resources:
flights_data: flights_data
service_providers: service_providers
evaluation_configuration: evaluation_configuration
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v19.ServiceProviderNotificationBehavior
resources:
Expand All @@ -57,7 +53,6 @@ actions:
id_generator: id_generator
dss_pool: dss_instances
uss_identification: uss_identification
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v19.NominalBehavior
resources:
Expand All @@ -66,7 +61,6 @@ actions:
observers: observers
evaluation_configuration: evaluation_configuration
dss_pool: dss_instances
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v19.Misbehavior
resources:
Expand All @@ -75,7 +69,6 @@ actions:
observers: observers
evaluation_configuration: evaluation_configuration
dss_pool: dss_instances
on_failure: Continue
- action_generator:
generator_type: action_generators.astm.f3411.ForEachDSS
resources:
Expand All @@ -101,10 +94,8 @@ actions:
problematically_big_area: problematically_big_area
planning_area: planning_area
test_exclusions: test_exclusions?
on_failure: Continue
dss_instances_source: dss_instances
dss_instance_id: dss
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v19.AggregateChecks
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ actions:
scenario_type: scenarios.astm.netrid.v19.dss.DatastoreAccess
resources:
datastore_cluster: dss_datastore_cluster
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v19.dss.HeavyTrafficConcurrent
resources:
Expand Down
10 changes: 0 additions & 10 deletions monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,12 @@ actions:
resources:
version_providers: test_env_version_providers
system_identity: system_identity
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v22a.ServiceProviderNotifiesSlowUpdates
resources:
flights_data: flights_data
service_providers: service_providers
evaluation_configuration: evaluation_configuration
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v22a.DisplayProviderBehavior
resources:
Expand All @@ -41,22 +39,19 @@ actions:
dss_pool: dss_instances
isa: service_area
uss_identification: uss_identification?
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v22a.NetworkedUASDisconnect
resources:
flights_data: flights_data
service_providers: service_providers
evaluation_configuration: evaluation_configuration
dss_pool: dss_instances
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v22a.SpOperatorNotifyMissingFields
resources:
flights_data: flights_data
service_providers: service_providers
evaluation_configuration: evaluation_configuration
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v22a.ServiceProviderNotificationBehavior
resources:
Expand All @@ -66,7 +61,6 @@ actions:
id_generator: id_generator
dss_pool: dss_instances
uss_identification: uss_identification
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v22a.NominalBehavior
resources:
Expand All @@ -75,15 +69,13 @@ actions:
observers: observers?
evaluation_configuration: evaluation_configuration
dss_pool: dss_instances?
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v22a.Misbehavior
resources:
flights_data: flights_data
service_providers: service_providers
evaluation_configuration: evaluation_configuration
dss_pool: dss_instances
on_failure: Continue
- action_generator:
generator_type: action_generators.astm.f3411.ForEachDSS
resources:
Expand Down Expand Up @@ -112,10 +104,8 @@ actions:
planning_area: planning_area
test_exclusions: test_exclusions?
concurrency_behavior_adjustment: concurrency_behavior_adjustment?
on_failure: Continue
dss_instances_source: dss_instances
dss_instance_id: dss
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v22a.AggregateChecks
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,10 @@ actions:
scenario_type: scenarios.astm.netrid.v22a.dss.DatastoreAccess
resources:
datastore_cluster: dss_datastore_cluster
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v22a.dss.HeavyTrafficConcurrent
resources:
dss: dss
id_generator: id_generator
isa: isa
behavior_adjustment: concurrency_behavior_adjustment?
behavior_adjustment: concurrency_behavior_adjustment?
23 changes: 0 additions & 23 deletions monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ actions:
resources:
version_providers: test_env_version_providers
system_identity: system_identity
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.utm.dss.pool_info.PoolInfo
resources:
Expand All @@ -52,7 +51,6 @@ actions:
flight_intents2: conflicting_flights?
flight_intents3: non_conflicting_flights?
flight_intents_provider: priority_preemption_flights_provider?
on_failure: Continue
- action_generator:
generator_type: action_generators.astm.f3548.ForEachDSS
resources:
Expand Down Expand Up @@ -80,10 +78,8 @@ actions:
planning_area: planning_area
problematically_big_area: problematically_big_area
test_exclusions: test_exclusions?
on_failure: Continue
dss_instances_source: dss_instances
dss_instance_id: dss
on_failure: Continue
- action_generator:
generator_type: action_generators.flight_planning.FlightPlannerCombinations
resources:
Expand All @@ -99,12 +95,10 @@ actions:
flight_intents: invalid_flight_intents
tested_uss: uss1
dss: dss
on_failure: Continue
combination_selector_source: flight_intent_validation_selector
flight_planners_source: flight_planners
roles:
- uss1
on_failure: Continue
- action_generator:
generator_type: action_generators.flight_planning.FlightPlannerCombinations
resources:
Expand All @@ -121,7 +115,6 @@ actions:
tested_uss: uss1
control_uss: uss2
dss: dss
on_failure: Continue
combination_selector_source: priority_planning_selector
flight_planners_source: flight_planners
roles:
Expand All @@ -130,7 +123,6 @@ actions:
per_index_resources:
- resource_provider: priority_preemption_flights_provider
provided_resource: priority_preemption_flights
on_failure: Continue
- action_generator:
generator_type: action_generators.flight_planning.FlightPlannerCombinations
resources:
Expand All @@ -147,13 +139,11 @@ actions:
tested_uss: uss1
control_uss: uss2
dss: dss
on_failure: Continue
combination_selector_source: nominal_planning_selector
flight_planners_source: flight_planners
roles:
- uss1
- uss2
on_failure: Continue
- action_generator:
generator_type: action_generators.flight_planning.FlightPlannerCombinations
resources:
Expand All @@ -170,11 +160,9 @@ actions:
mock_uss: mock_uss
dss: dss
flight_intents: non_conflicting_flights
on_failure: Continue
flight_planners_source: flight_planners
roles:
- tested_uss
on_failure: Continue
- action_generator:
generator_type: action_generators.flight_planning.FlightPlannerCombinations
resources:
Expand All @@ -191,11 +179,9 @@ actions:
mock_uss: mock_uss
dss: dss
flight_intents: non_conflicting_flights
on_failure: Continue
flight_planners_source: flight_planners
roles:
- tested_uss
on_failure: Continue
- action_generator:
generator_type: action_generators.flight_planning.FlightPlannerCombinations
resources:
Expand All @@ -212,11 +198,9 @@ actions:
utm_auth: utm_auth
dss: dss
flight_intents: non_conflicting_flights
on_failure: Continue
flight_planners_source: flight_planners
roles:
- tested_uss
on_failure: Continue
- action_generator:
generator_type: action_generators.flight_planning.FlightPlannerCombinations
resources:
Expand All @@ -232,12 +216,10 @@ actions:
flight_intents: conflicting_flights
tested_uss: uss1
dss: dss
on_failure: Continue
combination_selector_source: nominal_planning_selector
flight_planners_source: flight_planners
roles:
- uss1
on_failure: Continue
- action_generator:
generator_type: action_generators.flight_planning.FlightPlannerCombinations
resources:
Expand All @@ -253,12 +235,10 @@ actions:
flight_intents: conflicting_flights
tested_uss: uss1
dss: dss
on_failure: Continue
combination_selector_source: nominal_planning_selector
flight_planners_source: flight_planners
roles:
- uss1
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.utm.PrepareFlightPlanners # TODO: Convert this to a scenario which only clears the area (does not check readiness)
resources:
Expand All @@ -269,19 +249,16 @@ actions:
flight_intents2: conflicting_flights?
flight_intents3: non_conflicting_flights?
flight_intents_provider: priority_preemption_flights_provider?
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.utm.make_uss_report.MakeUssReport
resources:
utm_auth: utm_auth
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.utm.versioning.evaluate_system_versions.EvaluateSystemVersions
resources:
test_env_version_providers: test_env_version_providers
prod_env_version_providers: prod_env_version_providers
system_identity: system_identity
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.utm.AggregateChecks
resources:
Expand Down
Loading
Loading