[RAA-7705]-[]-[api service pipeline test fix]-[DW]

Author: dbgwilliamsnhs

tests/conftest.py

@@ -147,6 +147,26 @@ async def user_restricted_product(client, make_product):
     product.delete_product_by_name(product_name=productName)
 
 
+@pytest_asyncio.fixture
+async def user_restricted_product_ods_validation(client, make_product):
+    # Setup
+    productName = await make_product(
+        [
+            "urn:nhsd:apim:user-nhs-id:aal3:e-referrals-service-api",
+            "urn:nhsd:apim:user-nhs-id:aal2:e-referrals-service-api",
+        ],
+        additional_attributes=[{"name": "EUOAllowlistRequired", "value": "true"}],
+    )
+
+    print(f"product created: {productName}")
+    yield productName
+
+    # Teardown
+    print(f"Cleanup product: {productName}")
+    product = ApiProductsAPI(client=client)
+    product.delete_product_by_name(product_name=productName)
+
+
 @pytest.fixture
 def update_user_restricted_product(
     user_restricted_product, client: ApigeeClient
@@ -307,6 +327,27 @@ async def user_restricted_app(
     app.delete_app_by_name(email="apm-testing-internal-dev@nhs.net", app_name=appName)
 
 
+@pytest_asyncio.fixture
+async def user_restricted_app_ods_validation(
+    client, make_app, user_restricted_product_ods_validation, asid, apim_app_flow_vars
+):
+    # Setup
+    odslist = json.dumps({"ers": {"allowListodsCode": apim_app_flow_vars}})
+    app = await make_app(
+        user_restricted_product_ods_validation,
+        {"asid": asid, "apim-app-flow-vars": odslist},
+    )
+
+    appName = app["name"]
+    print(f"App created: {appName}")
+    yield app
+
+    # Teardown
+    print(f"Cleanup app: {appName}")
+    app = DeveloperAppsAPI(client=client)
+    app.delete_app_by_name(email="apm-testing-internal-dev@nhs.net", app_name=appName)
+
+
 @pytest.fixture
 def make_app(client):
     async def _make_app(product, custom_attributes={}):

tests/integration/test_user_restricted.py

@@ -86,6 +86,7 @@ async def test_user_restricted_valid_ods_code(
     async def test_user_restricted_invalid_ods_code(
         self,
         authenticate_user,
+        user_restricted_app_ods_validation,
         service_url,
         user: Actor,
         asid,
@@ -155,6 +156,7 @@ async def test_user_restricted_invalid_ods_code(
     async def test_user_restricted_missing_ods_header(
         self,
         authenticate_user,
+        user_restricted_app_ods_validation,
         service_url,
         user: Actor,
         asid,
@@ -225,6 +227,7 @@ async def test_user_restricted_missing_ods_header(
     async def test_user_restricted_missing_ods_code(
         self,
         authenticate_user,
+        user_restricted_app_ods_validation,
         service_url,
         user: Actor,
         asid,