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

Jenkins · openstack-gerrit · commit 8eee9613d828 · 2013-03-06T22:22:52.000Z
diff --git a/reddwarfclient/auth.py b/reddwarfclient/auth.py
@@ -251,7 +251,7 @@ def _url_for(self, attr=None, filter_value=None,
             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
@@ -86,9 +86,7 @@ def get(self, instance_id, user):
         """
         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
@@ -400,7 +400,7 @@ def case_iterating_services_in_catalog(self, scObj):
         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)
 
