NRL-2100 Attempting to get public smoke tests working

Author: anjalitrace2-nhs

tests/smoke/conftest.py

@@ -4,7 +4,7 @@
 import pytest
 
 from scripts.aws_session_assume import get_boto_session
-from tests.smoke.environment import EnvironmentConfig, SmokeTestParameters
+from tests.smoke.environment import ConnectMode, EnvironmentConfig, SmokeTestParameters
 from tests.utilities.api_clients import ConsumerTestClient, ProducerTestClient
 
 
@@ -55,7 +55,11 @@ def producer_client_v1(
     environment_config: EnvironmentConfig, smoke_test_parameters: SmokeTestParameters
 ) -> ProducerTestClient:
     config = environment_config.to_client_config(smoke_test_parameters)
-    config.connection_metadata.ods_code = "SMOKETESTV1"
+    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
+    )
     return ProducerTestClient(config=config)
 
 
@@ -65,6 +69,11 @@ def consumer_client_v1(
 ) -> ConsumerTestClient:
     config = environment_config.to_client_config(smoke_test_parameters)
     config.connection_metadata.ods_code = "SMOKETESTV1"
+    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
+    )
     return ConsumerTestClient(config=config)
 
 

tests/smoke/environment.py

@@ -15,6 +15,7 @@ def __init__(self, parameters: dict[str, str]):
         self.nrlf_app_id = parameters.get("nrlf_app_id")
         self.ods_code = parameters.get("ods_code")
         self.test_nhs_numbers = parameters.get("test_nhs_numbers").split(",")
+        self.v1_ods_code = "SMOKETESTV1"
 
 
 class ConnectMode(Enum):
@@ -59,6 +60,8 @@ def to_client_config(self, parameters: SmokeTestParameters):
                 custom_headers={
                     "X-Request-Id": smoketest_id,
                     "NHSD-Correlation-Id": f"{smoketest_id}.smoketest.{self.stack_name}.{self.env_name}",
+                    "X-Proxygen-App-NRL-App-ID": parameters.nrlf_app_id,
+                    "NHSD-End-User-Organisation-ODS": parameters.ods_code,
                 },
                 connection_metadata=connection_metadata,
                 client_cert=(

tests/smoke/scenarios/consumer_search_read_v1.py

@@ -2,6 +2,7 @@
 
 import pytest
 
+from tests.smoke.environment import SmokeTestParameters
 from tests.smoke.setup import build_document_reference, upsert_test_pointer
 from tests.utilities.api_clients import ConsumerTestClient, ProducerTestClient
 
@@ -10,8 +11,9 @@
 def test_data_v1(
     test_nhs_numbers: list[str],
     producer_client_v1: ProducerTestClient,
+    smoke_test_parameters: SmokeTestParameters,
 ) -> Generator[str, Any, None]:
-    test_ods_code = producer_client_v1.config.connection_metadata.ods_code
+    test_ods_code = smoke_test_parameters.v1_ods_code
     test_pointers = [
         upsert_test_pointer(
             f"{test_ods_code}-smoketest_consumer_search_read_pointer_{n}",

tests/smoke/scenarios/producer_crud_v1.py

@@ -1,15 +1,17 @@
+from tests.smoke.environment import SmokeTestParameters
 from tests.smoke.setup import build_document_reference
 from tests.utilities.api_clients import ProducerTestClient
 
 
 def test_smoke_producer_crud_v1(
     producer_client_v1: ProducerTestClient,
     test_nhs_numbers: list[str],
+    smoke_test_parameters: SmokeTestParameters,
 ):
     """
     Smoke test scenario for producer CRUD behavior
     """
-    test_ods_code = producer_client_v1.config.connection_metadata.ods_code
+    test_ods_code = smoke_test_parameters.v1_ods_code
     test_docref = build_document_reference(
         nhs_number=test_nhs_numbers[0], custodian=test_ods_code
     )

tests/smoke/scenarios/producer_search_read_v1.py

@@ -2,6 +2,7 @@
 
 import pytest
 
+from tests.smoke.environment import SmokeTestParameters
 from tests.smoke.setup import build_document_reference, upsert_test_pointer
 from tests.utilities.api_clients import ProducerTestClient
 
@@ -10,8 +11,9 @@
 def test_data(
     test_nhs_numbers: list[str],
     producer_client_v1: ProducerTestClient,
+    smoke_test_parameters: SmokeTestParameters,
 ) -> Generator[str, Any, None]:
-    test_ods_code = producer_client_v1.config.connection_metadata.ods_code
+    test_ods_code = smoke_test_parameters.v1_ods_code
     test_pointers = [
         upsert_test_pointer(
             f"{test_ods_code}-smoketest_producer_count_search_read_pointer_{n}",