Merge "Revert "Raise NotFound error when retrieved by not uuid""
This commit is contained in:
commit
cd8fae0631
|
@ -20,8 +20,6 @@
|
|||
import collections
|
||||
import logging
|
||||
|
||||
from oslo_utils import uuidutils
|
||||
|
||||
from django.conf import settings
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
import six
|
||||
|
@ -348,9 +346,6 @@ def is_domain_admin(request):
|
|||
# tenant commands.
|
||||
@profiler.trace
|
||||
def tenant_get(request, project, admin=True):
|
||||
if not uuidutils.is_uuid_like(project):
|
||||
raise keystone_exceptions.NotFound()
|
||||
|
||||
manager = VERSIONS.get_project_manager(request, admin=admin)
|
||||
try:
|
||||
return manager.get(project)
|
||||
|
@ -470,9 +465,6 @@ def user_delete(request, user_id):
|
|||
|
||||
@profiler.trace
|
||||
def user_get(request, user_id, admin=True):
|
||||
if not uuidutils.is_uuid_like(user_id):
|
||||
raise keystone_exceptions.NotFound()
|
||||
|
||||
user = keystoneclient(request, admin=admin).users.get(user_id)
|
||||
return VERSIONS.upgrade_v2_user(user)
|
||||
|
||||
|
|
Loading…
Reference in New Issue