openstack/openstacksdk
Code Issues Proposed changes

Merge "Add 409 ConflictException"

Browse Source
This commit is contained in:
Zuul
2018-03-22 13:18:42 +00:00
committed by Gerrit Code Review
parent 43a2335744 23ed0aa481
commit ed6526b17e
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openstack/exceptions.py
View File

@@ -118,6 +118,11 @@ class BadRequestException(HttpException):
pass pass
class ConflictException(HttpException):
"""HTTP 409 Conflict."""
pass
class MethodNotSupported(SDKException): class MethodNotSupported(SDKException):
"""The resource does not support this operation type.""" """The resource does not support this operation type."""
def __init__(self, resource, method): def __init__(self, resource, method):
@@ -162,7 +167,9 @@ def raise_from_response(response, error_message=None):
if response.status_code < 400: if response.status_code < 400:
return return
if response.status_code == 404: if response.status_code == 409:
cls = ConflictException
elif response.status_code == 404:
cls = NotFoundException cls = NotFoundException
elif response.status_code == 400: elif response.status_code == 400:
cls = BadRequestException cls = BadRequestException

2
openstack/tests/unit/cloud/test_domains.py
View File

@@ -203,7 +203,7 @@ class TestDomains(base.TestCase):
json=domain_data.json_response, json=domain_data.json_response,
validate=dict(json={'domain': {'enabled': False}}))]) validate=dict(json={'domain': {'enabled': False}}))])
with testtools.ExpectedException( with testtools.ExpectedException(
openstack.cloud.OpenStackCloudHTTPError, openstack.exceptions.ConflictException,
"Error in updating domain %s" % domain_data.domain_id "Error in updating domain %s" % domain_data.domain_id
): ):
self.cloud.delete_domain(domain_data.domain_id) self.cloud.delete_domain(domain_data.domain_id)