Skip to content

Commit 6445390

Browse files
author
Adrian Huber
committed
Fix formatting
1 parent fcd1740 commit 6445390

9 files changed

Lines changed: 310 additions & 255 deletions

File tree

hcloud/placement_groups/client.py

Lines changed: 63 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,21 @@ def get_by_id(self, id):
3939
:param id: int
4040
:return: :class:`BoundPlacementGroup <hcloud.placement_groups.client.BoundPlacementGroup>`
4141
"""
42-
response = self._client.request(url="/placement_groups/{placement_group_id}".format(placement_group_id=id), method="GET")
43-
return BoundPlacementGroup(self, response['placement_group'])
44-
45-
def get_list(self,
46-
label_selector=None, # type: Optional[str]
47-
page=None, # type: Optional[int]
48-
per_page=None, # type: Optional[int]
49-
name=None, # type: Optional[str]
50-
sort=None, # type: Optional[List[str]]
51-
type=None, # type: Optional[str]
52-
):
42+
response = self._client.request(
43+
url="/placement_groups/{placement_group_id}".format(placement_group_id=id),
44+
method="GET",
45+
)
46+
return BoundPlacementGroup(self, response["placement_group"])
47+
48+
def get_list(
49+
self,
50+
label_selector=None, # type: Optional[str]
51+
page=None, # type: Optional[int]
52+
per_page=None, # type: Optional[int]
53+
name=None, # type: Optional[str]
54+
sort=None, # type: Optional[List[str]]
55+
type=None, # type: Optional[str]
56+
):
5357
# type: (...) -> PageResults[List[BoundPlacementGroup]]
5458
"""Get a list of Placement Groups
5559
@@ -69,19 +73,24 @@ def get_list(self,
6973
params = {}
7074

7175
if label_selector is not None:
72-
params['label_selector'] = label_selector
76+
params["label_selector"] = label_selector
7377
if page is not None:
74-
params['page'] = page
78+
params["page"] = page
7579
if per_page is not None:
76-
params['per_page'] = per_page
80+
params["per_page"] = per_page
7781
if name is not None:
78-
params['name'] = name
82+
params["name"] = name
7983
if sort is not None:
80-
params['sort'] = sort
84+
params["sort"] = sort
8185
if type is not None:
82-
params['type'] = type
83-
response = self._client.request(url="/placement_groups", method="GET", params=params)
84-
placement_groups = [BoundPlacementGroup(self, placement_group_data) for placement_group_data in response['placement_groups']]
86+
params["type"] = type
87+
response = self._client.request(
88+
url="/placement_groups", method="GET", params=params
89+
)
90+
placement_groups = [
91+
BoundPlacementGroup(self, placement_group_data)
92+
for placement_group_data in response["placement_groups"]
93+
]
8594

8695
return self._add_meta_to_result(placement_groups, response)
8796

@@ -97,7 +106,9 @@ def get_all(self, label_selector=None, name=None, sort=None):
97106
Choices: id name created (You can add one of ":asc", ":desc" to modify sort order. ( ":asc" is default))
98107
:return: List[:class:`BoundPlacementGroup <hcloud.placement_groups.client.BoundPlacementGroup>`]
99108
"""
100-
return super(PlacementGroupsClient, self).get_all(label_selector=label_selector, name=name, sort=sort)
109+
return super(PlacementGroupsClient, self).get_all(
110+
label_selector=label_selector, name=name, sort=sort
111+
)
101112

102113
def get_by_name(self, name):
103114
# type: (str) -> BoundPlacementGroup
@@ -109,11 +120,12 @@ def get_by_name(self, name):
109120
"""
110121
return super(PlacementGroupsClient, self).get_by_name(name)
111122

112-
def create(self,
113-
name, # type: str
114-
type, # type: str
115-
labels=None, # type: Optional[Dict[str, str]]
116-
):
123+
def create(
124+
self,
125+
name, # type: str
126+
type, # type: str
127+
labels=None, # type: Optional[Dict[str, str]]
128+
):
117129
# type: (...) -> CreatePlacementGroupResponse
118130
"""Creates a new Placement Group.
119131
@@ -126,21 +138,20 @@ def create(self,
126138
127139
:return: :class:`CreatePlacementGroupResponse <hcloud.placement_groups.domain.CreatePlacementGroupResponse>`
128140
"""
129-
data = {
130-
'name': name,
131-
'type': type
132-
}
141+
data = {"name": name, "type": type}
133142
if labels is not None:
134-
data['labels'] = labels
135-
response = self._client.request(url="/placement_groups", json=data, method="POST")
143+
data["labels"] = labels
144+
response = self._client.request(
145+
url="/placement_groups", json=data, method="POST"
146+
)
136147

137148
action = None
138-
if response.get('action') is not None:
139-
action = BoundAction(self._client.action, response['action'])
149+
if response.get("action") is not None:
150+
action = BoundAction(self._client.action, response["action"])
140151

141152
result = CreatePlacementGroupResponse(
142-
placement_group=BoundPlacementGroup(self, response['placement_group']),
143-
action=action
153+
placement_group=BoundPlacementGroup(self, response["placement_group"]),
154+
action=action,
144155
)
145156
return result
146157

@@ -158,13 +169,18 @@ def update(self, placement_group, labels=None, name=None):
158169

159170
data = {}
160171
if labels is not None:
161-
data['labels'] = labels
172+
data["labels"] = labels
162173
if name is not None:
163-
data['name'] = name
164-
165-
response = self._client.request(url="/placement_groups/{placement_group_id}".format(placement_group_id=placement_group.id),
166-
method="PUT", json=data)
167-
return BoundPlacementGroup(self, response['placement_group'])
174+
data["name"] = name
175+
176+
response = self._client.request(
177+
url="/placement_groups/{placement_group_id}".format(
178+
placement_group_id=placement_group.id
179+
),
180+
method="PUT",
181+
json=data,
182+
)
183+
return BoundPlacementGroup(self, response["placement_group"])
168184

169185
def delete(self, placement_group):
170186
# type: (PlacementGroup) -> bool
@@ -173,6 +189,10 @@ def delete(self, placement_group):
173189
:param placement_group: :class:`BoundPlacementGroup <hcloud.placement_groups.client.BoundPlacementGroup>` or :class:`PlacementGroup <hcloud.placement_groups.domain.PlacementGroup>`
174190
:return: boolean
175191
"""
176-
self._client.request(url="/placement_groups/{placement_group_id}".format(placement_group_id=placement_group.id),
177-
method="DELETE")
192+
self._client.request(
193+
url="/placement_groups/{placement_group_id}".format(
194+
placement_group_id=placement_group.id
195+
),
196+
method="DELETE",
197+
)
178198
return True

hcloud/placement_groups/domain.py

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,15 @@ class PlacementGroup(BaseDomain):
2121
Point in time when the image was created
2222
"""
2323

24-
__slots__ = (
25-
"id",
26-
"name",
27-
"labels",
28-
"servers",
29-
"type",
30-
"created"
31-
)
24+
__slots__ = ("id", "name", "labels", "servers", "type", "created")
3225

3326
"""Placement Group type spread
3427
spreads all servers in the group on different vhosts
3528
"""
3629
TYPE_SPREAD = "spread"
3730

3831
def __init__(
39-
self,
40-
id=None,
41-
name=None,
42-
labels=None,
43-
servers=None,
44-
type=None,
45-
created=None
32+
self, id=None, name=None, labels=None, servers=None, type=None, created=None
4633
):
4734
self.id = id
4835
self.name = name
@@ -60,15 +47,13 @@ class CreatePlacementGroupResponse(BaseDomain):
6047
:param action: :class:`BoundAction <hcloud.actions.client.BoundAction>`
6148
The Action which shows the progress of the Placement Group Creation
6249
"""
63-
__slots__ = (
64-
"placement_group",
65-
"action"
66-
)
50+
51+
__slots__ = ("placement_group", "action")
6752

6853
def __init__(
69-
self,
70-
placement_group, # type: BoundPlacementGroup
71-
action, # type: BoundAction
54+
self,
55+
placement_group, # type: BoundPlacementGroup
56+
action, # type: BoundAction
7257
):
7358
self.placement_group = placement_group
7459
self.action = action

hcloud/servers/client.py

Lines changed: 42 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,10 @@ def __init__(self, client, data, complete=True):
104104

105105
placement_group = data.get("placement_group")
106106
if placement_group:
107-
placement_group = BoundPlacementGroup(client._client.placement_groups, placement_group)
108-
data['placement_group'] = placement_group
107+
placement_group = BoundPlacementGroup(
108+
client._client.placement_groups, placement_group
109+
)
110+
data["placement_group"] = placement_group
109111

110112
super(BoundServer, self).__init__(client, data, complete)
111113

@@ -462,22 +464,23 @@ def get_by_name(self, name):
462464
"""
463465
return super(ServersClient, self).get_by_name(name)
464466

465-
def create(self,
466-
name, # type: str
467-
server_type, # type: ServerType
468-
image, # type: Image
469-
ssh_keys=None, # type: Optional[List[SSHKey]]
470-
volumes=None, # type: Optional[List[Volume]]
471-
firewalls=None, # type: Optional[List[Firewall]]
472-
networks=None, # type: Optional[List[Network]]
473-
user_data=None, # type: Optional[str]
474-
labels=None, # type: Optional[Dict[str, str]]
475-
location=None, # type: Optional[Location]
476-
datacenter=None, # type: Optional[Datacenter]
477-
start_after_create=True, # type: Optional[bool]
478-
automount=None, # type: Optional[bool]
479-
placement_group=None # type: Optional[PlacementGroup]
480-
):
467+
def create(
468+
self,
469+
name, # type: str
470+
server_type, # type: ServerType
471+
image, # type: Image
472+
ssh_keys=None, # type: Optional[List[SSHKey]]
473+
volumes=None, # type: Optional[List[Volume]]
474+
firewalls=None, # type: Optional[List[Firewall]]
475+
networks=None, # type: Optional[List[Network]]
476+
user_data=None, # type: Optional[str]
477+
labels=None, # type: Optional[Dict[str, str]]
478+
location=None, # type: Optional[Location]
479+
datacenter=None, # type: Optional[Datacenter]
480+
start_after_create=True, # type: Optional[bool]
481+
automount=None, # type: Optional[bool]
482+
placement_group=None, # type: Optional[PlacementGroup]
483+
):
481484
# type: (...) -> CreateServerResponse
482485
"""Creates a new server. Returns preliminary information about the server as well as an action that covers progress of creation.
483486
@@ -533,7 +536,7 @@ def create(self,
533536
if automount is not None:
534537
data["automount"] = automount
535538
if placement_group is not None:
536-
data['placement_group'] = placement_group.id
539+
data["placement_group"] = placement_group.id
537540

538541
response = self._client.request(url="/servers", method="POST", json=data)
539542

@@ -1014,9 +1017,13 @@ def change_alias_ips(self, server, network, alias_ips):
10141017
"""
10151018
data = {"network": network.id, "alias_ips": alias_ips}
10161019
response = self._client.request(
1017-
url="/servers/{server_id}/actions/change_alias_ips".format(server_id=server.id), method="POST",
1018-
json=data)
1019-
return BoundAction(self._client.actions, response['action'])
1020+
url="/servers/{server_id}/actions/change_alias_ips".format(
1021+
server_id=server.id
1022+
),
1023+
method="POST",
1024+
json=data,
1025+
)
1026+
return BoundAction(self._client.actions, response["action"])
10201027

