From 39534e967e0dc63ae9052b9168d4c718b5f1ef52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Misbach?= <mickael@misba.ch>
Date: Wed, 12 Jul 2023 14:57:32 +0200
Subject: [PATCH] [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
---
 .../scenarios/astm/netrid/common/dss_interoperability.py  | 4 ++--
 .../uss_qualifier/scenarios/astm/netrid/v19/__init__.py   | 2 +-
 .../astm/netrid/{common => v19}/dss_interoperability.md   | 2 +-
 .../scenarios/astm/netrid/v19/dss_interoperability.py     | 8 ++++++++
 4 files changed, 12 insertions(+), 4 deletions(-)
 rename monitoring/uss_qualifier/scenarios/astm/netrid/{common => v19}/dss_interoperability.md (98%)
 create mode 100644 monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss_interoperability.py

diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.py
index 37a9beb6f7..acc518ee79 100644
--- 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
index 4aba4de802..6bdf30773f 100644
--- 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/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss_interoperability.md
similarity index 98%
rename from monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.md
rename to monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss_interoperability.md
index 34d64f8b54..15f5beabf4 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.md
+++ b/monitoring/uss_qualifier/scenarios/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
new file mode 100644
index 0000000000..33b138e921
--- /dev/null
+++ 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