Skip to content

Commit

Permalink
[uss_qualifier] Track external file contents (interuss#260)
Browse files Browse the repository at this point in the history
* Track external file contents

* Fix f3548_self_contained

* Convert function to method per comments

* Clean up non-CI configurations

* Update hash for changed file
  • Loading branch information
BenjaminPelletier authored Oct 18, 2023
1 parent bcc4e6c commit 2110d53
Show file tree
Hide file tree
Showing 18 changed files with 329 additions and 411 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,24 @@ v1:
resource_type: resources.flight_planning.FlightIntentsResource
specification:
planning_time: '0:05:00'
file_source: file://./test_data/che/flight_intents/conflicting_flights.json
file:
path: file://./test_data/che/flight_intents/conflicting_flights.json

# Details of priority-preemption flights (used in nominal planning priority scenario)
priority_preemption_flights:
resource_type: resources.flight_planning.FlightIntentsResource
specification:
planning_time: '0:05:00'
file_source: test_data.che.flight_intents.priority_preemption
file:
path: test_data.che.flight_intents.priority_preemption

# Details of flights with invalid operational intents (used in flight intent validation scenario)
invalid_flight_intents:
resource_type: resources.flight_planning.FlightIntentsResource
specification:
planning_time: '0:05:00'
file_source: test_data.che.flight_intents.invalid_flight_intents
file:
path: test_data.che.flight_intents.invalid_flight_intents

# Location of DSS instance that can be used to verify flight planning outcomes
dss:
Expand Down
17 changes: 0 additions & 17 deletions monitoring/uss_qualifier/configurations/dev/faa/uft/f3548.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ v1:
test_run:
resources:
resource_declarations:
"$ref": ../../resources.yaml#/common
"$ref": ../../library/resources.yaml#/common
flight_planners:
resource_type: resources.flight_planning.FlightPlannersResource
dependencies:
Expand All @@ -26,12 +26,14 @@ v1:
resource_type: resources.flight_planning.FlightIntentsResource
specification:
planning_time: '0:05:00'
file_source: file://./test_data/che/flight_intents/conflicting_flights.json
file:
path: file://./test_data/che/flight_intents/conflicting_flights.json
priority_preemption_flights:
resource_type: resources.flight_planning.FlightIntentsResource
specification:
planning_time: '0:05:00'
file_source: test_data.che.flight_intents.priority_preemption
file:
path: test_data.che.flight_intents.priority_preemption
dss:
resource_type: resources.astm.f3548.v21.DSSInstanceResource
dependencies:
Expand Down Expand Up @@ -61,5 +63,3 @@ v1:
artifacts:
report:
report_path: output/report.json
graph:
gv_path: output/report.gv
133 changes: 0 additions & 133 deletions monitoring/uss_qualifier/configurations/dev/faa/uft/uft.yaml

This file was deleted.

39 changes: 24 additions & 15 deletions monitoring/uss_qualifier/configurations/dev/library/resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ net_rid:
- lat: -23
lng: 132



net_rid_sims:
adjacent_circular_flights_data:
$content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
Expand All @@ -80,7 +78,8 @@ net_rid_sims:
resource_type: resources.netrid.FlightDataResource
specification:
kml_source:
kml_location: file://./test_data/usa/netrid/dcdemo.kml
kml_file:
path: file://./test_data/usa/netrid/dcdemo.kml
kml_storage_config:
$content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
resource_type: resources.netrid.FlightDataStorageResource
Expand All @@ -91,7 +90,8 @@ net_rid_sims:
resource_type: resources.netrid.FlightDataResource
specification:
kml_source:
kml_location: file://./test_data/usa/kentland/rid.kml
kml_file:
path: file://./test_data/usa/kentland/rid.kml

flight_auth:
$ref: '#/f3548_che'
Expand All @@ -100,47 +100,56 @@ flight_auth:
resource_type: resources.flight_planning.FlightIntentsResource
specification:
planning_time: '0:05:00'
file_source: file://./test_data/che/flight_intents/invalid_flight_auths.json
file:
path: file://./test_data/che/flight_intents/invalid_flight_auths.json

che_flight_intents:
conflicting_flights:
$content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
resource_type: resources.flight_planning.FlightIntentsResource
specification:
planning_time: '0:05:00'
file_source: file://./test_data/che/flight_intents/conflicting_flights.json
file:
path: file://./test_data/che/flight_intents/conflicting_flights.json
priority_preemption_flights:
$content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
resource_type: resources.flight_planning.FlightIntentsResource
specification:
planning_time: '0:05:00'
file_source: test_data.che.flight_intents.priority_preemption
file:
path: test_data.che.flight_intents.priority_preemption
# Note that this hash_sha512 field can be safely deleted if the content changes
hash_sha512: 432ea57009b6a41b3af43cb9431a0627a487eac0a04511fbccd85d9fcac193b11976ad2dbc07d9efa41ceaf7a9338b39064ede6eeb5755be3966d2e17e7d555a
invalid_flight_intents:
$content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
resource_type: resources.flight_planning.FlightIntentsResource
specification:
planning_time: '0:05:00'
file_source: test_data.che.flight_intents.invalid_flight_intents
$content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
resource_type: resources.flight_planning.FlightIntentsResource
specification:
planning_time: '0:05:00'
file:
path: test_data.che.flight_intents.invalid_flight_intents

kentland_flight_intents:
conflicting_flights:
$content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
resource_type: resources.flight_planning.FlightIntentsResource
specification:
planning_time: '0:05:00'
file_source: file://./test_data/usa/kentland/flight_intents/conflicting_flights.yaml
file:
path: file://./test_data/usa/kentland/flight_intents/conflicting_flights.yaml
priority_preemption_flights:
$content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
resource_type: resources.flight_planning.FlightIntentsResource
specification:
planning_time: '0:05:00'
file_source: test_data.usa.kentland.flight_intents.priority_preemption
file:
path: test_data.usa.kentland.flight_intents.priority_preemption
invalid_flight_intents:
$content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
resource_type: resources.flight_planning.FlightIntentsResource
specification:
planning_time: '0:05:00'
file_source: test_data.usa.kentland.flight_intents.invalid_flight_intents
file:
path: test_data.usa.kentland.flight_intents.invalid_flight_intents

f3548_che:
allOf:
Expand Down
Loading

0 comments on commit 2110d53

Please sign in to comment.