summaryrefslogtreecommitdiffstats
path: root/nova/quota.py
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-12-16 22:52:08 +0000
committerVishvananda Ishaya <vishvananda@gmail.com>2010-12-16 22:52:08 +0000
commit26ebccc8d92aba23efa1663fe9949c141a4cc671 (patch)
treeb5c5724d1f806051ffd30b9a8596c52f6a890351 /nova/quota.py
parentdc29400d104d34c6383132a43e018f7724e85ec3 (diff)
parentcd460a1f661eea7e050891f50a8218fdf24f2c6f (diff)
downloadnova-26ebccc8d92aba23efa1663fe9949c141a4cc671.tar.gz
nova-26ebccc8d92aba23efa1663fe9949c141a4cc671.tar.xz
nova-26ebccc8d92aba23efa1663fe9949c141a4cc671.zip
merged trunk, fixed conflicts and tests
Diffstat (limited to 'nova/quota.py')
-rw-r--r--nova/quota.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/quota.py b/nova/quota.py
index 01dd0ecd4..f6ca9f77c 100644
--- a/nova/quota.py
+++ b/nova/quota.py
@@ -94,3 +94,8 @@ def allowed_floating_ips(context, num_floating_ips):
quota = get_quota(context, project_id)
allowed_floating_ips = quota['floating_ips'] - used_floating_ips
return min(num_floating_ips, allowed_floating_ips)
+
+
+class QuotaError(exception.ApiError):
+ """Quota Exceeeded"""
+ pass