Raise NotFound error when retrieved by not uuid
On identity-projects page: Retrieve project list filtered by id which is not uuid format like '%', there will throw an error message on top-right page. And the same for identity-users page. It is reasonable that return an empty list without error prompt. Change-Id: I65aec86f4d894a9789eef6fc093ed95a95c46d9f Closes-Bug: #1800600
This commit is contained in:
parent
9219ada359
commit
ac88796410
|
@ -20,6 +20,8 @@
|
||||||
import collections
|
import collections
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from oslo_utils import uuidutils
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
import six
|
import six
|
||||||
|
@ -347,6 +349,9 @@ def is_domain_admin(request):
|
||||||
# tenant commands.
|
# tenant commands.
|
||||||
@profiler.trace
|
@profiler.trace
|
||||||
def tenant_get(request, project, admin=True):
|
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)
|
manager = VERSIONS.get_project_manager(request, admin=admin)
|
||||||
try:
|
try:
|
||||||
return manager.get(project)
|
return manager.get(project)
|
||||||
|
@ -466,6 +471,9 @@ def user_delete(request, user_id):
|
||||||
|
|
||||||
@profiler.trace
|
@profiler.trace
|
||||||
def user_get(request, user_id, admin=True):
|
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)
|
user = keystoneclient(request, admin=admin).users.get(user_id)
|
||||||
return VERSIONS.upgrade_v2_user(user)
|
return VERSIONS.upgrade_v2_user(user)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue