Add new MCP authentication configurations and update tests

- Introduced new YAML configuration files for MCP authentication methods: file, Kubernetes, and OAuth.
- Updated existing MCP configuration to include new authentication methods.
- Enhanced end-to-end tests to cover scenarios for file-based, Kubernetes, and OAuth authentication.
- Added utility functions for unregistering MCP toolgroups in the testing environment.
- Implemented new step definitions for checking response body content in tests.

Author: jrobertboos

tests/e2e/configuration/server-mode/lightspeed-stack-mcp-client-auth.yaml

@@ -0,0 +1,25 @@
+name: Lightspeed Core Service (LCS)
+service:
+  host: 0.0.0.0
+  port: 8080
+  auth_enabled: false
+  workers: 1
+  color_log: true
+  access_log: true
+llama_stack:
+  # Server mode - connects to separate llama-stack service
+  use_as_library_client: false
+  url: http://llama-stack:8321
+  api_key: xyzzy
+user_data_collection:
+  feedback_enabled: true
+  feedback_storage: "/tmp/data/feedback"
+  transcripts_enabled: true
+  transcripts_storage: "/tmp/data/transcripts"
+authentication:
+  module: "noop"
+mcp_servers:
+  - name: "mcp-client"
+    url: "http://mock-mcp:3001"
+    authorization_headers:
+      Authorization: "client"

tests/e2e/configuration/server-mode/lightspeed-stack-mcp-file-auth.yaml

@@ -19,8 +19,7 @@ user_data_collection:
 authentication:
   module: "noop"
 mcp_servers:
-  - name: "mcp-file-auth"
-    provider_id: "model-context-protocol"
+  - name: "mcp-file"
     url: "http://mock-mcp:3001"
     authorization_headers:
       Authorization: "/tmp/mcp-secret-token"

tests/e2e/configuration/server-mode/lightspeed-stack-mcp-kubernetes-auth.yaml

@@ -0,0 +1,25 @@
+name: Lightspeed Core Service (LCS)
+service:
+  host: 0.0.0.0
+  port: 8080
+  auth_enabled: false
+  workers: 1
+  color_log: true
+  access_log: true
+llama_stack:
+  # Server mode - connects to separate llama-stack service
+  use_as_library_client: false
+  url: http://llama-stack:8321
+  api_key: xyzzy
+user_data_collection:
+  feedback_enabled: true
+  feedback_storage: "/tmp/data/feedback"
+  transcripts_enabled: true
+  transcripts_storage: "/tmp/data/transcripts"
+authentication:
+  module: "noop"
+mcp_servers:
+  - name: "mcp-kubernetes"
+    url: "http://mock-mcp:3001"
+    authorization_headers:
+      Authorization: "kubernetes"

tests/e2e/configuration/server-mode/lightspeed-stack-mcp-oauth-auth.yaml

@@ -0,0 +1,25 @@
+name: Lightspeed Core Service (LCS)
+service:
+  host: 0.0.0.0
+  port: 8080
+  auth_enabled: false
+  workers: 1
+  color_log: true
+  access_log: true
+llama_stack:
+  # Server mode - connects to separate llama-stack service
+  use_as_library_client: false
+  url: http://llama-stack:8321
+  api_key: xyzzy
+user_data_collection:
+  feedback_enabled: true
+  feedback_storage: "/tmp/data/feedback"
+  transcripts_enabled: true
+  transcripts_storage: "/tmp/data/transcripts"
+authentication:
+  module: "noop"
+mcp_servers:
+  - name: "mcp-oauth"
+    url: "http://mock-mcp:3001"
+    authorization_headers:
+      Authorization: "oauth"

tests/e2e/configuration/server-mode/lightspeed-stack-mcp.yaml

@@ -20,7 +20,18 @@ authentication:
   module: "noop"
 mcp_servers:
   - name: "mcp-oauth"
-    provider_id: "model-context-protocol"
     url: "http://mock-mcp:3001"
     authorization_headers:
-      Authorization: "oauth"
+      Authorization: "oauth"
+  - name: "mcp-kubernetes"
+    url: "http://mock-mcp:3001"
+    authorization_headers:
+      Authorization: "kubernetes"
+  - name: "mcp-file"
+    url: "http://mock-mcp:3001"
+    authorization_headers:
+      Authorization: "/tmp/mcp-secret-token"
+  - name: "mcp-client"
+    url: "http://mock-mcp:3001"
+    authorization_headers:
+      Authorization: "client"

tests/e2e/features/environment.py

@@ -16,6 +16,7 @@
 from tests.e2e.utils.prow_utils import restore_llama_stack_pod
 from behave.runner import Context
 
+from tests.e2e.utils.llama_stack_tools import unregister_mcp_toolgroups
 from tests.e2e.utils.llama_stack_shields import (
     register_shield,
     unregister_shield,
@@ -207,6 +208,27 @@ def before_scenario(context: Context, scenario: Scenario) -> None:
         switch_config(context.scenario_config)
         restart_container("lightspeed-stack")
 
+    if "MCPFileAuthConfig" in scenario.effective_tags:
+        context.scenario_config = _get_config_path("mcp-file-auth", mode_dir)
+        unregister_mcp_toolgroups()
+        switch_config(context.scenario_config)
+        restart_container("lightspeed-stack")
+    if "MCPKubernetesAuthConfig" in scenario.effective_tags:
+        context.scenario_config = _get_config_path("mcp-kubernetes", mode_dir)
+        unregister_mcp_toolgroups()
+        switch_config(context.scenario_config)
+        restart_container("lightspeed-stack")
+    if "MCPClientAuthConfig" in scenario.effective_tags:
+        context.scenario_config = _get_config_path("mcp-client", mode_dir)
+        unregister_mcp_toolgroups()
+        switch_config(context.scenario_config)
+        restart_container("lightspeed-stack")
+    if "MCPOAuthAuthConfig" in scenario.effective_tags:
+        context.scenario_config = _get_config_path("mcp-oauth", mode_dir)
+        unregister_mcp_toolgroups()
+        switch_config(context.scenario_config)
+        restart_container("lightspeed-stack")
+
 
 def after_scenario(context: Context, scenario: Scenario) -> None:
     """Run after each scenario is run.
@@ -241,7 +263,14 @@ def after_scenario(context: Context, scenario: Scenario) -> None:
         context.llama_stack_was_running = False
 
     # Tags that require config restoration after scenario
-    config_restore_tags = {"InvalidFeedbackStorageConfig", "NoCacheConfig"}
+    config_restore_tags = {
+        "InvalidFeedbackStorageConfig",
+        "NoCacheConfig",
+        "MCPFileAuthConfig",
+        "MCPKubernetesAuthConfig",
+        "MCPClientAuthConfig",
+        "MCPOAuthAuthConfig",
+    }
     if config_restore_tags & set(scenario.effective_tags):
         switch_config(context.feature_config)
         restart_container("lightspeed-stack")