fix: to inner class

Author: choieastsea

src/openstack_mcp_server/tools/response/compute.py

@@ -1,37 +1,33 @@
 from pydantic import BaseModel, ConfigDict, Field
 
 
-class ServerFlavor(BaseModel):
-    id: str | None = Field(default=None, exclude=True)
-    name: str = Field(validation_alias="original_name")
-    model_config = ConfigDict(validate_by_name=True)
-
-
-class ServerImage(BaseModel):
-    id: str
-
+class Server(BaseModel):
+    class Flavor(BaseModel):
+        id: str | None = Field(default=None, exclude=True)
+        name: str = Field(validation_alias="original_name")
+        model_config = ConfigDict(validate_by_name=True)
 
-class ServerIp(BaseModel):
-    addr: str
-    version: int
-    type: str = Field(validation_alias="OS-EXT-IPS:type")
+    class Image(BaseModel):
+        id: str
 
-    model_config = ConfigDict(validate_by_name=True)
+    class IPAddress(BaseModel):
+        addr: str
+        version: int
+        type: str = Field(validation_alias="OS-EXT-IPS:type")
 
+        model_config = ConfigDict(validate_by_name=True)
 
-class ServerSecurityGroup(BaseModel):
-    name: str
+    class SecurityGroup(BaseModel):
+        name: str
 
-
-class Server(BaseModel):
     id: str
     name: str
     status: str | None = None
-    flavor: ServerFlavor | None = None
-    image: ServerImage | None = None
-    addresses: dict[str, list[ServerIp]] | None = None
+    flavor: Flavor | None = None
+    image: Image | None = None
+    addresses: dict[str, list[IPAddress]] | None = None
     key_name: str | None = None
-    security_groups: list[ServerSecurityGroup] | None = None
+    security_groups: list[SecurityGroup] | None = None
 
 
 class Flavor(BaseModel):

tests/tools/test_compute_tools.py

@@ -1,14 +1,7 @@
 from unittest.mock import Mock, call
 
 from openstack_mcp_server.tools.compute_tools import ComputeTools
-from openstack_mcp_server.tools.response.compute import (
-    Flavor,
-    Server,
-    ServerFlavor,
-    ServerImage,
-    ServerIp,
-    ServerSecurityGroup,
-)
+from openstack_mcp_server.tools.response.compute import Flavor, Server
 
 
 class TestComputeTools:
@@ -80,31 +73,31 @@ def test_get_servers_success(self, mock_get_openstack_conn):
                 id="434eb822-3fbd-44a1-a000-3b511ac9b516",
                 name="web-server-01",
                 status="ACTIVE",
-                flavor=ServerFlavor(id=None, name="m1.tiny"),
-                image=ServerImage(id="de527f30-d078-41f4-8f18-a23bf2d39366"),
+                flavor=Server.Flavor(id=None, name="m1.tiny"),
+                image=Server.Image(id="de527f30-d078-41f4-8f18-a23bf2d39366"),
                 addresses={
                     "private": [
-                        ServerIp(addr="192.168.1.10", version=4, type="fixed"),
+                        Server.IPAddress(addr="192.168.1.10", version=4, type="fixed"),
                     ],
                 },
                 key_name="my-key",
-                security_groups=[ServerSecurityGroup(name="default")],
+                security_groups=[Server.SecurityGroup(name="default")],
             ),
             Server(
                 id="ffd071fe-1334-45f6-8894-5b0bcac262a6",
                 name="db-server-01",
                 status="SHUTOFF",
-                flavor=ServerFlavor(id=None, name="m1.small"),
-                image=ServerImage(id="3d897e0e-4117-46bb-ae77-e734bb16a1ca"),
+                flavor=Server.Flavor(id=None, name="m1.small"),
+                image=Server.Image(id="3d897e0e-4117-46bb-ae77-e734bb16a1ca"),
                 addresses={
                     "net1": [
-                        ServerIp(addr="192.168.1.11", version=4, type="fixed"),
+                        Server.IPAddress(addr="192.168.1.11", version=4, type="fixed"),
                     ],
                 },
                 key_name=None,
                 security_groups=[
-                    ServerSecurityGroup(name="default"),
-                    ServerSecurityGroup(name="group1"),
+                    Server.SecurityGroup(name="default"),
+                    Server.SecurityGroup(name="group1"),
                 ],
             ),
         ]