@@ -1146,6 +1146,87 @@ def test_change_alias_ips(
11461146 assert action .progress == 0
11471147 assert action .command == "change_alias_ips"
11481148
1149+ @pytest .mark .parametrize (
1150+ "server" , [Server (id = 1 ), BoundServer (mock .MagicMock (), dict (id = 1 ))]
1151+ )
1152+ @pytest .mark .parametrize (
1153+ "placement_group" ,
1154+ [PlacementGroup (id = 897 ), BoundPlacementGroup (mock .MagicMock , dict (id = 897 ))],
1155+ )
1156+ def test_add_to_placement_group (
1157+ self ,
1158+ request_mock : mock .MagicMock ,
1159+ servers_client : ServersClient ,
1160+ server ,
1161+ placement_group ,
1162+ response_add_to_placement_group ,
1163+ ):
1164+ request_mock .return_value = response_add_to_placement_group
1165+
1166+ action = servers_client .add_to_placement_group (server , placement_group )
1167+
1168+ request_mock .assert_called_with (
1169+ method = "POST" ,
1170+ url = "/servers/1/actions/add_to_placement_group" ,
1171+ json = {"placement_group" : 897 },
1172+ )
1173+
1174+ assert action .id == 13
1175+
1176+ @pytest .mark .parametrize (
1177+ "server" , [Server (id = 1 ), BoundServer (mock .MagicMock (), dict (id = 1 ))]
1178+ )
1179+ def test_remove_from_placement_group (
1180+ self ,
1181+ request_mock : mock .MagicMock ,
1182+ servers_client : ServersClient ,
1183+ server ,
1184+ response_remove_from_placement_group ,
1185+ ):
1186+ request_mock .return_value = response_remove_from_placement_group
1187+
1188+ action = servers_client .remove_from_placement_group (server )
1189+
1190+ request_mock .assert_called_with (
1191+ method = "POST" ,
1192+ url = "/servers/1/actions/remove_from_placement_group" ,
1193+ )
1194+
1195+ assert action .id == 13
1196+
1197+ @pytest .mark .parametrize (
1198+ "server" , [Server (id = 1 ), BoundServer (mock .MagicMock (), dict (id = 1 ))]
1199+ )
1200+ def test_get_metrics (
1201+ self ,
1202+ request_mock : mock .MagicMock ,
1203+ servers_client : ServersClient ,
1204+ server ,
1205+ response_get_metrics ,
1206+ ):
1207+ request_mock .return_value = response_get_metrics
1208+
1209+ response = servers_client .get_metrics (
1210+ server ,
1211+ type = ["cpu" , "disk" ],
1212+ start = "2023-12-14T17:40:00+01:00" ,
1213+ end = "2023-12-14T17:50:00+01:00" ,
1214+ )
1215+
1216+ request_mock .assert_called_with (
1217+ method = "GET" ,
1218+ url = "/servers/1/metrics" ,
1219+ params = {
1220+ "type" : "cpu,disk" ,
1221+ "start" : "2023-12-14T17:40:00+01:00" ,
1222+ "end" : "2023-12-14T17:50:00+01:00" ,
1223+ },
1224+ )
1225+
1226+ assert "cpu" in response .metrics .time_series
1227+ assert "disk.0.iops.read" in response .metrics .time_series
1228+ assert len (response .metrics .time_series ["disk.0.iops.read" ]["values" ]) == 3
1229+
11491230 # def test_update(
11501231 # self,
11511232 # request_mock: mock.MagicMock,
@@ -1183,34 +1264,6 @@ def test_change_alias_ips(
11831264 # assert action.id == 1
11841265 # assert action.progress == 0
11851266
1186- # def test_get_metrics(
1187- # self,
1188- # request_mock: mock.MagicMock,
1189- # bound_server: BoundServer,
1190- # response_get_metrics,
1191- # ):
1192- # request_mock.return_value = response_get_metrics
1193-
1194- # response = bound_server.get_metrics(
1195- # type=["cpu", "disk"],
1196- # start="2023-12-14T17:40:00+01:00",
1197- # end="2023-12-14T17:50:00+01:00",
1198- # )
1199-
1200- # request_mock.assert_called_with(
1201- # method="GET",
1202- # url="/servers/14/metrics",
1203- # params={
1204- # "type": "cpu,disk",
1205- # "start": "2023-12-14T17:40:00+01:00",
1206- # "end": "2023-12-14T17:50:00+01:00",
1207- # },
1208- # )
1209-
1210- # assert "cpu" in response.metrics.time_series
1211- # assert "disk.0.iops.read" in response.metrics.time_series
1212- # assert len(response.metrics.time_series["disk.0.iops.read"]["values"]) == 3
1213-
12141267 # def test_power_off(
12151268 # self,
12161269 # request_mock: mock.MagicMock,
@@ -1632,46 +1685,6 @@ def test_change_alias_ips(
16321685 # assert action.progress == 0
16331686 # assert action.command == "change_alias_ips"
16341687
1635- # @pytest.mark.parametrize(
1636- # "placement_group",
1637- # [PlacementGroup(id=897), BoundPlacementGroup(mock.MagicMock, dict(id=897))],
1638- # )
1639- # def test_add_to_placement_group(
1640- # self,
1641- # request_mock: mock.MagicMock,
1642- # bound_server,
1643- # placement_group,
1644- # response_add_to_placement_group,
1645- # ):
1646- # request_mock.return_value = response_add_to_placement_group
1647-
1648- # action = bound_server.add_to_placement_group(placement_group)
1649-
1650- # request_mock.assert_called_with(
1651- # method="POST",
1652- # url="/servers/14/actions/add_to_placement_group",
1653- # json={"placement_group": 897},
1654- # )
1655-
16561688 # assert action.id == 13
16571689 # assert action.progress == 0
16581690 # assert action.command == "add_to_placement_group"
1659-
1660- # def test_remove_from_placement_group(
1661- # self,
1662- # request_mock: mock.MagicMock,
1663- # bound_server,
1664- # response_remove_from_placement_group,
1665- # ):
1666- # request_mock.return_value = response_remove_from_placement_group
1667-
1668- # action = bound_server.remove_from_placement_group()
1669-
1670- # request_mock.assert_called_with(
1671- # method="POST",
1672- # url="/servers/14/actions/remove_from_placement_group",
1673- # )
1674-
1675- # assert action.id == 13
1676- # assert action.progress == 100
1677- # assert action.command == "remove_from_placement_group"
0 commit comments