You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2015/06/14 12:52:28 UTC
[17/21] libcloud git commit: Cosmetic clean up
Cosmetic clean up
Signed-off-by: Tomaz Muraus <to...@tomaz.me>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/950fa949
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/950fa949
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/950fa949
Branch: refs/heads/trunk
Commit: 950fa949641b4ad2dba599edfbd8955e31b3956f
Parents: 9224e8e
Author: Javier Castillo II <j....@gmail.com>
Authored: Sun Apr 12 20:31:02 2015 +0000
Committer: Tomaz Muraus <to...@tomaz.me>
Committed: Sun Jun 14 18:05:58 2015 +0800
----------------------------------------------------------------------
libcloud/common/digitalocean.py | 5 +-
libcloud/compute/drivers/digitalocean.py | 21 ++++----
libcloud/dns/drivers/digitalocean.py | 54 +++++++++++----------
libcloud/test/common/test_digitalocean_v1.py | 14 +++---
libcloud/test/common/test_digitalocean_v2.py | 17 +++----
libcloud/test/compute/test_digitalocean_v1.py | 6 ++-
libcloud/test/compute/test_digitalocean_v2.py | 9 ++--
libcloud/test/dns/test_digitalocean.py | 56 +++++++++++-----------
8 files changed, 98 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/950fa949/libcloud/common/digitalocean.py
----------------------------------------------------------------------
diff --git a/libcloud/common/digitalocean.py b/libcloud/common/digitalocean.py
index 7d46881..53dcb60 100644
--- a/libcloud/common/digitalocean.py
+++ b/libcloud/common/digitalocean.py
@@ -109,6 +109,7 @@ class DigitalOcean_v2_Connection(ConnectionKey):
headers['Content-Type'] = 'application/json'
return headers
+
class DigitalOceanConnection(DigitalOcean_v2_Connection):
"""
Connection class for the DigitalOcean driver.
@@ -129,7 +130,7 @@ class DigitalOceanBaseDriver(BaseDriver):
def __new__(cls, key, secret=None, api_version='v2', **kwargs):
if cls is DigitalOceanBaseDriver:
- if api_version == 'v1' or secret != None:
+ if api_version == 'v1' or secret is not None:
cls = DigitalOcean_v1_BaseDriver
elif api_version == 'v2':
cls = DigitalOcean_v2_BaseDriver
@@ -150,7 +151,7 @@ class DigitalOceanBaseDriver(BaseDriver):
raise NotImplementedError(
'ex_get_event not implemented for this driver')
- def _paginated_request(self, event_id):
+ def _paginated_request(self, url, obj):
raise NotImplementedError(
'_paginated_requests not implemented for this driver')
http://git-wip-us.apache.org/repos/asf/libcloud/blob/950fa949/libcloud/compute/drivers/digitalocean.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/digitalocean.py b/libcloud/compute/drivers/digitalocean.py
index 1cb209b..0d9c0e7 100644
--- a/libcloud/compute/drivers/digitalocean.py
+++ b/libcloud/compute/drivers/digitalocean.py
@@ -18,11 +18,9 @@ Digital Ocean Driver
from libcloud.utils.py3 import httplib
-from libcloud.common.base import ConnectionUserAndKey, ConnectionKey
-from libcloud.common.base import JsonResponse
from libcloud.common.digitalocean import DigitalOcean_v1_BaseDriver
from libcloud.common.digitalocean import DigitalOcean_v2_BaseDriver
-from libcloud.compute.types import Provider, NodeState, InvalidCredsError
+from libcloud.compute.types import Provider, NodeState
from libcloud.compute.base import NodeDriver, Node
from libcloud.compute.base import NodeImage, NodeSize, NodeLocation, KeyPair
@@ -57,7 +55,7 @@ class DigitalOceanNodeDriver(NodeDriver):
def __new__(cls, key, secret=None, api_version='v2', **kwargs):
if cls is DigitalOceanNodeDriver:
- if api_version == 'v1' or secret != None:
+ if api_version == 'v1' or secret is not None:
cls = DigitalOcean_v1_NodeDriver
elif api_version == 'v2':
cls = DigitalOcean_v2_NodeDriver
@@ -66,6 +64,7 @@ class DigitalOceanNodeDriver(NodeDriver):
(api_version))
return super(DigitalOceanNodeDriver, cls).__new__(cls, **kwargs)
+
# TODO Implement v1 driver using KeyPair
class SSHKey(object):
def __init__(self, id, name, pub_key):
@@ -78,7 +77,8 @@ class SSHKey(object):
(self.id, self.name, self.pub_key))
-class DigitalOcean_v1_NodeDriver(DigitalOcean_v1_BaseDriver, DigitalOceanNodeDriver):
+class DigitalOcean_v1_NodeDriver(DigitalOcean_v1_BaseDriver,
+ DigitalOceanNodeDriver):
"""
DigitalOcean NodeDriver using v1 of the API.
"""
@@ -171,7 +171,7 @@ class DigitalOcean_v1_NodeDriver(DigitalOcean_v1_BaseDriver, DigitalOceanNodeDri
qkey.extra['id']).object['ssh_key']
return self._to_key_pair(data=data)
- #TODO: This adds the ssh_key_pub parameter. This puts the burden of making
+ # TODO: This adds the ssh_key_pub parameter. This puts the burden of making
# it within the function or on the API. The KeyPair API needs work.
def create_key_pair(self, name, ssh_key_pub):
"""
@@ -187,7 +187,7 @@ class DigitalOcean_v1_NodeDriver(DigitalOcean_v1_BaseDriver, DigitalOceanNodeDri
data = self.connection.request('/v1/ssh_keys/new/', method='GET',
params=params).object
assert 'ssh_key' in data
- #TODO: libcloud.compute.base.KeyPair.create_key_pair doesn't specify
+ # TODO: libcloud.compute.base.KeyPair.create_key_pair doesn't specify
# a return value. This looks like it should return a KeyPair
return self._to_key_pair(data=data['ssh_key'])
@@ -200,7 +200,7 @@ class DigitalOcean_v1_NodeDriver(DigitalOcean_v1_BaseDriver, DigitalOceanNodeDri
"""
res = self.connection.request('/v1/ssh_keys/%s/destroy/' %
key_pair.extra['id'])
- #TODO: This looks like it should return bool like the other delete_*
+ # TODO: This looks like it should return bool like the other delete_*
return res.status == httplib.OK
def _to_node(self, data):
@@ -251,14 +251,15 @@ class DigitalOcean_v1_NodeDriver(DigitalOcean_v1_BaseDriver, DigitalOceanNodeDri
except KeyError:
pubkey = None
return KeyPair(data['name'], public_key=pubkey, fingerprint=None,
- driver=self, private_key=None, extra={'id':data['id']})
+ driver=self, private_key=None, extra={'id': data['id']})
def _to_ssh_key(self, data):
return SSHKey(id=data['id'], name=data['name'],
pub_key=data.get('ssh_pub_key', None))
-class DigitalOcean_v2_NodeDriver(DigitalOcean_v2_BaseDriver, DigitalOceanNodeDriver):
+class DigitalOcean_v2_NodeDriver(DigitalOcean_v2_BaseDriver,
+ DigitalOceanNodeDriver):
"""
DigitalOcean NodeDriver using v2 of the API.
"""
http://git-wip-us.apache.org/repos/asf/libcloud/blob/950fa949/libcloud/dns/drivers/digitalocean.py
----------------------------------------------------------------------
diff --git a/libcloud/dns/drivers/digitalocean.py b/libcloud/dns/drivers/digitalocean.py
index 81e313f..3470fa0 100644
--- a/libcloud/dns/drivers/digitalocean.py
+++ b/libcloud/dns/drivers/digitalocean.py
@@ -23,26 +23,25 @@ __all__ = [
from libcloud.utils.py3 import httplib
from libcloud.common.digitalocean import DigitalOcean_v2_BaseDriver
-from libcloud.common.digitalocean import DigitalOceanConnection
-from libcloud.common.digitalocean import DigitalOceanResponse
+from libcloud.common.digitalocean import DigitalOcean_v2_Connection
from libcloud.dns.types import Provider, RecordType
-from libcloud.dns.types import ZoneDoesNotExistError, RecordDoesNotExistError
from libcloud.dns.base import DNSDriver, Zone, Record
class DigitalOceanDNSDriver(DigitalOcean_v2_BaseDriver, DNSDriver):
+ connectionCls = DigitalOcean_v2_Connection
type = Provider.DIGITAL_OCEAN
name = "DigitalOcean"
website = 'https://www.digitalocean.com'
RECORD_TYPE_MAP = {
- RecordType.NS : 'NS',
- RecordType.A : 'A',
- RecordType.AAAA : 'AAAA',
- RecordType.CNAME : 'CNAME',
- RecordType.MX : 'MX',
- RecordType.TXT : 'TXT',
- RecordType.SRV : 'SRV',
+ RecordType.NS: 'NS',
+ RecordType.A: 'A',
+ RecordType.AAAA: 'AAAA',
+ RecordType.CNAME: 'CNAME',
+ RecordType.MX: 'MX',
+ RecordType.TXT: 'TXT',
+ RecordType.SRV: 'SRV',
}
def list_zones(self):
@@ -79,7 +78,7 @@ class DigitalOceanDNSDriver(DigitalOcean_v2_BaseDriver, DNSDriver):
:rtype: :class:`Zone`
"""
data = self.connection.request('/v2/domains/%s' %
- (zone_id)).object['domain']
+ (zone_id)).object['domain']
return self._to_zone(data)
@@ -122,7 +121,7 @@ class DigitalOceanDNSDriver(DigitalOcean_v2_BaseDriver, DNSDriver):
:rtype: :class:`Zone`
"""
- params = {'name' : domain}
+ params = {'name': domain}
try:
params['ip_address'] = extra['ip']
except:
@@ -161,9 +160,9 @@ class DigitalOceanDNSDriver(DigitalOcean_v2_BaseDriver, DNSDriver):
:rtype: :class:`Record`
"""
params = {
- "type" : self.RECORD_TYPE_MAP[type],
- "name" : name,
- "data" : data
+ "type": self.RECORD_TYPE_MAP[type],
+ "name": name,
+ "data": data
}
if extra:
try:
@@ -184,10 +183,12 @@ class DigitalOceanDNSDriver(DigitalOcean_v2_BaseDriver, DNSDriver):
method='POST')
return Record(id=res.object['domain_record']['id'],
- name=res.object['domain_record']['name'],
- type=type, data=data, zone=zone, driver=self, extra=extra)
+ name=res.object['domain_record']['name'],
+ type=type, data=data, zone=zone,
+ driver=self, extra=extra)
- def update_record(self, record, name=None, type=None, data=None, extra=None):
+ def update_record(self, record, name=None, type=None,
+ data=None, extra=None):
"""
Update an existing record.
@@ -212,11 +213,11 @@ class DigitalOceanDNSDriver(DigitalOcean_v2_BaseDriver, DNSDriver):
:rtype: :class:`Record`
"""
params = {
- "type" : record.type,
- "name" : record.name,
- "data" : data
+ "type": record.type,
+ "name": record.name,
+ "data": data
}
- if data == None:
+ if data is None:
params['data'] = record.data
if extra:
try:
@@ -272,18 +273,19 @@ class DigitalOceanDNSDriver(DigitalOcean_v2_BaseDriver, DNSDriver):
params = {}
res = self.connection.request('/v2/domains/%s/records/%s' % (
- record.zone.id, record.id), params=params,
+ record.zone.id, record.id),
+ params=params,
method='DELETE')
return res.status == httplib.NO_CONTENT
def _to_record(self, data, zone=None):
- extra = {'port' : data['port'], 'priority' : data['priority'],
- 'weight' : data['weight']}
+ extra = {'port': data['port'], 'priority': data['priority'],
+ 'weight': data['weight']}
return Record(id=data['id'], name=data['name'],
type=self._string_to_record_type(data['type']),
data=data['data'], zone=zone, driver=self, extra=extra)
def _to_zone(self, data):
- extra = {'zone_file' : data['zone_file'],}
+ extra = {'zone_file': data['zone_file']}
return Zone(id=data['name'], domain=data['name'], type='master',
ttl=data['ttl'], driver=self, extra=extra)
http://git-wip-us.apache.org/repos/asf/libcloud/blob/950fa949/libcloud/test/common/test_digitalocean_v1.py
----------------------------------------------------------------------
diff --git a/libcloud/test/common/test_digitalocean_v1.py b/libcloud/test/common/test_digitalocean_v1.py
index 424a594..9e99c7f 100644
--- a/libcloud/test/common/test_digitalocean_v1.py
+++ b/libcloud/test/common/test_digitalocean_v1.py
@@ -33,7 +33,8 @@ class DigitalOceanTests(LibcloudTestCase):
def test_authentication(self):
DigitalOceanMockHttp.type = 'UNAUTHORIZED'
- self.assertRaises(InvalidCredsError, self.driver.ex_get_event, '12345670')
+ self.assertRaises(InvalidCredsError, self.driver.ex_get_event,
+ '12345670')
def test_ex_account_info(self):
self.assertRaises(NotImplementedError, self.driver.ex_account_info)
@@ -48,7 +49,8 @@ class DigitalOceanTests(LibcloudTestCase):
self.assertEqual(action["event"]["event_type_id"], 1)
def test__paginated_request(self):
- self.assertRaises(NotImplementedError, self.driver._paginated_request, '/v1/anything')
+ self.assertRaises(NotImplementedError, self.driver._paginated_request,
+ '/v1/anything', 'anything')
class DigitalOceanMockHttp(MockHttpTestCase):
@@ -58,7 +60,7 @@ class DigitalOceanMockHttp(MockHttpTestCase):
None: httplib.OK,
'CREATE': httplib.CREATED,
'DELETE': httplib.NO_CONTENT,
- 'EMPTY': httplib.OK,
+ 'EMPTY': httplib.OK,
'NOT_FOUND': httplib.NOT_FOUND,
'UNAUTHORIZED': httplib.UNAUTHORIZED,
'UPDATE': httplib.OK
@@ -66,14 +68,14 @@ class DigitalOceanMockHttp(MockHttpTestCase):
def _v1_events_12345670_UNAUTHORIZED(self, method, url, body, headers):
body = self.fixtures.load(
- '_v1_events_12345670_UNAUTHORIZED.json')
+ '_v1_events_12345670_UNAUTHORIZED.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v1_events_12345670(self, method, url, body, headers):
body = self.fixtures.load('_v1_events_12345670.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
if __name__ == '__main__':
http://git-wip-us.apache.org/repos/asf/libcloud/blob/950fa949/libcloud/test/common/test_digitalocean_v2.py
----------------------------------------------------------------------
diff --git a/libcloud/test/common/test_digitalocean_v2.py b/libcloud/test/common/test_digitalocean_v2.py
index b746c35..37b4929 100644
--- a/libcloud/test/common/test_digitalocean_v2.py
+++ b/libcloud/test/common/test_digitalocean_v2.py
@@ -37,7 +37,8 @@ class DigitalOceanTests(LibcloudTestCase):
def test_ex_account_info(self):
account_info = self.driver.ex_account_info()
- self.assertEqual(account_info['uuid'], 'a1234567890b1234567890c1234567890d12345')
+ self.assertEqual(account_info['uuid'],
+ 'a1234567890b1234567890c1234567890d12345')
self.assertTrue(account_info['email_verified'])
self.assertEqual(account_info['email'], 'user@domain.tld')
self.assertEqual(account_info['droplet_limit'], 10)
@@ -66,7 +67,7 @@ class DigitalOceanMockHttp(MockHttpTestCase):
None: httplib.OK,
'CREATE': httplib.CREATED,
'DELETE': httplib.NO_CONTENT,
- 'EMPTY': httplib.OK,
+ 'EMPTY': httplib.OK,
'NOT_FOUND': httplib.NOT_FOUND,
'UNAUTHORIZED': httplib.UNAUTHORIZED,
'UPDATE': httplib.OK
@@ -75,28 +76,28 @@ class DigitalOceanMockHttp(MockHttpTestCase):
def _v2_account(self, method, url, body, headers):
body = self.fixtures.load('_v2_account.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_account_UNAUTHORIZED(self, method, url, body, headers):
body = self.fixtures.load(
- '_v2_account_UNAUTHORIZED.json')
+ '_v2_account_UNAUTHORIZED.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_actions(self, method, url, body, headers):
body = self.fixtures.load('_v2_actions.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_actions_12345670(self, method, url, body, headers):
body = self.fixtures.load('_v2_actions_12345670.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_actions_page_1(self, method, url, body, headers):
body = self.fixtures.load('_v2_actions_page_1.json')
return (self.response[None], body, {},
- httplib.responses[self.response[None]])
+ httplib.responses[self.response[None]])
if __name__ == '__main__':
http://git-wip-us.apache.org/repos/asf/libcloud/blob/950fa949/libcloud/test/compute/test_digitalocean_v1.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_digitalocean_v1.py b/libcloud/test/compute/test_digitalocean_v1.py
index c8ff999..654935e 100644
--- a/libcloud/test/compute/test_digitalocean_v1.py
+++ b/libcloud/test/compute/test_digitalocean_v1.py
@@ -89,7 +89,8 @@ class DigitalOcean_v1_Tests(LibcloudTestCase):
location = self.driver.list_locations()[0]
DigitalOceanMockHttp.type = 'INVALID_IMAGE'
- expected_msg = r'You specified an invalid image for Droplet creation. \(code: 404\)'
+ expected_msg = \
+ r'You specified an invalid image for Droplet creation. \(code: 404\)'
self.assertRaisesRegexp(Exception, expected_msg,
self.driver.create_node,
name='test', size=size, image=image,
@@ -146,7 +147,8 @@ class DigitalOceanMockHttp(MockHttpTestCase):
def _v1_droplets_new_INVALID_IMAGE(self, method, url, body, headers):
# reboot_node
body = self.fixtures.load('error_invalid_image.json')
- return (httplib.NOT_FOUND, body, {}, httplib.responses[httplib.NOT_FOUND])
+ return (httplib.NOT_FOUND, body, {},
+ httplib.responses[httplib.NOT_FOUND])
def _v1_droplets_119461_reboot(self, method, url, body, headers):
# reboot_node
http://git-wip-us.apache.org/repos/asf/libcloud/blob/950fa949/libcloud/test/compute/test_digitalocean_v2.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_digitalocean_v2.py b/libcloud/test/compute/test_digitalocean_v2.py
index 127011a..0d00f41 100644
--- a/libcloud/test/compute/test_digitalocean_v2.py
+++ b/libcloud/test/compute/test_digitalocean_v2.py
@@ -88,7 +88,8 @@ class DigitalOcean_v2_Tests(LibcloudTestCase):
location = self.driver.list_locations()[0]
DigitalOceanMockHttp.type = 'INVALID_IMAGE'
- expected_msg = r'You specified an invalid image for Droplet creation. \(code: 404\)'
+ expected_msg = \
+ r'You specified an invalid image for Droplet creation. \(code: 404\)'
self.assertRaisesRegexp(Exception, expected_msg,
self.driver.create_node,
name='test', size=size, image=image,
@@ -216,7 +217,8 @@ class DigitalOceanMockHttp(MockHttpTestCase):
body = self.fixtures.load('ex_rename_node.json')
return (httplib.CREATED, body, {}, httplib.responses[httplib.CREATED])
- def _v2_droplets_3164444_actions_SNAPSHOT(self, method, url, body, headers):
+ def _v2_droplets_3164444_actions_SNAPSHOT(self, method, url,
+ body, headers):
# create_image
body = self.fixtures.load('create_image.json')
return (httplib.CREATED, body, {}, httplib.responses[httplib.CREATED])
@@ -236,7 +238,8 @@ class DigitalOceanMockHttp(MockHttpTestCase):
body = self.fixtures.load('ex_power_on_node.json')
return (httplib.CREATED, body, {}, httplib.responses[httplib.CREATED])
- def _v2_droplets_3164444_actions_SHUTDOWN(self, method, url, body, headers):
+ def _v2_droplets_3164444_actions_SHUTDOWN(self, method, url,
+ body, headers):
# ex_shutdown_node
body = self.fixtures.load('ex_shutdown_node.json')
return (httplib.CREATED, body, {}, httplib.responses[httplib.CREATED])
http://git-wip-us.apache.org/repos/asf/libcloud/blob/950fa949/libcloud/test/dns/test_digitalocean.py
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/test_digitalocean.py b/libcloud/test/dns/test_digitalocean.py
index e618631..f1bb92e 100644
--- a/libcloud/test/dns/test_digitalocean.py
+++ b/libcloud/test/dns/test_digitalocean.py
@@ -67,7 +67,8 @@ class DigitalOceanDNSTests(LibcloudTestCase):
zone = self.driver.get_zone('testdomain')
DigitalOceanDNSMockHttp.type = 'CREATE'
- record = self.driver.create_record('sub', zone, RecordType.A, '234.56.78.90')
+ record = self.driver.create_record('sub', zone,
+ RecordType.A, '234.56.78.90')
self.assertEqual(record.id, '1234565')
self.assertEqual(record.type, RecordType.A)
self.assertEqual(record.data, '234.56.78.90')
@@ -100,7 +101,7 @@ class DigitalOceanDNSMockHttp(MockHttpTestCase):
None: httplib.OK,
'CREATE': httplib.CREATED,
'DELETE': httplib.NO_CONTENT,
- 'EMPTY': httplib.OK,
+ 'EMPTY': httplib.OK,
'NOT_FOUND': httplib.NOT_FOUND,
'UNAUTHORIZED': httplib.UNAUTHORIZED,
'UPDATE': httplib.OK
@@ -109,101 +110,102 @@ class DigitalOceanDNSMockHttp(MockHttpTestCase):
def _v2_domains(self, method, url, body, headers):
body = self.fixtures.load('_v2_domains.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_domains_CREATE(self, method, url, body, headers):
body = self.fixtures.load('_v2_domains_CREATE.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_domains_EMPTY(self, method, url, body, headers):
body = self.fixtures.load('_v2_domains_EMPTY.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_domains_UNAUTHORIZED(self, method, url, body, headers):
body = self.fixtures.load('_v2_domains_UNAUTHORIZED.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_domains_testdomain(self, method, url, body, headers):
body = self.fixtures.load('_v2_domains_testdomain.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_domains_testdomain_DELETE(self, method, url, body, headers):
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_domains_testdomain_NOT_FOUND(self, method, url, body, headers):
body = self.fixtures.load('_v2_domains_testdomain_NOT_FOUND.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_domains_testdomain_records(self, method, url, body, headers):
body = self.fixtures.load('_v2_domains_testdomain_records.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
- def _v2_domains_testdomain_records_CREATE(self, method, url, body, headers):
+ def _v2_domains_testdomain_records_CREATE(self, method, url,
+ body, headers):
body = self.fixtures.load('_v2_domains_testdomain_records_CREATE.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_domains_testdomain_records_1234560(
self, method, url, body, headers):
body = self.fixtures.load(
- '_v2_domains_testdomain_records_1234560.json')
+ '_v2_domains_testdomain_records_1234560.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_domains_testdomain_records_1234561(
self, method, url, body, headers):
body = self.fixtures.load(
- '_v2_domains_testdomain_records_1234561.json')
+ '_v2_domains_testdomain_records_1234561.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_domains_testdomain_records_1234562(
self, method, url, body, headers):
body = self.fixtures.load(
- '_v2_domains_testdomain_records_1234562.json')
+ '_v2_domains_testdomain_records_1234562.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_domains_testdomain_records_1234563(
self, method, url, body, headers):
body = self.fixtures.load(
- '_v2_domains_testdomain_records_1234563.json')
+ '_v2_domains_testdomain_records_1234563.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_domains_testdomain_records_1234564(
self, method, url, body, headers):
body = self.fixtures.load(
- '_v2_domains_testdomain_records_1234564.json')
+ '_v2_domains_testdomain_records_1234564.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_domains_testdomain_records_1234564_DELETE(
self, method, url, body, headers):
self.type = 'DELETE'
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_domains_testdomain_records_1234564_NOT_FOUND(
self, method, url, body, headers):
body = self.fixtures.load(
- '_v2_domains_testdomain_records_1234564_NOT_FOUND.json')
+ '_v2_domains_testdomain_records_1234564_NOT_FOUND.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
def _v2_domains_testdomain_records_1234564_UPDATE(
self, method, url, body, headers):
body = self.fixtures.load(
- '_v2_domains_testdomain_records_1234564_UPDATE.json')
+ '_v2_domains_testdomain_records_1234564_UPDATE.json')
return (self.response[self.type], body, {},
- httplib.responses[self.response[self.type]])
+ httplib.responses[self.response[self.type]])
if __name__ == '__main__':
sys.exit(unittest.main())