Actually use the *correct* version of requests.
Follow up to I17ca5e80 - I misread and assumed a < was a >. Change-Id: I77d5d73d01d0b5129e963a2d8670002fc457ff57
This commit is contained in:
parent
13c601cc9c
commit
1258c120b9
@ -72,7 +72,7 @@ class Client(object):
|
|||||||
response = func(*args, **kw)
|
response = func(*args, **kw)
|
||||||
|
|
||||||
if response.status_code == 400:
|
if response.status_code == 400:
|
||||||
raise exceptions.BadRequest(response.json()['errors'])
|
raise exceptions.BadRequest(response.json['errors'])
|
||||||
elif response.status_code in (401, 403):
|
elif response.status_code in (401, 403):
|
||||||
raise exceptions.Forbidden()
|
raise exceptions.Forbidden()
|
||||||
elif response.status_code == 404:
|
elif response.status_code == 404:
|
||||||
|
@ -31,7 +31,7 @@ class DomainsController(Controller):
|
|||||||
"""
|
"""
|
||||||
response = self.client.get('/domains')
|
response = self.client.get('/domains')
|
||||||
|
|
||||||
return [Domain(i) for i in response.json()['domains']]
|
return [Domain(i) for i in response.json['domains']]
|
||||||
|
|
||||||
def get(self, domain_id):
|
def get(self, domain_id):
|
||||||
"""
|
"""
|
||||||
@ -42,7 +42,7 @@ class DomainsController(Controller):
|
|||||||
"""
|
"""
|
||||||
response = self.client.get('/domains/%s' % domain_id)
|
response = self.client.get('/domains/%s' % domain_id)
|
||||||
|
|
||||||
return Domain(response.json())
|
return Domain(response.json)
|
||||||
|
|
||||||
def create(self, domain):
|
def create(self, domain):
|
||||||
"""
|
"""
|
||||||
@ -53,7 +53,7 @@ class DomainsController(Controller):
|
|||||||
"""
|
"""
|
||||||
response = self.client.post('/domains', data=json.dumps(domain))
|
response = self.client.post('/domains', data=json.dumps(domain))
|
||||||
|
|
||||||
return Domain(response.json())
|
return Domain(response.json)
|
||||||
|
|
||||||
def update(self, domain):
|
def update(self, domain):
|
||||||
"""
|
"""
|
||||||
@ -65,7 +65,7 @@ class DomainsController(Controller):
|
|||||||
response = self.client.put('/domains/%s' % domain.id,
|
response = self.client.put('/domains/%s' % domain.id,
|
||||||
data=json.dumps(domain.changes))
|
data=json.dumps(domain.changes))
|
||||||
|
|
||||||
return Domain(response.json())
|
return Domain(response.json)
|
||||||
|
|
||||||
def delete(self, domain):
|
def delete(self, domain):
|
||||||
"""
|
"""
|
||||||
|
@ -37,7 +37,7 @@ class RecordsController(Controller):
|
|||||||
'domain_id': domain_id
|
'domain_id': domain_id
|
||||||
})
|
})
|
||||||
|
|
||||||
return [Record(i) for i in response.json()['records']]
|
return [Record(i) for i in response.json['records']]
|
||||||
|
|
||||||
def get(self, domain, record_id):
|
def get(self, domain, record_id):
|
||||||
"""
|
"""
|
||||||
@ -56,7 +56,7 @@ class RecordsController(Controller):
|
|||||||
|
|
||||||
response = self.client.get(uri)
|
response = self.client.get(uri)
|
||||||
|
|
||||||
return Record(response.json())
|
return Record(response.json)
|
||||||
|
|
||||||
def create(self, domain, record):
|
def create(self, domain, record):
|
||||||
"""
|
"""
|
||||||
@ -74,7 +74,7 @@ class RecordsController(Controller):
|
|||||||
|
|
||||||
response = self.client.post(uri, data=json.dumps(record))
|
response = self.client.post(uri, data=json.dumps(record))
|
||||||
|
|
||||||
return Record(response.json())
|
return Record(response.json)
|
||||||
|
|
||||||
def update(self, domain, record):
|
def update(self, domain, record):
|
||||||
"""
|
"""
|
||||||
@ -93,7 +93,7 @@ class RecordsController(Controller):
|
|||||||
|
|
||||||
response = self.client.put(uri, data=json.dumps(record.changes))
|
response = self.client.put(uri, data=json.dumps(record.changes))
|
||||||
|
|
||||||
return Record(response.json())
|
return Record(response.json)
|
||||||
|
|
||||||
def delete(self, domain, record):
|
def delete(self, domain, record):
|
||||||
"""
|
"""
|
||||||
|
@ -31,7 +31,7 @@ class ServersController(Controller):
|
|||||||
"""
|
"""
|
||||||
response = self.client.get('/servers')
|
response = self.client.get('/servers')
|
||||||
|
|
||||||
return [Server(i) for i in response.json()['servers']]
|
return [Server(i) for i in response.json['servers']]
|
||||||
|
|
||||||
def get(self, server_id):
|
def get(self, server_id):
|
||||||
"""
|
"""
|
||||||
@ -42,7 +42,7 @@ class ServersController(Controller):
|
|||||||
"""
|
"""
|
||||||
response = self.client.get('/servers/%s' % server_id)
|
response = self.client.get('/servers/%s' % server_id)
|
||||||
|
|
||||||
return Server(response.json())
|
return Server(response.json)
|
||||||
|
|
||||||
def create(self, server):
|
def create(self, server):
|
||||||
"""
|
"""
|
||||||
@ -53,7 +53,7 @@ class ServersController(Controller):
|
|||||||
"""
|
"""
|
||||||
response = self.client.post('/servers', data=json.dumps(server))
|
response = self.client.post('/servers', data=json.dumps(server))
|
||||||
|
|
||||||
return Server(response.json())
|
return Server(response.json)
|
||||||
|
|
||||||
def update(self, server):
|
def update(self, server):
|
||||||
"""
|
"""
|
||||||
@ -65,7 +65,7 @@ class ServersController(Controller):
|
|||||||
response = self.client.put('/servers/%s' % server.id,
|
response = self.client.put('/servers/%s' % server.id,
|
||||||
data=json.dumps(server.changes))
|
data=json.dumps(server.changes))
|
||||||
|
|
||||||
return Server(response.json())
|
return Server(response.json)
|
||||||
|
|
||||||
def delete(self, server):
|
def delete(self, server):
|
||||||
"""
|
"""
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
cliff>=1.2.1
|
cliff>=1.2.1
|
||||||
jsonschema>=0.7
|
jsonschema>=0.7
|
||||||
requests>1.0
|
requests>=0.8.3,<1.0
|
||||||
python-keystoneclient>=0.2.0
|
python-keystoneclient>=0.2.0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user