From 10c4362abd53a9cebbfa5d9578225fdbd6af5f51 Mon Sep 17 00:00:00 2001
From: Benjamin Pelletier <pelletierb@wing.com>
Date: Thu, 2 Nov 2023 15:43:16 +0000
Subject: [PATCH] Fix previously-hidden bugs

---
 monitoring/monitorlib/rid_v2.py                      | 12 ++----------
 .../common/dss/isa_subscription_interactions.py      |  3 ++-
 .../astm/netrid/common/dss/subscription_simple.py    |  3 ++-
 .../scenarios/astm/netrid/store_flight_data.py       |  7 ++++++-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/monitoring/monitorlib/rid_v2.py b/monitoring/monitorlib/rid_v2.py
index 0183f03755..3ead0866da 100644
--- a/monitoring/monitorlib/rid_v2.py
+++ b/monitoring/monitorlib/rid_v2.py
@@ -48,16 +48,8 @@ def make_volume_4d(
                 "altitude_lower": make_altitude(alt_lo),
                 "altitude_upper": make_altitude(alt_hi),
             },
-            **(
-                {"time_start": StringBasedDateTime(start_time)}
-                if start_time is not None
-                else {}
-            ),
-            **(
-                {"time_end": StringBasedDateTime(end_time)}
-                if end_time is not None
-                else {}
-            ),
+            **({"time_start": make_time(start_time)} if start_time is not None else {}),
+            **({"time_end": make_time(end_time)} if end_time is not None else {}),
         },
         Volume4D,
     )
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_subscription_interactions.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_subscription_interactions.py
index 22ab4cf477..6cf1064cb7 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_subscription_interactions.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_subscription_interactions.py
@@ -10,6 +10,7 @@
 from monitoring.uss_qualifier.scenarios.astm.netrid.common.dss import utils
 from monitoring.uss_qualifier.scenarios.astm.netrid.dss_wrapper import DSSWrapper
 from monitoring.uss_qualifier.scenarios.scenario import GenericTestScenario
+from monitoring.uss_qualifier.suites.suite import ExecutionContext
 
 
 class ISASubscriptionInteractions(GenericTestScenario):
@@ -42,7 +43,7 @@ def __init__(
         self._isa_end_time = self._isa.shifted_time_end(now)
         self._isa_area = [vertex.as_s2sphere() for vertex in self._isa.footprint]
 
-    def run(self):
+    def run(self, context: ExecutionContext):
         self.begin_test_scenario()
 
         self._setup_case()
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/subscription_simple.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/subscription_simple.py
index 2025227093..d728d312ad 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/subscription_simple.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/subscription_simple.py
@@ -17,6 +17,7 @@
 from monitoring.uss_qualifier.scenarios.scenario import (
     GenericTestScenario,
 )
+from monitoring.uss_qualifier.suites.suite import ExecutionContext
 
 TIME_TOLERANCE_SEC = 1
 
@@ -91,7 +92,7 @@ def __init__(
             for vertex in problematically_big_area.specification.vertices
         ]
 
-    def run(self):
+    def run(self, context: ExecutionContext):
         self.begin_test_scenario()
 
         loguru.logger.info("setup")
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/store_flight_data.py b/monitoring/uss_qualifier/scenarios/astm/netrid/store_flight_data.py
index 9b867f0170..9a6fc6e5d5 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/store_flight_data.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/store_flight_data.py
@@ -9,6 +9,7 @@
     FlightDataStorageResource,
 )
 from monitoring.uss_qualifier.scenarios.scenario import TestScenario
+from monitoring.uss_qualifier.suites.suite import ExecutionContext
 
 
 class StoreFlightData(TestScenario):
@@ -24,7 +25,7 @@ def __init__(
         self._flights_data = flights_data
         self._storage_config = storage_configuration
 
-    def run(self):
+    def run(self, context: ExecutionContext):
         self.begin_test_scenario()
         self.record_note(
             "Flight count",
@@ -49,6 +50,10 @@ def run(self):
             in self._storage_config.storage_configuration
             and self._storage_config.storage_configuration.flight_record_collection_path
         ):
+            dirname = os.path.dirname(
+                self._storage_config.storage_configuration.flight_record_collection_path
+            )
+            os.makedirs(dirname, exist_ok=True)
             with open(
                 self._storage_config.storage_configuration.flight_record_collection_path,
                 "w",