[uss_qualifier] Wire back in DSS interoperability v19 test (#118)

* [uss_qualifier] Add back DSS interoperability v19 test * move back diagram in common * [monitorlib] Refactor fetch+mutate functions * revert network_id stuff * revert empty line
interuss · Jul 12, 2023 · 39534e9 · 39534e9
1 parent e4828d6
commit 39534e9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.py
@@ -25,7 +25,7 @@
 from monitoring.uss_qualifier.resources.astm.f3411.dss import (
     DSSInstancesResource,
 )
-from monitoring.uss_qualifier.scenarios.scenario import TestScenario
+from monitoring.uss_qualifier.scenarios.scenario import GenericTestScenario
 from uas_standards.astm.f3411.v19.constants import Scope
 
 VERTICES = [
@@ -103,7 +103,7 @@ def _extract_sub_ids_from_isa_put_response(response: dict) -> Set[str]:
     return returned_subs
 
 
-class DSSInteroperability(TestScenario):
+class DSSInteroperability(GenericTestScenario):
     _primary_dss_instance: ParticipantID
     _other_dss_instances: List[ParticipantID]
     _dss_map: Dict[ParticipantID, UTMClientSession]

diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/__init__.py b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/__init__.py
@@ -1,2 +1,2 @@
-from ..common.dss_interoperability import DSSInteroperability
+from .dss_interoperability import DSSInteroperability
 from .nominal_behavior import NominalBehavior
diff --git a/...stm/netrid/common/dss_interoperability.md → ...s/astm/netrid/v19/dss_interoperability.md b/...stm/netrid/common/dss_interoperability.md → ...s/astm/netrid/v19/dss_interoperability.md
@@ -34,7 +34,7 @@ A resources.astm.f3411.DSSInstancesResource containing at least two DSS instance
 
 ## Sequence diagram
 
-![Sequence diagram for interoperability test](dss_interoperability_test.png)
+![Sequence diagram for interoperability test](../common/dss_interoperability_test.png)
 
 ## Interoperability sequence test case
 

diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss_interoperability.py b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss_interoperability.py
@@ -0,0 +1,8 @@
+from monitoring.uss_qualifier.scenarios.scenario import TestScenario
+from monitoring.uss_qualifier.scenarios.astm.netrid.common.dss_interoperability import (
+    DSSInteroperability as CommonDSSInteroperability,
+)
+
+
+class DSSInteroperability(TestScenario, CommonDSSInteroperability):
+    pass