From 689929fe5c732b9fb5446322c2a8fba13a4e2e5b Mon Sep 17 00:00:00 2001 From: Attila Kobor Date: Tue, 9 Dec 2025 20:32:39 +0100 Subject: [PATCH 1/5] Remove fire response scenario --- config/default.yaml | 2 -- docs/index.md | 2 -- {docs/scenarios => examples}/fire_response.md | 0 {docs/scenarios => examples}/fire_response.png | Bin .../scenarios => examples}/test_fire_response.py | 0 5 files changed, 4 deletions(-) rename {docs/scenarios => examples}/fire_response.md (100%) rename {docs/scenarios => examples}/fire_response.png (100%) rename {src/openutm_verification/scenarios => examples}/test_fire_response.py (100%) diff --git a/config/default.yaml b/config/default.yaml index da9b0710..68994627 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -39,8 +39,6 @@ data_files: suites: basic_conformance: scenarios: - # fire_response is a placeholder scenario and not yet implemented. - - name: fire_response - name: F1_happy_path trajectory: "config/bern/trajectory_f1.json" - name: F2_contingent_path diff --git a/docs/index.md b/docs/index.md index dc56a0b4..0843e1dd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -5,5 +5,3 @@ This section documents the various test scenarios used to verify UTM functionality. ## Scenarios - -* [Fire Response](scenarios/fire_response.md) diff --git a/docs/scenarios/fire_response.md b/examples/fire_response.md similarity index 100% rename from docs/scenarios/fire_response.md rename to examples/fire_response.md diff --git a/docs/scenarios/fire_response.png b/examples/fire_response.png similarity index 100% rename from docs/scenarios/fire_response.png rename to examples/fire_response.png diff --git a/src/openutm_verification/scenarios/test_fire_response.py b/examples/test_fire_response.py similarity index 100% rename from src/openutm_verification/scenarios/test_fire_response.py rename to examples/test_fire_response.py From 0c5393dc1be30fd2fcda63df832e1366c6c458d1 Mon Sep 17 00:00:00 2001 From: Attila Kobor Date: Tue, 9 Dec 2025 20:37:05 +0100 Subject: [PATCH 2/5] add placeholder markdown files. --- docs/index.md | 11 +++++++++++ docs/scenarios/F1_happy_path.md | 0 docs/scenarios/F2_contingent_path.md | 0 docs/scenarios/F3_non_conforming_path.md | 0 docs/scenarios/F5_non_conforming_path.md | 0 docs/scenarios/add_flight_declaration.md | 0 docs/scenarios/geo_fence_upload.md | 0 docs/scenarios/opensky_live_data.md | 0 docs/scenarios/openutm_sim_air_traffic_data.md | 0 docs/scenarios/sdsp_heartbeat.md | 0 docs/scenarios/sdsp_track.md | 0 11 files changed, 11 insertions(+) create mode 100644 docs/scenarios/F1_happy_path.md create mode 100644 docs/scenarios/F2_contingent_path.md create mode 100644 docs/scenarios/F3_non_conforming_path.md create mode 100644 docs/scenarios/F5_non_conforming_path.md create mode 100644 docs/scenarios/add_flight_declaration.md create mode 100644 docs/scenarios/geo_fence_upload.md create mode 100644 docs/scenarios/opensky_live_data.md create mode 100644 docs/scenarios/openutm_sim_air_traffic_data.md create mode 100644 docs/scenarios/sdsp_heartbeat.md create mode 100644 docs/scenarios/sdsp_track.md diff --git a/docs/index.md b/docs/index.md index 0843e1dd..c7715b62 100644 --- a/docs/index.md +++ b/docs/index.md @@ -5,3 +5,14 @@ This section documents the various test scenarios used to verify UTM functionality. ## Scenarios + +* [Add Flight Declaration](scenarios/add_flight_declaration.md) +* [F1 Happy Path](scenarios/F1_happy_path.md) +* [F2 Contingent Path](scenarios/F2_contingent_path.md) +* [F3 Non Conforming Path](scenarios/F3_non_conforming_path.md) +* [F5 Non Conforming Path](scenarios/F5_non_conforming_path.md) +* [Geo Fence Upload](scenarios/geo_fence_upload.md) +* [Opensky Live Data](scenarios/opensky_live_data.md) +* [OpenUTM Sim Air Traffic Data](scenarios/openutm_sim_air_traffic_data.md) +* [SDSP Heartbeat](scenarios/sdsp_heartbeat.md) +* [SDSP Track](scenarios/sdsp_track.md) diff --git a/docs/scenarios/F1_happy_path.md b/docs/scenarios/F1_happy_path.md new file mode 100644 index 00000000..e69de29b diff --git a/docs/scenarios/F2_contingent_path.md b/docs/scenarios/F2_contingent_path.md new file mode 100644 index 00000000..e69de29b diff --git a/docs/scenarios/F3_non_conforming_path.md b/docs/scenarios/F3_non_conforming_path.md new file mode 100644 index 00000000..e69de29b diff --git a/docs/scenarios/F5_non_conforming_path.md b/docs/scenarios/F5_non_conforming_path.md new file mode 100644 index 00000000..e69de29b diff --git a/docs/scenarios/add_flight_declaration.md b/docs/scenarios/add_flight_declaration.md new file mode 100644 index 00000000..e69de29b diff --git a/docs/scenarios/geo_fence_upload.md b/docs/scenarios/geo_fence_upload.md new file mode 100644 index 00000000..e69de29b diff --git a/docs/scenarios/opensky_live_data.md b/docs/scenarios/opensky_live_data.md new file mode 100644 index 00000000..e69de29b diff --git a/docs/scenarios/openutm_sim_air_traffic_data.md b/docs/scenarios/openutm_sim_air_traffic_data.md new file mode 100644 index 00000000..e69de29b diff --git a/docs/scenarios/sdsp_heartbeat.md b/docs/scenarios/sdsp_heartbeat.md new file mode 100644 index 00000000..e69de29b diff --git a/docs/scenarios/sdsp_track.md b/docs/scenarios/sdsp_track.md new file mode 100644 index 00000000..e69de29b From edbf34ebb9f22715c91531f3d0f0a65455b5fcca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20K=C3=B3bor?= Date: Fri, 12 Dec 2025 21:04:56 +0100 Subject: [PATCH 3/5] Add pull_requests scenarios to default.yaml --- config/default.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/config/default.yaml b/config/default.yaml index ced441aa..ea1bb53a 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -38,6 +38,18 @@ data_files: # List of test scenario IDs to execute suites: + pull_requests: + scenarios: + - name: F1_happy_path + trajectory: "config/bern/trajectory_f1.json" + - name: F2_contingent_path + trajectory: "config/bern/trajectory_f2.json" + - name: F3_non_conforming_path + trajectory: "config/bern/trajectory_f3.json" + - name: opensky_live_data + - name: add_flight_declaration + - name: geo_fence_upload + - name: openutm_sim_air_traffic_data basic_conformance: scenarios: - name: F1_flow_no_telemetry_with_user_input From 1f5f7f4579375102afe0d2871e8bcafebd568ed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20K=C3=B3bor?= Date: Fri, 12 Dec 2025 21:05:40 +0100 Subject: [PATCH 4/5] Add pull_requests flag to test run command --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e3a43669..bdef721b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,7 +53,7 @@ jobs: run: uv sync --locked --all-extras --dev - name: Run tests - run: uv run openutm-verify --debug --config config/default.yaml + run: uv run openutm-verify --debug --config config/default.yaml -s pull_requests - uses: actions/upload-artifact@v4 if: always() From d566e53c8c27f05bc09fa5c7b650b48a783054e4 Mon Sep 17 00:00:00 2001 From: Attila Kobor Date: Fri, 12 Dec 2025 21:19:41 +0100 Subject: [PATCH 5/5] add a separate config file for pull requests --- .github/workflows/main.yml | 2 +- config/default.yaml | 12 --------- config/pull_request.yaml | 55 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 13 deletions(-) create mode 100644 config/pull_request.yaml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bdef721b..7378df10 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,7 +53,7 @@ jobs: run: uv sync --locked --all-extras --dev - name: Run tests - run: uv run openutm-verify --debug --config config/default.yaml -s pull_requests + run: uv run openutm-verify --debug --config config/pull_request.yaml - uses: actions/upload-artifact@v4 if: always() diff --git a/config/default.yaml b/config/default.yaml index ea1bb53a..ced441aa 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -38,18 +38,6 @@ data_files: # List of test scenario IDs to execute suites: - pull_requests: - scenarios: - - name: F1_happy_path - trajectory: "config/bern/trajectory_f1.json" - - name: F2_contingent_path - trajectory: "config/bern/trajectory_f2.json" - - name: F3_non_conforming_path - trajectory: "config/bern/trajectory_f3.json" - - name: opensky_live_data - - name: add_flight_declaration - - name: geo_fence_upload - - name: openutm_sim_air_traffic_data basic_conformance: scenarios: - name: F1_flow_no_telemetry_with_user_input diff --git a/config/pull_request.yaml b/config/pull_request.yaml new file mode 100644 index 00000000..d6a9b457 --- /dev/null +++ b/config/pull_request.yaml @@ -0,0 +1,55 @@ +# config/default.yaml +version: "1.0" # Configuration schema version + +run_id: "daily-conformance-check" # An optional identifier for the run + +# Details of the Flight Blender deployment under test +flight_blender: + url: "http://localhost:8000" + auth: + type: "none" # For using the dummy-oauth provider + audience: "testflight.flightblender.com" # Audience for OAuth tokens, default for local testing + scopes: ["flightblender.write", "flightblender.read"] # Scopes for write and read access + +# Details for connecting to the OpenSky Network API +opensky: + auth: + type: "none" # 'none' for no auth, 'oauth2' for OAuth2 client credentials + client_id: "your-client-id" + client_secret: "your-client-secret" + +# Air traffic data configuration +air_traffic_simulator_settings: + number_of_aircraft: 3 + simulation_duration_seconds: 10 + single_or_multiple_sensors: "multiple" # this setting specifiies if the traffic data is submitted from a single sensor or multiple sensors + sensor_ids: ["a0b7d47e5eac45dc8cbaf47e6fe0e558"] # List of sensor IDs to use when 'multiple' is selected + +data_files: + trajectory: "config/bern/trajectory_f1.json" # Path to flight declarations JSON file + flight_declaration: "config/bern/flight_declaration.json" # Path to flight declarations JSON file + +# List of test scenario IDs to execute +suites: + pull_requests: + scenarios: + - name: F1_happy_path + trajectory: "config/bern/trajectory_f1.json" + - name: F2_contingent_path + trajectory: "config/bern/trajectory_f2.json" + - name: F3_non_conforming_path + trajectory: "config/bern/trajectory_f3.json" + - name: opensky_live_data + - name: add_flight_declaration + - name: geo_fence_upload + - name: openutm_sim_air_traffic_data + +# Reporting configuration +reporting: + output_dir: "reports" + formats: ["json", "html", "log"] # 'json' is raw, 'html' is summarized + # A place to add metadata about the system under test + deployment_details: + name: "Local Flight Blender Dev Instance" + version: "v0.12.0" + notes: "Running against local Docker Compose setup."