diff --git a/NEXT_RELEASE_NOTES.md b/NEXT_RELEASE_NOTES.md index 5cc21420961..819a8640751 100644 --- a/NEXT_RELEASE_NOTES.md +++ b/NEXT_RELEASE_NOTES.md @@ -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. diff --git a/monitoring/uss_qualifier/action_generators/interuss/mock_uss/with_locality.py b/monitoring/uss_qualifier/action_generators/interuss/mock_uss/with_locality.py index 2240f00dc3e..bfcd728b67a 100644 --- a/monitoring/uss_qualifier/action_generators/interuss/mock_uss/with_locality.py +++ b/monitoring/uss_qualifier/action_generators/interuss/mock_uss/with_locality.py @@ -27,7 +27,6 @@ from monitoring.uss_qualifier.suites.definitions import TestSuiteActionDeclaration from monitoring.uss_qualifier.suites.suite import ( ActionGenerator, - ReactionToFailure, TestSuiteAction, ) @@ -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( @@ -117,7 +115,6 @@ def __init__( "locality": specification.locality_source, }, ), - on_failure=ReactionToFailure.Abort, ), resources, ), @@ -128,7 +125,6 @@ def __init__( scenario_type=get_scenario_type_name(UnconfigureLocality), resources={}, ), - on_failure=ReactionToFailure.Continue, ), resources, ), diff --git a/monitoring/uss_qualifier/configurations/dev/access_tokens.yaml b/monitoring/uss_qualifier/configurations/dev/access_tokens.yaml index 2ed3d7b3115..87a2d769482 100644 --- a/monitoring/uss_qualifier/configurations/dev/access_tokens.yaml +++ b/monitoring/uss_qualifier/configurations/dev/access_tokens.yaml @@ -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 diff --git a/monitoring/uss_qualifier/configurations/dev/generate_rid_test_data.yaml b/monitoring/uss_qualifier/configurations/dev/generate_rid_test_data.yaml index 7fd2612cc1a..5a0d4fbe926 100644 --- a/monitoring/uss_qualifier/configurations/dev/generate_rid_test_data.yaml +++ b/monitoring/uss_qualifier/configurations/dev/generate_rid_test_data.yaml @@ -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: diff --git a/monitoring/uss_qualifier/configurations/dev/noop.yaml b/monitoring/uss_qualifier/configurations/dev/noop.yaml index c8406817ed9..86fceb27cbe 100644 --- a/monitoring/uss_qualifier/configurations/dev/noop.yaml +++ b/monitoring/uss_qualifier/configurations/dev/noop.yaml @@ -19,7 +19,6 @@ v1: scenario_type: scenarios.dev.NoOp resources: noop_config: noop_config - on_failure: Continue resources: noop_config: noop_config diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.yaml b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.yaml index f5cd1450a8b..f289af2216a 100644 --- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.yaml +++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.yaml @@ -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: @@ -32,7 +31,6 @@ 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: @@ -40,14 +38,12 @@ actions: 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: @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.yaml b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.yaml index 0445076a9f7..5ab2ecc04fa 100644 --- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.yaml +++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.yaml @@ -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: diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml index f781f3d7148..7f4064f22a2 100644 --- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml +++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml @@ -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: @@ -41,7 +39,6 @@ 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: @@ -49,14 +46,12 @@ actions: 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: @@ -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: @@ -75,7 +69,6 @@ actions: observers: observers? evaluation_configuration: evaluation_configuration dss_pool: dss_instances? - on_failure: Continue - test_scenario: scenario_type: scenarios.astm.netrid.v22a.Misbehavior resources: @@ -83,7 +76,6 @@ actions: 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: @@ -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: diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.yaml b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.yaml index 70a5e020a3b..e951ebf995f 100644 --- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.yaml +++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.yaml @@ -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? \ No newline at end of file + behavior_adjustment: concurrency_behavior_adjustment? diff --git a/monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml b/monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml index b61dfa6fb2b..8a17c152878 100644 --- a/monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml +++ b/monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/monitoring/uss_qualifier/suites/astm/utm/prod_probe.yaml b/monitoring/uss_qualifier/suites/astm/utm/prod_probe.yaml index a82a1896ab8..3e3dd63aa28 100644 --- a/monitoring/uss_qualifier/suites/astm/utm/prod_probe.yaml +++ b/monitoring/uss_qualifier/suites/astm/utm/prod_probe.yaml @@ -32,7 +32,6 @@ actions: planning_area: planning_area test_exclusions: test_exclusions? utm_client_identity: utm_client_identity - on_failure: Continue suite_definition: name: Minimal production probing for primary DSS instance resources: @@ -111,4 +110,3 @@ actions: scenario_type: scenarios.astm.utm.dss.Report resources: dss: primary_dss_instance - on_failure: Continue diff --git a/monitoring/uss_qualifier/suites/definitions.py b/monitoring/uss_qualifier/suites/definitions.py index 4108b398216..78156d2ad01 100644 --- a/monitoring/uss_qualifier/suites/definitions.py +++ b/monitoring/uss_qualifier/suites/definitions.py @@ -1,7 +1,5 @@ from __future__ import annotations -from enum import StrEnum - from implicitdict import ImplicitDict, Optional from monitoring.monitorlib.fileio import FileReference, load_dict_with_references @@ -61,14 +59,6 @@ def type_name(self) -> str: return "" -class ReactionToFailure(StrEnum): - Continue = "Continue" - """If the test suite action fails, continue to the next action in that test suite""" - - Abort = "Abort" - """If the test suite action fails, do not execute any more actions in that test suite""" - - class TestSuiteActionDeclaration(ImplicitDict): """Defines a step in the sequence of things to do for a test suite. @@ -84,9 +74,6 @@ class TestSuiteActionDeclaration(ImplicitDict): action_generator: Optional[ActionGeneratorDefinition] """If this field is populated, declaration of a generator that will produce 0 or more test suite actions""" - on_failure: ReactionToFailure = ReactionToFailure.Continue - """What to do if this action fails""" - @property def invalid_type_error(self): return ValueError( diff --git a/monitoring/uss_qualifier/suites/faa/uft/message_signing.yaml b/monitoring/uss_qualifier/suites/faa/uft/message_signing.yaml index cf91febe5b5..500947b36de 100644 --- a/monitoring/uss_qualifier/suites/faa/uft/message_signing.yaml +++ b/monitoring/uss_qualifier/suites/faa/uft/message_signing.yaml @@ -24,7 +24,6 @@ actions: scenario_type: scenarios.faa.uft.StartMessageSigningReport resources: mock_uss: mock_uss - on_failure: Abort - test_suite: suite_type: suites.astm.utm.f3548_21 resources: @@ -46,9 +45,7 @@ actions: planning_area: planning_area problematically_big_area: problematically_big_area test_exclusions: test_exclusions? - on_failure: Continue - test_scenario: scenario_type: scenarios.faa.uft.FinalizeMessageSigningReport resources: mock_uss: mock_uss - on_failure: Continue diff --git a/monitoring/uss_qualifier/suites/interuss/dss/all_tests.yaml b/monitoring/uss_qualifier/suites/interuss/dss/all_tests.yaml index 5baa073be44..40971e8a962 100644 --- a/monitoring/uss_qualifier/suites/interuss/dss/all_tests.yaml +++ b/monitoring/uss_qualifier/suites/interuss/dss/all_tests.yaml @@ -44,10 +44,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.astm.f3411.ForEachDSS resources: @@ -73,10 +71,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 - action_generator: generator_type: action_generators.astm.f3411.ForEachDSS resources: @@ -102,10 +98,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 # TODO: enable usage of aggregate checks when there are no service providers or observers #- test_scenario: # scenario_type: scenarios.astm.netrid.v19.AggregateChecks diff --git a/monitoring/uss_qualifier/suites/suite.py b/monitoring/uss_qualifier/suites/suite.py index ad1a7467a67..beee00738df 100644 --- a/monitoring/uss_qualifier/suites/suite.py +++ b/monitoring/uss_qualifier/suites/suite.py @@ -57,7 +57,6 @@ get_scenario_type_by_name, ) from monitoring.uss_qualifier.suites.definitions import ( - ReactionToFailure, TestSuiteActionDeclaration, TestSuiteDeclaration, TestSuiteDefinition, @@ -357,7 +356,7 @@ def _run_actions( report: TestSuiteReport | ActionGeneratorReport, ) -> None: success = True - for a, action in enumerate(actions): + for action in actions: if isinstance(action, SkippedActionReport): action_report = TestSuiteActionReport(skipped_action=action) elif context.should_stop_early_now(): @@ -377,14 +376,6 @@ def _run_actions( break if not action_report.successful(): success = False - if action.declaration.on_failure == ReactionToFailure.Abort: - break - elif action.declaration.on_failure == ReactionToFailure.Continue: - continue - else: - raise ValueError( - f"Action {a} indicated an unrecognized reaction to failure: {str(action.declaration.on_failure)}" - ) report.successful = success report.end_time = StringBasedDateTime(datetime.now(UTC)) diff --git a/monitoring/uss_qualifier/suites/uspace/flight_auth.yaml b/monitoring/uss_qualifier/suites/uspace/flight_auth.yaml index 6a5c60f2a7b..5ecd804780e 100644 --- a/monitoring/uss_qualifier/suites/uspace/flight_auth.yaml +++ b/monitoring/uss_qualifier/suites/uspace/flight_auth.yaml @@ -47,14 +47,12 @@ actions: problematically_big_area: problematically_big_area system_identity: system_identity? test_exclusions: test_exclusions? - on_failure: Continue - test_scenario: scenario_type: scenarios.flight_planning.PrepareFlightPlannersScenario resources: flight_planners: flight_planners flight_intents: invalid_flight_auth_flights mock_uss: mock_uss - on_failure: Abort - action_generator: generator_type: action_generators.flight_planning.FlightPlannerCombinations resources: @@ -70,11 +68,9 @@ actions: resources: flight_intents: invalid_flight_auth_flights flight_planner: flight_planner - on_failure: Continue flight_planners_source: flight_planners roles: - flight_planner - on_failure: Continue participant_verifiable_capabilities: - id: no_failures name: Fails No Existing Tests diff --git a/monitoring/uss_qualifier/suites/uspace/geo_awareness_cis.yaml b/monitoring/uss_qualifier/suites/uspace/geo_awareness_cis.yaml index 47c9c5e334b..818d14539eb 100644 --- a/monitoring/uss_qualifier/suites/uspace/geo_awareness_cis.yaml +++ b/monitoring/uss_qualifier/suites/uspace/geo_awareness_cis.yaml @@ -7,9 +7,7 @@ actions: scenario_type: scenarios.eurocae.ed269.source_data_model.SourceDataModelValidation resources: source_document: source_document_ed269 - on_failure: Abort - test_scenario: scenario_type: scenarios.eurocae.ed318.source_data_model.SourceDataModelValidation resources: source_document: source_document_ed318 - on_failure: Abort diff --git a/monitoring/uss_qualifier/suites/uspace/network_identification.yaml b/monitoring/uss_qualifier/suites/uspace/network_identification.yaml index 231d7e5a5d0..1b367d3709d 100644 --- a/monitoring/uss_qualifier/suites/uspace/network_identification.yaml +++ b/monitoring/uss_qualifier/suites/uspace/network_identification.yaml @@ -38,12 +38,10 @@ actions: mock_uss_dp: mock_uss_dp? mock_uss_sp: mock_uss_sp? uss_identification: uss_identification? - on_failure: Abort - test_scenario: scenario_type: scenarios.uspace.netrid.msl.MSLAltitude resources: observers: observers - on_failure: Continue participant_verifiable_capabilities: - id: uspace_netrid_service_provider name: U-Space NetRID Service Provider diff --git a/monitoring/uss_qualifier/suites/uspace/required_services.yaml b/monitoring/uss_qualifier/suites/uspace/required_services.yaml index 78dacc7e15c..74e4de2fe6e 100644 --- a/monitoring/uss_qualifier/suites/uspace/required_services.yaml +++ b/monitoring/uss_qualifier/suites/uspace/required_services.yaml @@ -45,7 +45,6 @@ actions: resources: version_providers: test_env_version_providers system_identity: system_identity - on_failure: Continue - test_suite: suite_type: suites.uspace.flight_auth resources: @@ -69,7 +68,6 @@ actions: problematically_big_area: problematically_big_area system_identity: system_identity test_exclusions: test_exclusions? - on_failure: Continue - test_suite: suite_type: suites.uspace.network_identification resources: @@ -88,7 +86,6 @@ actions: mock_uss_dp: mock_uss_dp? mock_uss_sp: mock_uss_sp? uss_identification: uss_identification? - on_failure: Continue participant_verifiable_capabilities: - id: required_services name: U-space Required Services (work in progress) diff --git a/schemas/monitoring/uss_qualifier/suites/definitions/TestSuiteActionDeclaration.json b/schemas/monitoring/uss_qualifier/suites/definitions/TestSuiteActionDeclaration.json index e2527d73fd0..f3af01edec6 100644 --- a/schemas/monitoring/uss_qualifier/suites/definitions/TestSuiteActionDeclaration.json +++ b/schemas/monitoring/uss_qualifier/suites/definitions/TestSuiteActionDeclaration.json @@ -18,14 +18,6 @@ } ] }, - "on_failure": { - "description": "What to do if this action fails", - "enum": [ - "Continue", - "Abort" - ], - "type": "string" - }, "test_scenario": { "description": "If this field is populated, declaration of the test scenario to run", "oneOf": [