feat(identity): Add id field in update domain tool(#31)

- Add id field in update_domain tool
- Tests are updated and passing
- Resolve conlfict

Author: S0okJu

src/openstack_mcp_server/tools/identity_tools.py

@@ -1,7 +1,7 @@
 from fastmcp import FastMCP
 
 from .base import get_openstack_conn
-from .response.identity import Region, Domain
+from .response.identity import Domain, Region
 
 
 class IdentityTools:
@@ -23,8 +23,11 @@ def register_tools(self, mcp: FastMCP):
         mcp.tool()(self.get_domains)
         mcp.tool()(self.get_domain)
         mcp.tool()(self.create_domain)
+<<<<<<< HEAD
         mcp.tool()(self.delete_domain)
         mcp.tool()(self.update_domain)
+=======
+>>>>>>> d7d60da163653af86da9ffa64fb394cbb1ea8c40
 
     def get_regions(self) -> list[Region]:
         """
@@ -186,4 +189,4 @@ def update_domain(self, id: str, name: str | None = None, description: str | Non
 
         return Domain(id=updated_domain.id, name=updated_domain.name, description=updated_domain.description, is_enabled=updated_domain.is_enabled)
 
-        
+        

tests/tools/test_identity_tools.py

@@ -6,7 +6,7 @@
 from openstack import exceptions
 
 from openstack_mcp_server.tools.identity_tools import IdentityTools
-from openstack_mcp_server.tools.response.identity import Region, Domain
+from openstack_mcp_server.tools.response.identity import Domain, Region
 
 
 class TestIdentityTools:
@@ -611,4 +611,3 @@ def test_update_domain_with_empty_id(self, mock_get_openstack_conn_identity):
         # Verify mock calls
         mock_conn.identity.update_domain.assert_called_once_with(domain="")
 
-