Skip to content

Commit 011a86c

Browse files
ahmonteroahmontero
committed
merge @mzafer pull request and better pep-8
1 parent 2f2f99b commit 011a86c

1 file changed

Lines changed: 41 additions & 40 deletions

File tree

‎dop/client.py‎

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
class Droplet(object):
2020
def __init__(self, id, name, size_id, image_id, region_id, event_id,
21-
backups_active, status, ip_address, created_at, private_ip_address):
21+
backups_active, status, ip_address, created_at, private_ip_address):
2222
self.id = id
2323
self.name = name
2424
self.size_id = size_id
@@ -48,7 +48,8 @@ def from_json(json):
4848
private_ip_address = json.get('private_ip_address', -1)
4949
created_at = json.get('created_at', -1)
5050
droplet = Droplet(id, name, size_id, image_id, region_id, event_id,
51-
backups_active, status, ip_address, created_at, private_ip_address)
51+
backups_active, status, ip_address, created_at,
52+
private_ip_address)
5253
return droplet
5354

5455

@@ -135,7 +136,7 @@ def from_json(json):
135136
class Client(object):
136137

137138
def __init__(self, client_id, api_key, host=API_HOST, port=API_PORT,
138-
secure=True):
139+
secure=True):
139140
self.client_id = client_id
140141
self.api_key = api_key
141142
self.host = host
@@ -184,20 +185,20 @@ def all_ssh_keys(self):
184185

185186
def reboot_droplet(self, id):
186187
params = {}
187-
json = self.request('/droplets/%s/reboot' % (id), method='POST',
188-
params=params)
188+
json = self.request('/droplets/%s/reboot' % id, method='POST',
189+
params=params)
189190
return json.get('event_id', None)
190191

191192
def show_droplet(self, id):
192193
params = {}
193-
json = self.request('/droplets/%s' % (id), method='GET', params=params)
194+
json = self.request('/droplets/%s' % id, method='GET', params=params)
194195
droplet_json = json.get('droplet', None)
195196
droplet = Droplet.from_json(droplet_json)
196197
return droplet
197198

