Skip to content

Commit 11cc9d6

Browse files
committed
fix(network): replace to use proxy (#60)
1 parent 4da8ce8 commit 11cc9d6

File tree

2 files changed

+34
-37
lines changed

2 files changed

+34
-37
lines changed

src/openstack_mcp_server/tools/network_tools.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def get_networks(
7575
if shared_only:
7676
filters["shared"] = True
7777

78-
networks = conn.list_networks(filters=filters)
78+
networks = conn.network.networks(**filters)
7979

8080
return [
8181
self._convert_to_network_model(network) for network in networks
@@ -259,7 +259,7 @@ def get_subnets(
259259
filters["project_id"] = project_id
260260
if is_dhcp_enabled is not None:
261261
filters["enable_dhcp"] = is_dhcp_enabled
262-
subnets = conn.list_subnets(filters=filters)
262+
subnets = conn.network.subnets(**filters)
263263
if has_gateway is not None:
264264
subnets = [
265265
s for s in subnets if (s.gateway_ip is not None) == has_gateway
@@ -454,7 +454,7 @@ def get_ports(
454454
filters["device_id"] = device_id
455455
if network_id:
456456
filters["network_id"] = network_id
457-
ports = conn.list_ports(filters=filters)
457+
ports = conn.network.ports(**filters)
458458
return [self._convert_to_port_model(port) for port in ports]
459459

460460
def get_port_allowed_address_pairs(self, port_id: str) -> list[dict]:
@@ -896,7 +896,7 @@ def get_routers(
896896
filters["project_id"] = project_id
897897
if is_admin_state_up is not None:
898898
filters["admin_state_up"] = is_admin_state_up
899-
routers = conn.list_routers(filters=filters)
899+
routers = conn.network.routers(**filters)
900900
return [self._convert_to_router_model(r) for r in routers]
901901

902902
def create_router(

tests/tools/test_network_tools.py

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ def test_get_networks_success(
5454
mock_network2.provider_segmentation_id = None
5555
mock_network2.project_id = "proj-admin-000"
5656

57-
mock_conn.list_networks.return_value = [mock_network1, mock_network2]
57+
mock_conn.network.networks.return_value = [
58+
mock_network1,
59+
mock_network2,
60+
]
5861

5962
network_tools = self.get_network_tools()
6063
result = network_tools.get_networks()
@@ -91,7 +94,7 @@ def test_get_networks_success(
9194
assert result[0] == expected_network1
9295
assert result[1] == expected_network2
9396

94-
mock_conn.list_networks.assert_called_once_with(filters={})
97+
mock_conn.network.networks.assert_called_once_with()
9598

9699
def test_get_networks_empty_list(
97100
self,
@@ -100,14 +103,14 @@ def test_get_networks_empty_list(
100103
"""Test getting openstack networks when no networks exist."""
101104
mock_conn = mock_openstack_connect_network
102105

103-
mock_conn.list_networks.return_value = []
106+
mock_conn.network.networks.return_value = []
104107

105108
network_tools = self.get_network_tools()
106109
result = network_tools.get_networks()
107110

108111
assert result == []
109112

110-
mock_conn.list_networks.assert_called_once_with(filters={})
113+
mock_conn.network.networks.assert_called_once_with()
111114

112115
def test_get_networks_with_status_filter(
113116
self,
@@ -142,7 +145,7 @@ def test_get_networks_with_status_filter(
142145
mock_network2.provider_segmentation_id = None
143146
mock_network2.project_id = None
144147

145-
mock_conn.list_networks.return_value = [
148+
mock_conn.network.networks.return_value = [
146149
mock_network1,
147150
] # Only ACTIVE network
148151
network_tools = self.get_network_tools()
@@ -152,8 +155,8 @@ def test_get_networks_with_status_filter(
152155
assert result[0].id == "net-active"
153156
assert result[0].status == "ACTIVE"
154157

155-
mock_conn.list_networks.assert_called_once_with(
156-
filters={"status": "ACTIVE"},
158+
mock_conn.network.networks.assert_called_once_with(
159+
status="ACTIVE",
157160
)
158161

159162
def test_get_networks_shared_only(
@@ -189,7 +192,7 @@ def test_get_networks_shared_only(
189192
mock_network2.provider_segmentation_id = None
190193
mock_network2.project_id = None
191194

192-
mock_conn.list_networks.return_value = [
195+
mock_conn.network.networks.return_value = [
193196
mock_network2,
194197
] # Only shared network
195198

@@ -200,8 +203,8 @@ def test_get_networks_shared_only(
200203
assert result[0].id == "net-shared"
201204
assert result[0].is_shared is True
202205

203-
mock_conn.list_networks.assert_called_once_with(
204-
filters={"shared": True},
206+
mock_conn.network.networks.assert_called_once_with(
207+
shared=True,
205208
)
206209

207210
def test_create_network_success(self, mock_openstack_connect_network):
@@ -487,7 +490,7 @@ def test_get_ports_with_filters(self, mock_openstack_connect_network):
487490
port.fixed_ips = [{"subnet_id": "subnet-1", "ip_address": "10.0.0.10"}]
488491
port.security_group_ids = ["sg-1", "sg-2"]
489492

490-
mock_conn.list_ports.return_value = [port]
493+
mock_conn.network.ports.return_value = [port]
491494

492495
tools = self.get_network_tools()
493496
result = tools.get_ports(
@@ -515,12 +518,10 @@ def test_get_ports_with_filters(self, mock_openstack_connect_network):
515518
),
516519
]
517520

518-
mock_conn.list_ports.assert_called_once_with(
519-
filters={
520-
"status": "ACTIVE",
521-
"device_id": "device-1",
522-
"network_id": "net-1",
523-
},
521+
mock_conn.network.ports.assert_called_once_with(
522+
status="ACTIVE",
523+
device_id="device-1",
524+
network_id="net-1",
524525
)
525526

526527
def test_create_port_success(self, mock_openstack_connect_network):
@@ -848,7 +849,7 @@ def test_get_subnets_filters_and_has_gateway_true(
848849
subnet2.dns_nameservers = []
849850
subnet2.host_routes = []
850851

851-
mock_conn.list_subnets.return_value = [subnet1, subnet2]
852+
mock_conn.network.subnets.return_value = [subnet1, subnet2]
852853

853854
tools = self.get_network_tools()
854855
result = tools.get_subnets(
@@ -876,13 +877,11 @@ def test_get_subnets_filters_and_has_gateway_true(
876877
host_routes=[],
877878
)
878879

879-
mock_conn.list_subnets.assert_called_once_with(
880-
filters={
881-
"network_id": "net-1",
882-
"ip_version": 4,
883-
"project_id": "proj-1",
884-
"enable_dhcp": True,
885-
},
880+
mock_conn.network.subnets.assert_called_once_with(
881+
network_id="net-1",
882+
ip_version=4,
883+
project_id="proj-1",
884+
enable_dhcp=True,
886885
)
887886

888887
def test_get_subnets_has_gateway_false(
@@ -923,7 +922,7 @@ def test_get_subnets_has_gateway_false(
923922
subnet2.dns_nameservers = []
924923
subnet2.host_routes = []
925924

926-
mock_conn.list_subnets.return_value = [subnet1, subnet2]
925+
mock_conn.network.subnets.return_value = [subnet1, subnet2]
927926

928927
tools = self.get_network_tools()
929928
result = tools.get_subnets(
@@ -1326,7 +1325,7 @@ def test_get_routers_with_filters(self, mock_openstack_connect_network):
13261325
r.is_ha = False
13271326
r.routes = []
13281327

1329-
mock_conn.list_routers.return_value = [r]
1328+
mock_conn.network.routers.return_value = [r]
13301329

13311330
tools = self.get_network_tools()
13321331
res = tools.get_routers(
@@ -1350,12 +1349,10 @@ def test_get_routers_with_filters(self, mock_openstack_connect_network):
13501349
),
13511350
]
13521351

1353-
mock_conn.list_routers.assert_called_once_with(
1354-
filters={
1355-
"status": "ACTIVE",
1356-
"project_id": "proj-1",
1357-
"admin_state_up": True,
1358-
},
1352+
mock_conn.network.routers.assert_called_once_with(
1353+
status="ACTIVE",
1354+
project_id="proj-1",
1355+
admin_state_up=True,
13591356
)
13601357

13611358
def test_create_router_success(self, mock_openstack_connect_network):

0 commit comments

Comments
 (0)