openstack
/
python-troveclient
Code Issues Proposed changes

Merge "Fixes data type bug in get-user call"

This commit is contained in:
Jenkins 2013-03-06 22:22:52 +00:00 committed by Gerrit Code Review
parent 072458d347 35e01f5206
commit 8eee9613d8
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reddwarfclient/auth.py
View File

@ -251,7 +251,7 @@ class ServiceCatalog(object):
if service.get("type") != self.service_type:
continue
if (self.service_name and self.service_type == 'reddwarf' and
if (self.service_name and self.service_type == 'database' and
service.get('name') != self.service_name):
continue

4
reddwarfclient/users.py
View File

@ -86,9 +86,7 @@ class Users(base.ManagerWithFind):
"""
username = quote(user)
url = "/instances/%s/users/%s" % (instance_id, username)
resp, body = self.api.client.get(url)
check_for_exceptions(resp, body)
return self.resource_class(self, body)
return self._get(url, "user")
def list_access(self, instance, user):
"""Show all databases the given user has access to. """

2
tests/test_auth.py
View File

@ -400,7 +400,7 @@ class ServiceCatalogTest(TestCase):
scObj.catalog[scObj.root_key]['serviceCatalog'] = [service1]
self.assertRaises(exceptions.EndpointNotFound, scObj._url_for)
scObj.service_type = "reddwarf"
scObj.service_type = "database"
scObj.service_name = "no_match"
self.assertRaises(exceptions.EndpointNotFound, scObj._url_for)