Merge "Fix improper prompt when update RC with existed one's name."
This commit is contained in:
commit
227a4dff25
|
@ -183,7 +183,7 @@ def update_resource_class(req):
|
||||||
except exception.ResourceClassExists:
|
except exception.ResourceClassExists:
|
||||||
raise webob.exc.HTTPConflict(
|
raise webob.exc.HTTPConflict(
|
||||||
_('Resource class already exists: %(name)s') %
|
_('Resource class already exists: %(name)s') %
|
||||||
{'name': name},
|
{'name': rc.name},
|
||||||
json_formatter=util.json_error_formatter)
|
json_formatter=util.json_error_formatter)
|
||||||
except exception.ResourceClassCannotUpdateStandard:
|
except exception.ResourceClassCannotUpdateStandard:
|
||||||
raise webob.exc.HTTPBadRequest(
|
raise webob.exc.HTTPBadRequest(
|
||||||
|
|
|
@ -151,6 +151,7 @@ tests:
|
||||||
status: 409
|
status: 409
|
||||||
response_strings:
|
response_strings:
|
||||||
- Resource class already exists
|
- Resource class already exists
|
||||||
|
- $ENVIRON['CUSTOM_RES_CLASS']
|
||||||
|
|
||||||
- name: update custom resource class
|
- name: update custom resource class
|
||||||
PUT: /resource_classes/$ENVIRON['CUSTOM_RES_CLASS']
|
PUT: /resource_classes/$ENVIRON['CUSTOM_RES_CLASS']
|
||||||
|
|
Loading…
Reference in New Issue