diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-06 22:22:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-06 22:22:52 +0000 |
| commit | 8eee9613d828d93cbc69070dc4017e1ef463dec4 (patch) | |
| tree | 9ec2fc4d591984f214e2481db6860ae7120bf8e9 | |
| parent | 072458d3476f65c0d0e91305a4c1a0c6dbb8da1a (diff) | |
| parent | 35e01f5206bfa284b5e3add76aac90f879f42e5c (diff) | |
| download | python-troveclient-0.1.2.alpha1.tar.gz | |
Merge "Fixes data type bug in get-user call"0.1.2.alpha1
| -rw-r--r-- | reddwarfclient/auth.py | 2 | ||||
| -rw-r--r-- | reddwarfclient/users.py | 4 | ||||
| -rw-r--r-- | tests/test_auth.py | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/reddwarfclient/auth.py b/reddwarfclient/auth.py index a0f6e24..4494447 100644 --- a/reddwarfclient/auth.py +++ b/reddwarfclient/auth.py @@ -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 diff --git a/reddwarfclient/users.py b/reddwarfclient/users.py index 7da5ae7..505703c 100644 --- a/reddwarfclient/users.py +++ b/reddwarfclient/users.py @@ -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. """ diff --git a/tests/test_auth.py b/tests/test_auth.py index 58b0b93..f1c4b59 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -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) |