NRL-2100 Attempting to get 1DSync tests more realistic and working in public mode pls part 2

Author: anjalitrace2-nhs

tests/smoke/conftest.py

@@ -68,7 +68,6 @@ def consumer_client_v1(
     environment_config: EnvironmentConfig, smoke_test_parameters: SmokeTestParameters
 ) -> 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"] = (

tests/smoke/scenarios/1dsync_upsert_delete.py

@@ -1,9 +1,11 @@
 import pytest
 
-from nrlf.core.constants import PERMISSION_ALLOW_ALL_POINTER_TYPES
-from tests.smoke.environment import ConnectMode, EnvironmentConfig, SmokeTestParameters
+from nrlf.core.constants import PERMISSION_ALLOW_ALL_POINTER_TYPES, V2Headers
+from tests.smoke.environment import EnvironmentConfig, SmokeTestParameters
 from tests.smoke.setup import build_document_reference
-from tests.utilities.api_clients import ProducerTestClient
+from tests.utilities.api_clients import ConnectionMetadata, ProducerTestClient
+
+v2_1dsync_app_id = "SMOKETEST_1DSYNC_V1"
 
 
 @pytest.fixture
@@ -12,12 +14,24 @@ def producer_client_1dsync(
 ) -> ProducerTestClient:
     client_config = environment_config.to_client_config(smoke_test_parameters)
 
-    if environment_config.connect_mode == ConnectMode.INTERNAL:
-        client_config.connection_metadata["nrl.permissions"] = [
-            PERMISSION_ALLOW_ALL_POINTER_TYPES
-        ]
-        client_config.connection_metadata["nrl.app-id"] = "SMOKETEST1DSYNC"
+    if environment_config.connect_mode == "internal":
+        connection_metadata = ConnectionMetadata.model_validate(
+            {
+                "nrl.permissions": [PERMISSION_ALLOW_ALL_POINTER_TYPES],
+                "nrl.app-id": v2_1dsync_app_id,
+                "nrl.ods-code": smoke_test_parameters.ods_code,
+                "client_rp_details": {
+                    "developer.app.name": smoke_test_parameters.apigee_app_name,
+                    "developer.app.id": smoke_test_parameters.apigee_app_id,
+                },
+            }
+        )
+        client_config.connection_metadata = connection_metadata
+        client_config.custom_headers[V2Headers.X_PROXYGEN_APP_NRL_APP_ID] = (
+            v2_1dsync_app_id
+        )
     else:
+        # can't use app-level perms here without setting up another apigee app, use ODS instead
         client_config.custom_headers["NHSD-End-User-Organisation-ODS"] = (
             "SMOKETEST1DSYNC"
         )
@@ -33,7 +47,9 @@ def test_smoke_1dsync_upsert_delete(
     """
     Smoke test scenario for 1dsync upsert and delete behaviour
     """
-    test_ods_code = smoke_test_parameters.ods_code
+    test_ods_code = producer_client_1dsync.config.custom_headers.get(
+        "NHSD-End-User-Organisation-ODS"
+    )
     test_docref = build_document_reference(
         nhs_number=test_nhs_numbers[0], custodian=test_ods_code
     )

tests/smoke/scenarios/1dsync_upsert_delete_v1.py

@@ -1,9 +1,9 @@
 import pytest
 
 from nrlf.core.constants import PERMISSION_ALLOW_ALL_POINTER_TYPES, V2Headers
-from tests.smoke.environment import ConnectMode, EnvironmentConfig, SmokeTestParameters
+from tests.smoke.environment import EnvironmentConfig, SmokeTestParameters
 from tests.smoke.setup import build_document_reference
-from tests.utilities.api_clients import ProducerTestClient
+from tests.utilities.api_clients import ConnectionMetadata, ProducerTestClient
 
 v1_1dsync_app_id = "SMOKETEST_1DSYNC_V1"
 
@@ -14,11 +14,19 @@ def producer_client_1dsync_v1(
 ) -> ProducerTestClient:
     client_config = environment_config.to_client_config(smoke_test_parameters)
 
-    if environment_config.connect_mode == ConnectMode.INTERNAL:
-        client_config.connection_metadata["nrl.permissions"] = [
-            PERMISSION_ALLOW_ALL_POINTER_TYPES
-        ]
-        client_config.connection_metadata["nrl.app-id"] = v1_1dsync_app_id
+    if environment_config.connect_mode == "internal":
+        connection_metadata = ConnectionMetadata.model_validate(
+            {
+                "nrl.permissions": [PERMISSION_ALLOW_ALL_POINTER_TYPES],
+                "nrl.app-id": v1_1dsync_app_id,
+                "nrl.ods-code": smoke_test_parameters.ods_code,
+                "client_rp_details": {
+                    "developer.app.name": smoke_test_parameters.apigee_app_name,
+                    "developer.app.id": smoke_test_parameters.apigee_app_id,
+                },
+            }
+        )
+        client_config.connection_metadata = connection_metadata
         client_config.custom_headers[V2Headers.X_PROXYGEN_APP_NRL_APP_ID] = (
             v1_1dsync_app_id
         )