10211028
def add_to_placement_group(self, server, placement_group):
10221029
# type: (Union[Server,BoundServer], Union[PlacementGroup,BoundPlacementGroup]) -> BoundAction
@@ -1030,9 +1037,13 @@ def add_to_placement_group(self, server, placement_group):
10301037
"placement_group": str(placement_group.id),
10311038
}
10321039
response = self._client.request(
1033-
url="/servers/{server_id}/actions/add_to_placement_group".format(server_id=server.id), method="POST",
1034-
json=data)
1035-
return BoundAction(self._client.actions, response['action'])
1040+
url="/servers/{server_id}/actions/add_to_placement_group".format(
1041+
server_id=server.id
1042+
),
1043+
method="POST",
1044+
json=data,
1045+
)
1046+
return BoundAction(self._client.actions, response["action"])
10361047

10371048
def remove_from_placement_group(self, server):
10381049
# type: (Union[Server,BoundServer]) -> BoundAction
@@ -1042,5 +1053,9 @@ def remove_from_placement_group(self, server):
10421053
:return: :class:`BoundAction <hcloud.actions.client.BoundAction>`
10431054
"""
10441055
response = self._client.request(
1045-
url="/servers/{server_id}/actions/remove_from_placement_group".format(server_id=server.id), method="POST")
1046-
return BoundAction(self._client.actions, response['action'])
1056+
url="/servers/{server_id}/actions/remove_from_placement_group".format(
1057+
server_id=server.id
1058+
),
1059+
method="POST",
1060+
)
1061+
return BoundAction(self._client.actions, response["action"])

hcloud/servers/domain.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -84,32 +84,32 @@ class Server(BaseDomain):
8484
"private_net",
8585
"created",
8686
"primary_disk_size",
87-
"placement_group"
87+
"placement_group",
8888
)
8989

9090
def __init__(
91-
self,
92-
id,
93-
name=None,
94-
status=None,
95-
created=None,
96-
public_net=None,
97-
server_type=None,
98-
datacenter=None,
99-
image=None,
100-
iso=None,
101-
rescue_enabled=None,
102-
locked=None,
103-
backup_window=None,
104-
outgoing_traffic=None,
105-
ingoing_traffic=None,
106-
included_traffic=None,
107-
protection=None,
108-
labels=None,
109-
volumes=None,
110-
private_net=None,
111-
primary_disk_size=None,
112-
placement_group=None,
91+
self,
92+
id,
93+
name=None,
94+
status=None,
95+
created=None,
96+
public_net=None,
97+
server_type=None,
98+
datacenter=None,
99+
image=None,
100+
iso=None,
101+
rescue_enabled=None,
102+
locked=None,
103+
backup_window=None,
104+
outgoing_traffic=None,
105+
ingoing_traffic=None,
106+
included_traffic=None,
107+
protection=None,
108+
labels=None,
109+
volumes=None,
110+
private_net=None,
111+
primary_disk_size=None,
112+
placement_group=None,
113113
):
114114
self.id = id
115115
self.name = name

0 commit comments

Comments
 (0)