NRL-2140 Fixup smoketest v1 clients to support sandbox smoketests

mattdean3-nhs · mattdean3-nhs · commit 4b9772daf56a · 2026-04-14T19:22:21.000+01:00
diff --git a/tests/smoke/conftest.py b/tests/smoke/conftest.py
@@ -55,11 +55,18 @@ def producer_client_v1(
     environment_config: EnvironmentConfig, smoke_test_parameters: SmokeTestParameters
 ) -> ProducerTestClient:
     config = environment_config.to_client_config(smoke_test_parameters)
+
+    if (
+        environment_config.env_name in ["dev-sandbox", "qa-sandbox", "int-sandbox"]
+        and smoke_test_parameters.ods_code
+    ):
+        client_ods_code = smoke_test_parameters.ods_code
+    else:
+        client_ods_code = smoke_test_parameters.v1_ods_code
+
     if environment_config.connect_mode == ConnectMode.INTERNAL:
-        config.connection_metadata.ods_code = smoke_test_parameters.v1_ods_code
-    config.custom_headers["NHSD-End-User-Organisation-ODS"] = (
-        smoke_test_parameters.v1_ods_code
-    )
+        config.connection_metadata.ods_code = client_ods_code
+    config.custom_headers["NHSD-End-User-Organisation-ODS"] = client_ods_code
     return ProducerTestClient(config=config)
 
 
@@ -68,11 +75,18 @@ def consumer_client_v1(
     environment_config: EnvironmentConfig, smoke_test_parameters: SmokeTestParameters
 ) -> ConsumerTestClient:
     config = environment_config.to_client_config(smoke_test_parameters)
+
+    if (
+        environment_config.env_name in ["dev-sandbox", "qa-sandbox", "int-sandbox"]
+        and smoke_test_parameters.ods_code
+    ):
+        client_ods_code = smoke_test_parameters.ods_code
+    else:
+        client_ods_code = smoke_test_parameters.v1_ods_code
+
     if environment_config.connect_mode == ConnectMode.INTERNAL:
-        config.connection_metadata.ods_code = smoke_test_parameters.v1_ods_code
-    config.custom_headers["NHSD-End-User-Organisation-ODS"] = (
-        smoke_test_parameters.v1_ods_code
-    )
+        config.connection_metadata.ods_code = client_ods_code
+    config.custom_headers["NHSD-End-User-Organisation-ODS"] = client_ods_code
     return ConsumerTestClient(config=config)
 
 
diff --git a/tests/smoke/scenarios/1dsync_upsert_delete.py b/tests/smoke/scenarios/1dsync_upsert_delete.py
@@ -26,12 +26,17 @@ def producer_client_1dsync(
 def test_smoke_1dsync_upsert_delete(
     producer_client_1dsync: ProducerTestClient,
     smoke_test_parameters: SmokeTestParameters,
+    environment_config: EnvironmentConfig,
     test_nhs_numbers: list[str],
 ):
     """
     Smoke test scenario for 1dsync upsert and delete behaviour
     """
-    test_ods_code = "SMOKETEST1DSYNC"
+    if environment_config.env_name in ["dev-sandbox", "qa-sandbox", "int-sandbox"]:
+        test_ods_code = smoke_test_parameters.ods_code
+    else:
+        test_ods_code = "SMOKETEST1DSYNC"
+
     test_docref = build_document_reference(
         nhs_number=test_nhs_numbers[0], custodian=test_ods_code
     )
