fix tls config

Author: jrobertboos

tests/e2e/features/steps/tls.py

@@ -8,6 +8,7 @@
 by a Background step that restores the backup before each scenario.
 """
 
+import copy
 import os
 import shutil
 
@@ -45,23 +46,53 @@ def _write_config(config: dict, path: str) -> None:
         yaml.dump(config, f, default_flow_style=False)
 
 
-def _find_tls_openai_provider(config: dict) -> dict:
-    """Find the tls-openai inference provider in the config.
+_TLS_PROVIDER_BASE: dict = {
+    "provider_id": "tls-openai",
+    "provider_type": "remote::openai",
+    "config": {
+        "api_key": "test-key",
+        "base_url": "https://mock-tls-inference:8443/v1",
+        "allowed_models": ["mock-tls-model"],
+    },
+}
+
+_TLS_MODEL_RESOURCE: dict = {
+    "model_id": "mock-tls-model",
+    "provider_id": "tls-openai",
+    "provider_model_id": "mock-tls-model",
+}
+
+
+def _ensure_tls_provider(config: dict) -> dict:
+    """Find or create the tls-openai inference provider in the config.
+
+    If the provider does not exist, it is added along with the
+    mock-tls-model registered resource.
 
     Parameters:
         config: The Llama Stack configuration dictionary.
 
     Returns:
-        The tls-openai provider configuration.
-
-    Raises:
-        AssertionError: If no tls-openai provider is found.
+        The tls-openai provider configuration dictionary.
     """
-    providers = config.get("providers", {})
-    for provider in providers.get("inference", []):
+    providers = config.setdefault("providers", {})
+    inference = providers.setdefault("inference", [])
+
+    for provider in inference:
         if provider.get("provider_id") == "tls-openai":
             return provider
-    raise AssertionError("No tls-openai provider found in run.yaml")
+
+    # Provider not found — add it
+    provider = copy.deepcopy(_TLS_PROVIDER_BASE)
+    inference.append(provider)
+
+    # Also register the model resource
+    resources = config.setdefault("registered_resources", {})
+    models = resources.setdefault("models", [])
+    if not any(m.get("model_id") == "mock-tls-model" for m in models):
+        models.append(copy.deepcopy(_TLS_MODEL_RESOURCE))
+
+    return provider
 
 
 def _backup_llama_config() -> None:
@@ -128,7 +159,7 @@ def configure_tls_verify_false(context: Context) -> None:
     """
     _backup_llama_config()
     config = _load_llama_config()
-    provider = _find_tls_openai_provider(config)
+    provider = _ensure_tls_provider(config)
 
     if "config" not in provider:
         provider["config"] = {}
@@ -148,7 +179,7 @@ def configure_tls_verify_ca(context: Context) -> None:
     """
     _backup_llama_config()
     config = _load_llama_config()
-    provider = _find_tls_openai_provider(config)
+    provider = _ensure_tls_provider(config)
 
     if "config" not in provider:
         provider["config"] = {}
@@ -173,7 +204,7 @@ def configure_tls_verify_true(context: Context) -> None:
     """
     _backup_llama_config()
     config = _load_llama_config()
-    provider = _find_tls_openai_provider(config)
+    provider = _ensure_tls_provider(config)
 
     if "config" not in provider:
         provider["config"] = {}
@@ -193,7 +224,7 @@ def configure_tls_mtls(context: Context) -> None:
     """
     _backup_llama_config()
     config = _load_llama_config()
-    provider = _find_tls_openai_provider(config)
+    provider = _ensure_tls_provider(config)
 
     if "config" not in provider:
         provider["config"] = {}
@@ -221,7 +252,7 @@ def configure_tls_min_version(context: Context, version: str) -> None:
     """
     _backup_llama_config()
     config = _load_llama_config()
-    provider = _find_tls_openai_provider(config)
+    provider = _ensure_tls_provider(config)
 
     if "config" not in provider:
         provider["config"] = {}