198199
def create_droplet(self, name="", size_id=-1, image_id=-1, region_id=-1,
199-
ssh_key_ids = None, virtio=False, private_networking=False,
200-
backups_enabled=False):
200+
ssh_key_ids=None, virtio=False, private_networking=False,
201+
backups_enabled=False):
201202
params = {
202203
'name': name,
203204
'size_id': size_id,
@@ -210,6 +211,8 @@ def create_droplet(self, name="", size_id=-1, image_id=-1, region_id=-1,
210211
params['ssh_key_ids'] = ','.join(ssh_key_ids)
211212
if virtio:
212213
params['virtio'] = 1
214+
if private_networking:
215+
params['private_networking'] = 1
213216

214217
json = self.request('/droplets/new', method='GET', params=params)
215218
droplet_json = json.get('droplet', None)
@@ -218,56 +221,56 @@ def create_droplet(self, name="", size_id=-1, image_id=-1, region_id=-1,
218221

219222
def power_cycle_droplet(self, id):
220223
params = {}
221-
json = self.request('/droplets/%s/power_cycle' % (id), method='POST',
222-
params=params)
224+
json = self.request('/droplets/%s/power_cycle' % id, method='POST',
225+
params=params)
223226
return json.get('event_id', None)
224227

225228
def power_off_droplet(self, id):
226229
params = {}
227-
json = self.request('/droplets/%s/power_off' % (id), method='GET',
228-
params=params)
230+
json = self.request('/droplets/%s/power_off' % id, method='GET',
231+
params=params)
229232
return json.get('event_id', None)
230233

231234
def power_on_droplet(self, id):
232235
params = {}
233-
json = self.request('/droplets/%s/power_on' % (id), method='GET',
234-
params=params)
236+
json = self.request('/droplets/%s/power_on' % id, method='GET',
237+
params=params)
235238
return json.get('event_id', None)
236239

237240
def resize_droplet(self, id, size_id):
238241
params = {
239242
'size_id': size_id,
240243
}
241-
json = self.request('/droplets/%s/resize' % (id), method='POST',
242-
params=params)
244+
json = self.request('/droplets/%s/resize' % id, method='POST',
245+
params=params)
243246
return json
244247

245248
def snapshot_droplet(self, id, name):
246249
params = {
247250
'name': name,
248251
}
249-
json = self.request('/droplets/%s/snapshot' % (id), method='POST',
250-
params=params)
252+
json = self.request('/droplets/%s/snapshot' % id, method='POST',
253+
params=params)
251254
return json.get('event_id', None)
252255

253256
def rebuild_droplet(self, id, image_id):
254257
params = {
255258
'image_id': image_id,
256259
}
257-
json = self.request('/droplets/%s/rebuild' % (id), method='POST',
258-
params=params)
260+
json = self.request('/droplets/%s/rebuild' % id, method='POST',
261+
params=params)
259262
return json.get('event_id', None)
260263

261264
def enable_backups_droplet(self, id):
262265
params = {}
263-
json = self.request('/droplets/%s/enable_backups' % (id),
264-
method='POST', params=params)
266+
json = self.request('/droplets/%s/enable_backups' % id,
267+
method='POST', params=params)
265268
return json.get('event_id', None)
266269

267270
def disable_backups_droplet(self, id):
268271
params = {}
269-
json = self.request('/droplets/%s/disable_backups' % (id),
270-
method='POST', params=params)
272+
json = self.request('/droplets/%s/disable_backups' % id,
273+
method='POST', params=params)
271274
return json.get('event_id', None)
272275

273276
def destroy_droplet(self, id, scrub_data=False):
@@ -277,78 +280,76 @@ def destroy_droplet(self, id, scrub_data=False):
277280
params['scrub_data'] = True
278281

279282
json = self.request('/droplets/%s/destroy' % (id), method='GET',
280-
params=params)
283+
params=params)
281284
return json.get('event_id', None)
282285

283286
def show_image(self, image_id):
284287
params = {
285288
'image_id': image_id,
286289
}
287290
json = self.request('/images/%s' % (image_id), method='GET',
288-
params=params)
291+
params=params)
289292
image_json = json.get('image', None)
290293
image = Image.from_json(image_json)
291294
return image
292295

293296
def shutdown_droplet(self, id):
294297
params = {}
295-
json = self.request('/droplets/%s/shutdown' % (id), method='POST',
296-
params=params)
298+
json = self.request('/droplets/%s/shutdown' % id, method='POST',
299+
params=params)
297300
return json.get('event_id', None)
298301

299302
# WEIRD BEHAVIOUR METHODS
300303
def reset_root_password(self, id):
301304
params = {}
302-
json = self.request('/droplets/%s/reset_root_password' % (id),
303-
method='GET', params=params)
305+
json = self.request('/droplets/%s/reset_root_password' % id,
306+
method='GET', params=params)
304307
print json
305308
return json.get('event_id', None)
306309

307310
def restore_droplet(self, id, image_id):
308311
params = {
309312
'image_id': image_id,
310313
}
311-
json = self.request('/droplets/%s/restore' % (id), method='GET',
312-
params=params)
314+
json = self.request('/droplets/%s/restore' % id, method='GET',
315+
params=params)
313316
print json
314317
return json.get('event_id', None)
315318

316319
def destroy_image(self, image_id):
317320
params = {}
318-
json = self.request('/images/%s/destroy' % (image_id), method='GET',
319-
params=params)
321+
json = self.request('/images/%s/destroy' % image_id, method='GET',
322+
params=params)
320323
print json
321324
event = json.get('event', None)
322325
return event
323326

324327
def show_ssh_key(self, id):
325328
params = {}
326-
json = self.request('/ssh_keys/%s' % (id), method='GET', params=params)
329+
json = self.request('/ssh_keys/%s' % id, method='GET', params=params)
327330
ssh_key_json = json.get('ssh_key', None)
328331
ssh_key = SSHKey.from_json(ssh_key_json)
329332
return ssh_key
330333

331334
def destroy_ssh_key(self, id):
332335
params = {}
333-
json = self.request('/ssh_keys/%s/destroy' % (id), method='GET',
336+
json = self.request('/ssh_keys/%s/destroy' % id, method='GET',
334337
params=params)
335338
ssh_key = SSHKey.from_json(json)
336339
return ssh_key
337340

338341
# EXPERIMENTAL: ssh actions #
339342
def add_ssh_key(self, id):
340343
params = {}
341-
json = self.request('/ssh_key/%s/add' % (id), method='GET',
342-
params=params)
344+
json = self.request('/ssh_key/%s/add' % id, method='GET', params=params)
343345
print json
344346
ssh_key_json = json.get('ssh_key', None)
345347
ssh_key = SSHKey.from_json(ssh_key_json)
346348
return ssh_key
347349

348350
def edit_ssh_key(self, id):
349351
params = {}
350-
json = self.request('/ssh_key/%s/edit' % (id), method='GET',
351-
params=params)
352+
json = self.request('/ssh_key/%s/edit' % id, method='GET', params=params)
352353
ssh_key = SSHKey.from_json(json)
353354
return ssh_key
354355

0 commit comments

Comments
 (0)