[Python-modules-commits] [python-digitalocean] 01/01: Imported Upstream version 0.7.1
Andrew Starr-Bochicchio
asb at moszumanska.debian.org
Tue Jun 20 00:31:43 UTC 2017
This is an automated email from the git hooks/post-receive script.
asb pushed a commit to annotated tag upstream/0.7.1
in repository python-digitalocean.
commit 126d798778e40e42a30ce6b9946a2452ccd3405e
Author: Andrew Starr-Bochicchio <a.starr.b at gmail.com>
Date: Sun Jun 29 14:50:26 2014 -0400
Imported Upstream version 0.7.1
---
digitalocean/Domain.py | 2 +-
digitalocean/Droplet.py | 17 ++++++++++++++++-
digitalocean/Event.py | 4 ++--
digitalocean/Image.py | 2 +-
digitalocean/Manager.py | 3 ++-
digitalocean/Record.py | 2 +-
digitalocean/SSHKey.py | 2 +-
digitalocean/__init__.py | 1 +
requirements.txt | 2 +-
9 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/digitalocean/Domain.py b/digitalocean/Domain.py
index 5239459..ce01669 100644
--- a/digitalocean/Domain.py
+++ b/digitalocean/Domain.py
@@ -20,7 +20,7 @@ class Domain(object):
def __call_api(self, path, params=dict()):
payload = {'client_id': self.client_id, 'api_key': self.api_key}
payload.update(params)
- r = requests.get("https://api.digitalocean.com/domains/%s%s" % ( self.id, path ), params=payload)
+ r = requests.get("https://api.digitalocean.com/v1/domains/%s%s" % ( self.id, path ), params=payload)
data = r.json()
self.call_response = data
if data['status'] != "OK":
diff --git a/digitalocean/Droplet.py b/digitalocean/Droplet.py
index 8778af2..d1c5bda 100644
--- a/digitalocean/Droplet.py
+++ b/digitalocean/Droplet.py
@@ -16,16 +16,24 @@ class Droplet(object):
self.private_ip_address = None
self.call_reponse = None
self.ssh_key_ids = None
+ self.created_at = None
self.events = []
#Setting the attribute values
for attr in kwargs.keys():
setattr(self,attr,kwargs[attr])
+ def call_api(self, path, params=dict()):
+ """
+ exposes any api entry
+ useful when working with new API calls that are not yet implemented by Droplet class
+ """
+ return self.__call_api(path, params)
+
def __call_api(self, path, params=dict()):
payload = {'client_id': self.client_id, 'api_key': self.api_key}
payload.update(params)
- r = requests.get("https://api.digitalocean.com/droplets/%s%s" % ( self.id, path ), params=payload)
+ r = requests.get("https://api.digitalocean.com/v1/droplets/%s%s" % ( self.id, path ), params=payload)
data = r.json()
self.call_response = data
if data['status'] != "OK":
@@ -49,6 +57,7 @@ class Droplet(object):
self.name = droplet['name']
self.ip_address = droplet['ip_address']
self.private_ip_address = droplet['private_ip_address']
+ self.created_at = droplet['created_at']
self.id = droplet['id']
def power_on(self):
@@ -131,6 +140,12 @@ class Droplet(object):
"""
self.__call_api("/destroy/", {'scrub_data': '1' if scrub_data else '0'})
+ def rename(self, name):
+ """
+ Rename the droplet
+ """
+ self.__call_api("/rename/", {'name': name})
+
def create(self, ssh_key_ids=None, virtio=False, private_networking=False, backups_enabled=False):
"""
Create the droplet with object properties.
diff --git a/digitalocean/Event.py b/digitalocean/Event.py
index e657c4e..7541dbb 100644
--- a/digitalocean/Event.py
+++ b/digitalocean/Event.py
@@ -14,7 +14,7 @@ class Event(object):
def __call_api(self, path, params=dict()):
payload = {'client_id': self.client_id, 'api_key': self.api_key}
payload.update(params)
- r = requests.get("https://api.digitalocean.com/events/%s%s" % ( self.id, path ), params=payload)
+ r = requests.get("https://api.digitalocean.com/v1/events/%s%s" % ( self.id, path ), params=payload)
data = r.json()
self.call_response = data
if data['status'] != "OK":
@@ -31,4 +31,4 @@ class Event(object):
self.percentage = event[u'percentage']
self.droplet_id = event[u'droplet_id']
self.action_status = event[u'action_status']
-
\ No newline at end of file
+
diff --git a/digitalocean/Image.py b/digitalocean/Image.py
index 4e9467a..1dc2762 100644
--- a/digitalocean/Image.py
+++ b/digitalocean/Image.py
@@ -12,7 +12,7 @@ class Image(object):
def __call_api(self, path, params=dict()):
payload = {'client_id': self.client_id, 'api_key': self.api_key}
payload.update(params)
- r = requests.get("https://api.digitalocean.com/images/%s%s" % ( self.id, path ), params=payload)
+ r = requests.get("https://api.digitalocean.com/v1/images/%s%s" % ( self.id, path ), params=payload)
data = r.json()
self.call_response = data
if data['status'] != "OK":
diff --git a/digitalocean/Manager.py b/digitalocean/Manager.py
index f8955a7..3dfb99d 100644
--- a/digitalocean/Manager.py
+++ b/digitalocean/Manager.py
@@ -16,7 +16,7 @@ class Manager(object):
def __call_api(self, path, params=dict()):
payload = {'client_id': self.client_id, 'api_key': self.api_key}
payload.update(params)
- r = requests.get("https://api.digitalocean.com/%s" % path, params=payload)
+ r = requests.get("https://api.digitalocean.com/v1/%s" % path, params=payload)
data = r.json()
self.call_response = data
if data['status'] != "OK":
@@ -56,6 +56,7 @@ class Manager(object):
droplet.id = jsoned['id']
droplet.ip_address = jsoned['ip_address']
droplet.private_ip_address = jsoned['private_ip_address']
+ droplet.created_at = jsoned['created_at']
droplet.client_id = self.client_id
droplet.api_key = self.api_key
droplets.append(droplet)
diff --git a/digitalocean/Record.py b/digitalocean/Record.py
index 4b4c028..d8415ca 100644
--- a/digitalocean/Record.py
+++ b/digitalocean/Record.py
@@ -16,7 +16,7 @@ class Record(object):
def __call_api(self, path, params=dict()):
payload = {'client_id': self.client_id, 'api_key': self.api_key}
payload.update(params)
- r = requests.get("https://api.digitalocean.com/domains/%s/records/%s%s" % (
+ r = requests.get("https://api.digitalocean.com/v1/domains/%s/records/%s%s" % (
self.domain_id, self.id, path), params=payload)
data = r.json()
self.call_response = data
diff --git a/digitalocean/SSHKey.py b/digitalocean/SSHKey.py
index 2e8c862..375b1ea 100644
--- a/digitalocean/SSHKey.py
+++ b/digitalocean/SSHKey.py
@@ -17,7 +17,7 @@ class SSHKey(object):
def __call_api(self, path, params=dict()):
payload = {'client_id': self.client_id, 'api_key': self.api_key}
payload.update(params)
- r = requests.get("https://api.digitalocean.com/ssh_keys/%s%s" % ( self.id, path ), params=payload)
+ r = requests.get("https://api.digitalocean.com/v1/ssh_keys/%s%s" % ( self.id, path ), params=payload)
data = r.json()
self.call_response = data
diff --git a/digitalocean/__init__.py b/digitalocean/__init__.py
index 6307ef6..a28bd98 100644
--- a/digitalocean/__init__.py
+++ b/digitalocean/__init__.py
@@ -15,3 +15,4 @@ from .Image import Image
from .Event import Event
from .Domain import Domain
from .Record import Record
+from .SSHKey import SSHKey
diff --git a/requirements.txt b/requirements.txt
index f229360..78a36b6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-requests
+requests>=2.0.0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-digitalocean.git
More information about the Python-modules-commits
mailing list