summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-04-01 19:50:56 +0000
committerGerrit Code Review <review@openstack.org>2013-04-01 19:50:56 +0000
commit2f5168a92b3509aafa2d2905ab128f3857ddbcaa (patch)
treef2267d8973ce74b983ad1d69086e7750eb4832cb /nova/exception.py
parent0d8772977eb7e09c7ad404f32937999470b359b9 (diff)
parent8a80c4c0968a9deceaa6d99629c6d7f7889769e5 (diff)
downloadnova-2f5168a92b3509aafa2d2905ab128f3857ddbcaa.tar.gz
nova-2f5168a92b3509aafa2d2905ab128f3857ddbcaa.tar.xz
nova-2f5168a92b3509aafa2d2905ab128f3857ddbcaa.zip
Merge "Return proper error message when network conflicts"
Diffstat (limited to 'nova/exception.py')
-rw-r--r--nova/exception.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/exception.py b/nova/exception.py
index 43f02b7cb..b3b3d1f1f 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -1083,6 +1083,11 @@ class DuplicateVlan(Duplicate):
message = _("Detected existing vlan with id %(vlan)d")
+class CidrConflict(NovaException):
+ message = _("There was a conflict when trying to complete your request.")
+ code = 409
+
+
class InstanceNotFound(NotFound):
message = _("Instance %(instance_id)s could not be found.")