openstack/nova
Code Issues Proposed changes

Merge "Remove duplicate error info"

Browse Source
This commit is contained in:
Zuul
2017-10-24 13:01:49 +00:00
committed by Gerrit Code Review
parent 4cacf26bef 2ae0647920
commit d82a3a25fa
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/api/openstack/placement/handlers/resource_class.py
View File

@@ -111,12 +111,10 @@ def delete_resource_class(req):
rc.destroy() rc.destroy()
except exception.ResourceClassCannotDeleteStandard as exc: except exception.ResourceClassCannotDeleteStandard as exc:
raise webob.exc.HTTPBadRequest( raise webob.exc.HTTPBadRequest(
_('Cannot delete standard resource class %(rp_name)s: %(error)s') % _('Error in delete resource class: %(error)s') % {'error': exc})
{'rp_name': name, 'error': exc})
except exception.ResourceClassInUse as exc: except exception.ResourceClassInUse as exc:
raise webob.exc.HTTPConflict( raise webob.exc.HTTPConflict(
_('Unable to delete resource class %(rp_name)s: %(error)s') % _('Error in delete resource class: %(error)s') % {'error': exc})
{'rp_name': name, 'error': exc})
req.response.status = 204 req.response.status = 204
req.response.content_type = None req.response.content_type = None
return req.response return req.response

6
nova/tests/functional/api/openstack/placement/gabbits/resource-class-in-use.yaml
View File

@@ -55,7 +55,7 @@ tests:
DELETE: /resource_classes/CUSTOM_GOLD DELETE: /resource_classes/CUSTOM_GOLD
status: 409 status: 409
response_strings: response_strings:
- Unable to delete resource class - Error in delete resource class
- Class is in use in inventory - Class is in use in inventory
- name: delete the allocation - name: delete the allocation
@@ -66,7 +66,7 @@ tests:
DELETE: /resource_classes/CUSTOM_GOLD DELETE: /resource_classes/CUSTOM_GOLD
status: 409 status: 409
response_strings: response_strings:
- Unable to delete resource class - Error in delete resource class
- Class is in use in inventory - Class is in use in inventory
- name: delete the inventory - name: delete the inventory
@@ -75,4 +75,4 @@ tests:
- name: delete resource class - name: delete resource class
DELETE: /resource_classes/CUSTOM_GOLD DELETE: /resource_classes/CUSTOM_GOLD
status: 204 status: 204