[uss_qualifer] Add data validation scenario to ASTM F3548-21 suite (#324

)

* Added data validation scenario to suite

* Fixing format

* Adding missing comments

monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml

@@ -17,7 +17,9 @@ v1:
           conflicting_flights: conflicting_flights
           priority_preemption_flights: priority_preemption_flights
           invalid_flight_intents: invalid_flight_intents
+          non_conflicting_flights: non_conflicting_flights
           dss: dss
+          mock_uss: mock_uss
 
     # This block defines all the resources available in the resource pool.
     # Presumably all resources defined below would be used either
@@ -71,6 +73,14 @@ v1:
             file:
               path: test_data.che.flight_intents.invalid_flight_intents
 
+        # Details of non-conflicting flights (used in data validation scenario)
+        non_conflicting_flights:
+          resource_type: resources.flight_planning.FlightIntentsResource
+          specification:
+            planning_time: '0:05:00'
+            file:
+              path: file://./test_data/usa/kentland/flight_intents/non_conflicting.yaml
+
         # Location of DSS instance that can be used to verify flight planning outcomes
         dss:
           resource_type: resources.astm.f3548.v21.DSSInstanceResource
@@ -81,6 +91,16 @@ v1:
             participant_id: uss1
             base_url: http://dss.uss1.localutm
 
+        # Mock USS that can be used in tests for flight planning, modifying data sharing behavior and recording interuss interactions
+        mock_uss:
+          resource_type: resources.interuss.mock_uss.client.MockUSSResource
+          dependencies:
+            auth_adapter: utm_auth
+          specification:
+            participant_id: mock_uss
+            mock_uss_base_url: http://scdsc.log.uss6.localutm
+
+
     # When a test run is executed, a "baseline signature" is computed uniquely identifying the "baseline" of the test,
     # usually excluding exactly what systems are participating in the test (the "environment").  This is a list of
     # elements within this configuration to exclude from the configuration when computing the baseline signature.

monitoring/uss_qualifier/scenarios/astm/utm/data_exchange_validation/__init__.py

@@ -0,0 +1 @@
+from .get_op_data_validation import GetOpResponseDataValidationByUSS

monitoring/uss_qualifier/scenarios/astm/utm/data_exchange_validation/get_op_data_validation.py

@@ -1,4 +1,5 @@
 from typing import Optional
+from loguru import logger
 
 from monitoring.uss_qualifier.resources.astm.f3548.v21 import DSSInstanceResource
 from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import DSSInstance
@@ -46,7 +47,12 @@ def __init__(
         self.control_uss = control_uss.mock_uss
         self.dss = dss.dss
 
-    def run(self):
+    def run(self, context):
         self.begin_test_scenario(context)
         pass
         self.end_test_scenario()
+
+    def cleanup(self):
+        self.begin_cleanup()
+        pass
+        self.end_cleanup()

monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml

@@ -6,8 +6,10 @@ resources:
   conflicting_flights: resources.flight_planning.FlightIntentsResource
   priority_preemption_flights: resources.flight_planning.FlightIntentsResource
   invalid_flight_intents: resources.flight_planning.FlightIntentsResource
+  non_conflicting_flights: resources.flight_planning.FlightIntentsResource
   nominal_planning_selector: resources.flight_planning.FlightPlannerCombinationSelectorResource?
   priority_planning_selector: resources.flight_planning.FlightPlannerCombinationSelectorResource?
+  mock_uss: resources.interuss.mock_uss.client.MockUSSResource
 actions:
 - action_generator:
     generator_type: action_generators.astm.f3548.ForEachDSS
@@ -95,6 +97,29 @@ actions:
     scenario_type: scenarios.astm.utm.AggregateChecks
     resources:
       flight_planners: flight_planners
+
+- action_generator:
+    generator_type: action_generators.flight_planning.FlightPlannerCombinations
+    resources:
+      flight_planners: flight_planners
+      non_conflicting_flights: non_conflicting_flights
+      dss: dss
+      mock_uss: mock_uss
+    specification:
+      action_to_repeat:
+        test_scenario:
+          scenario_type: scenarios.astm.utm.data_exchange_validation.GetOpResponseDataValidationByUSS
+          resources:
+            tested_uss: uss1
+            control_uss: mock_uss
+            dss: dss
+            flight_intents: non_conflicting_flights
+        on_failure: Continue
+      flight_planners_source: flight_planners
+      roles:
+        - uss1
+  on_failure: Continue
+
 participant_verifiable_capabilities:
   - id: scd
     name: Strategic Conflict Detection