x/python-tatuclient
Code Issues Proposed changes

Sync with openstack/requirements

Browse Source 
Change-Id: Id92c17cf2cd11bf653afabd2e283519f94a5dc50
This commit is contained in:
Kiall Mac Innes
2013-06-25 13:01:08 +01:00
parent d37eeaf7fc
commit 479c70fadd
9 changed files with 43 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
designateclient/v1/__init__.py
View File

@@ -78,15 +78,15 @@ class Client(object):
response = func(*args, **kw)
if response.status_code == 400:
raise exceptions.BadRequest(**response.json)
raise exceptions.BadRequest(**response.json())
elif response.status_code in (401, 403):
raise exceptions.Forbidden(**response.json)
raise exceptions.Forbidden(**response.json())
elif response.status_code == 404:
raise exceptions.NotFound(**response.json)
raise exceptions.NotFound(**response.json())
elif response.status_code == 409:
raise exceptions.Conflict(**response.json)
raise exceptions.Conflict(**response.json())
elif response.status_code == 500:
raise exceptions.Unknown(**response.json)
raise exceptions.Unknown(**response.json())
else:
return response

8
designateclient/v1/diagnostics.py
View File

@@ -24,7 +24,7 @@ class DiagnosticsController(Controller):
response = self.client.get('/diagnostics/ping/%s/%s' %
(service, host))
return response.json
return response.json()
def sync_all(self):
"""
@@ -32,7 +32,7 @@ class DiagnosticsController(Controller):
"""
response = self.client.post('/diagnostics/sync/all')
return response.json
return response.json()
def sync_domain(self, domain_id):
"""
@@ -41,7 +41,7 @@ class DiagnosticsController(Controller):
response = self.client.post('/diagnostics/sync/domain/%s' %
domain_id)
return response.json
return response.json()
def sync_record(self, domain_id, record_id):
"""
@@ -50,4 +50,4 @@ class DiagnosticsController(Controller):
response = self.client.post('/diagnostics/sync/record/%s/%s' %
(domain_id, record_id))
return response.json
return response.json()

10
designateclient/v1/domains.py
View File

@@ -32,7 +32,7 @@ class DomainsController(CrudController):
"""
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):
"""
@@ -43,7 +43,7 @@ class DomainsController(CrudController):
"""
response = self.client.get('/domains/%s' % domain_id)
return Domain(response.json)
return Domain(response.json())
def create(self, domain):
"""
@@ -54,7 +54,7 @@ class DomainsController(CrudController):
"""
response = self.client.post('/domains', data=json.dumps(domain))
return Domain(response.json)
return Domain(response.json())
def update(self, domain):
"""
@@ -66,7 +66,7 @@ class DomainsController(CrudController):
response = self.client.put('/domains/%s' % domain.id,
data=json.dumps(domain.changes))
return Domain(response.json)
return Domain(response.json())
def delete(self, domain):
"""
@@ -88,4 +88,4 @@ class DomainsController(CrudController):
"""
response = self.client.get('/domains/%s/servers' % domain_id)
return [Server(i) for i in response.json['servers']]
return [Server(i) for i in response.json()['servers']]

8
designateclient/v1/records.py
View File

@@ -37,7 +37,7 @@ class RecordsController(CrudController):
'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):
"""
@@ -56,7 +56,7 @@ class RecordsController(CrudController):
response = self.client.get(uri)
return Record(response.json)
return Record(response.json())
def create(self, domain, record):
"""
@@ -74,7 +74,7 @@ class RecordsController(CrudController):
response = self.client.post(uri, data=json.dumps(record))
return Record(response.json)
return Record(response.json())
def update(self, domain, record):
"""
@@ -93,7 +93,7 @@ class RecordsController(CrudController):
response = self.client.put(uri, data=json.dumps(record.changes))
return Record(response.json)
return Record(response.json())
def delete(self, domain, record):
"""

12
designateclient/v1/reports.py
View File

@@ -23,7 +23,7 @@ class ReportsController(Controller):
"""
response = self.client.get('/reports/counts')
return response.json
return response.json()
def count_domains(self):
"""
@@ -31,7 +31,7 @@ class ReportsController(Controller):
"""
response = self.client.get('/reports/counts/domains')
return response.json
return response.json()
def count_tenants(self):
"""
@@ -39,7 +39,7 @@ class ReportsController(Controller):
"""
response = self.client.get('/reports/counts/tenants')
return response.json
return response.json()
def count_records(self):
"""
@@ -47,7 +47,7 @@ class ReportsController(Controller):
"""
response = self.client.get('/reports/counts/records')
return response.json
return response.json()
def tenants_all(self):
"""
@@ -55,7 +55,7 @@ class ReportsController(Controller):
"""
response = self.client.get('/reports/tenants')
return response.json['tenants']
return response.json()['tenants']
def tenant_domains(self, other_tenant_id):
"""
@@ -64,4 +64,4 @@ class ReportsController(Controller):
response = self.client.get('/reports/tenants/%s' %
other_tenant_id)
return [{'domain': d} for d in response.json['domains']]
return [{'domain': d} for d in response.json()['domains']]

8
designateclient/v1/servers.py
View File

@@ -31,7 +31,7 @@ class ServersController(CrudController):
"""
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):
"""
@@ -42,7 +42,7 @@ class ServersController(CrudController):
"""
response = self.client.get('/servers/%s' % server_id)
return Server(response.json)
return Server(response.json())
def create(self, server):
"""
@@ -53,7 +53,7 @@ class ServersController(CrudController):
"""
response = self.client.post('/servers', data=json.dumps(server))
return Server(response.json)
return Server(response.json())
def update(self, server):
"""
@@ -65,7 +65,7 @@ class ServersController(CrudController):
response = self.client.put('/servers/%s' % server.id,
data=json.dumps(server.changes))
return Server(response.json)
return Server(response.json())
def delete(self, server):
"""

2
designateclient/warlock.py
View File

@@ -40,7 +40,7 @@ def model_factory(schema):
def validator(obj):
"""Apply a JSON schema to an object"""
try:
jsonschema.validate(obj, schema)
jsonschema.validate(obj, schema, cls=jsonschema.Draft3Validator)
except jsonschema.ValidationError, e:
raise ValidationError(str(e))

13
requirements.txt
View File

@@ -1,8 +1,9 @@
# This file is managed by openstack-depends
cliff>=1.4
d2to1>=0.2.10,<0.3
pbr>=0.5,<0.6
cliff>=1.2.1
jsonschema>=0.8,<1
stevedore
requests>=0.8.3,<1.0
python-keystoneclient>=0.2.0
jsonschema>=1.0.0,!=1.4.0,<2
keyring
pbr>=0.5.16,<0.6
python-keystoneclient>=0.2,<0.3
requests>=1.1,<1.2.1
stevedore>=0.9

19
test-requirements.txt
View File

@@ -1,15 +1,10 @@
# Packages needed for dev testing
distribute>=0.6.24
# Install bounded pep8/pyflakes first, then let flake8 install
pep8==1.4.5
pyflakes==0.7.2
# This file is managed by openstack-depends
coverage>=3.6
flake8==2.0
hacking>=0.5.3,<0.6
coverage>=3.6
mox
mox>=0.5.3
pep8==1.4.5
pyflakes==0.7.2
python-subunit
sphinx
testrepository
sphinx>=1.1.2
testrepository>=0.0.13