Refactor to consistently store URLs in the url field

Co-authored-by: pontemonti <[email protected]>

Author: Copilot

libraries/microsoft-agents-a365-tooling-extensions-agentframework/microsoft_agents_a365/tooling/extensions/agentframework/services/mcp_tool_registration_service.py

@@ -133,12 +133,8 @@ async def add_tool_servers_to_agent(
                     self._logger.info(f"Added MCP plugin '{server_name}' to agent tools")
 
                 except Exception as tool_ex:
-                    try:
-                        server_name = config.mcp_server_name
-                    except AttributeError:
-                        server_name = "Unknown"
                     self._logger.warning(
-                        f"Failed to create MCP plugin for {server_name}: {tool_ex}"
+                        f"Failed to create MCP plugin for {config.mcp_server_name}: {tool_ex}"
                     )
                     continue
 

libraries/microsoft-agents-a365-tooling-extensions-semantickernel/microsoft_agents_a365/tooling/extensions/semantickernel/services/mcp_tool_registration_service.py

@@ -125,7 +125,7 @@ async def add_tool_servers_to_agent(
                     self._orchestrator_name
                 )
 
-                # Use custom URL if provided, otherwise use the unique name
+                # Use custom URL if provided, otherwise use the unique name  
                 server_url = server.url if server.url else server.mcp_server_unique_name
 
                 plugin = MCPStreamableHttpPlugin(

libraries/microsoft-agents-a365-tooling/microsoft_agents_a365/tooling/services/mcp_tool_server_configuration_service.py

@@ -401,15 +401,12 @@ def _parse_manifest_server_config(
             # Check if a custom URL is provided
             custom_url = self._extract_server_url(server_element)
 
-            # If custom URL is provided, use it directly; otherwise construct from base URL
-            if custom_url:
-                return MCPServerConfig(
-                    mcp_server_name=name, mcp_server_unique_name=server_name, url=custom_url
-                )
-            else:
-                # Construct full URL using environment utilities
-                full_url = build_mcp_server_url(server_name)
-                return MCPServerConfig(mcp_server_name=name, mcp_server_unique_name=full_url)
+            # Determine the final URL: use custom URL if provided, otherwise construct it
+            final_url = custom_url if custom_url else build_mcp_server_url(server_name)
+
+            return MCPServerConfig(
+                mcp_server_name=name, mcp_server_unique_name=server_name, url=final_url
+            )
 
         except Exception:
             return None
@@ -436,13 +433,10 @@ def _parse_gateway_server_config(
             # Check if a custom URL is provided by the gateway
             custom_url = self._extract_server_url(server_element)
 
-            # If custom URL is provided, use it; otherwise use the endpoint as-is
-            if custom_url:
-                return MCPServerConfig(
-                    mcp_server_name=name, mcp_server_unique_name=endpoint, url=custom_url
-                )
-            else:
-                return MCPServerConfig(mcp_server_name=name, mcp_server_unique_name=endpoint)
+            # Determine the final URL: use custom URL if provided, otherwise use endpoint
+            final_url = custom_url if custom_url else endpoint
+
+            return MCPServerConfig(mcp_server_name=name, mcp_server_unique_name=endpoint, url=final_url)
 
         except Exception:
             return None

tests/tooling/test_mcp_server_configuration.py

@@ -123,8 +123,9 @@ def test_parse_manifest_server_config_without_custom_url(self, mock_build_url, s
 
         assert config is not None
         assert config.mcp_server_name == "DefaultServer"
-        # Without a custom URL, build_mcp_server_url constructs the full URL and stores it in mcp_server_unique_name
-        assert config.mcp_server_unique_name == "https://default.server/agents/servers/test_server"
+        assert config.mcp_server_unique_name == "test_server"
+        # Without a custom URL, build_mcp_server_url constructs the full URL and stores it in the url field
+        assert config.url == "https://default.server/agents/servers/test_server"
         mock_build_url.assert_called_once_with("test_server")
 
     def test_parse_gateway_server_config_with_custom_url(self, service):
@@ -154,7 +155,8 @@ def test_parse_gateway_server_config_without_custom_url(self, service):
         assert config is not None
         assert config.mcp_server_name == "GatewayServer"
         assert config.mcp_server_unique_name == "https://gateway.default/endpoint"
-        assert config.url is None
+        # Without a custom URL, the endpoint is used as the url
+        assert config.url == "https://gateway.default/endpoint"
 
     @patch.dict(os.environ, {"ENVIRONMENT": "Development"})
     def test_is_development_scenario(self, service):