fix(network): add id field to get security group (#85)

Author: platanus-kr

src/openstack_mcp_server/tools/network_tools.py

@@ -1175,12 +1175,14 @@ def get_security_groups(
         self,
         project_id: str | None = None,
         name: str | None = None,
+        id: str | None = None,
     ) -> list[SecurityGroup]:
         """
         Get the list of Security Groups with optional filtering.
 
         :param project_id: Filter by project ID
         :param name: Filter by security group name
+        :param id: Filter by security group ID
         :return: List of SecurityGroup objects
         """
         conn = get_openstack_conn()
@@ -1189,6 +1191,8 @@ def get_security_groups(
             filters["project_id"] = project_id
         if name:
             filters["name"] = name
+        if id:
+            filters["id"] = id
         security_groups = conn.network.security_groups(**filters)
         return [
             self._convert_to_security_group_model(sg) for sg in security_groups
@@ -1282,7 +1286,8 @@ def _convert_to_security_group_model(self, openstack_sg) -> SecurityGroup:
         rules = getattr(openstack_sg, "security_group_rules", None)
         if rules is not None:
             dto_rules = [
-                self._convert_to_security_group_rule_model(r) for r in rules
+                SecurityGroupRule.model_validate(r, from_attributes=True)
+                for r in rules
             ]
             rule_ids = [str(r.id) for r in dto_rules if getattr(r, "id", None)]
 
@@ -1294,12 +1299,3 @@ def _convert_to_security_group_model(self, openstack_sg) -> SecurityGroup:
             project_id=getattr(openstack_sg, "project_id", None),
             security_group_rule_ids=rule_ids,
         )
-
-    def _convert_to_security_group_rule_model(self, rule) -> SecurityGroupRule:
-        """
-        Convert an OpenStack Security Group Rule to a SecurityGroupRule DTO.
-
-        :param rule: OpenStack security group rule object or dict
-        :return: Pydantic SecurityGroupRule model
-        """
-        return SecurityGroupRule.model_validate(rule, from_attributes=True)

tests/tools/test_network_tools.py

@@ -1400,6 +1400,37 @@ def test_get_security_groups_filters(self, mock_openstack_connect_network):
             project_id="proj-1", name="default"
         )
 
+    def test_get_security_groups_filter_by_id(
+        self, mock_openstack_connect_network
+    ):
+        mock_conn = mock_openstack_connect_network
+
+        sg = Mock()
+        sg.id = "sg-1"
+        sg.name = "default"
+        sg.status = None
+        sg.description = "desc"
+        sg.project_id = "proj-1"
+        sg.security_group_rules = [
+            {"id": "r-1"},
+            {"id": "r-2"},
+        ]
+        mock_conn.network.security_groups.return_value = [sg]
+
+        tools = self.get_network_tools()
+        res = tools.get_security_groups(id="sg-1")
+        assert res == [
+            SecurityGroup(
+                id="sg-1",
+                name="default",
+                status=None,
+                description="desc",
+                project_id="proj-1",
+                security_group_rule_ids=["r-1", "r-2"],
+            )
+        ]
+        mock_conn.network.security_groups.assert_called_once_with(id="sg-1")
+
     def test_create_security_group(self, mock_openstack_connect_network):
         mock_conn = mock_openstack_connect_network
         sg = Mock()
@@ -1463,7 +1494,10 @@ def test_update_security_group(self, mock_openstack_connect_network):
             "sg-4", name="new-name", description="new-desc"
         )
 
-        # No fields -> returns current
+    def test_update_security_group_no_fields_returns_current(
+        self, mock_openstack_connect_network
+    ):
+        mock_conn = mock_openstack_connect_network
         current = Mock()
         current.id = "sg-5"
         current.name = "cur"
@@ -1472,8 +1506,11 @@ def test_update_security_group(self, mock_openstack_connect_network):
         current.project_id = None
         current.security_group_rules = None
         mock_conn.network.get_security_group.return_value = current
-        res2 = tools.update_security_group("sg-5")
-        assert res2.id == "sg-5"
+
+        tools = self.get_network_tools()
+        res = tools.update_security_group("sg-5")
+        assert res.id == "sg-5"
+        mock_conn.network.get_security_group.assert_called_once_with("sg-5")
 
     def test_delete_security_group(self, mock_openstack_connect_network):
         mock_conn = mock_openstack_connect_network