openstack/placement
Code Issues Proposed changes

Count floating ips to check quota

Browse Source 
This changes floating ips from a ReservableResource to a
CountableResource and replaces quota reserve/commit/rollback with
check_deltas accordingly. Note that floating ip quota is only
relevant to nova-network and will be obsolete when nova-network is
removed.

Part of blueprint cells-count-resources-to-check-quota-in-api

Change-Id: I9e6c16ebe73f2af11bcc47899f25289f08c1204a
This commit is contained in:
melanie witt 2017-03-31 17:37:08 +00:00
parent c098da89d4
commit 0a56f0a686
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nova/db/sqlalchemy/api.py
View File

@ -66,7 +66,6 @@ import nova.context
from nova.db.sqlalchemy import models
from nova import exception
from nova.i18n import _, _LI, _LE, _LW
from nova import quota
from nova import safe_utils
profiler_sqlalchemy = importutils.try_import('osprofiler.sqlalchemy')
@ -1001,20 +1000,6 @@ def floating_ip_bulk_destroy(context, ips):
filter(models.FloatingIp.address.in_(ip_block)).\
soft_delete(synchronize_session='fetch')
# Delete the quotas, if needed.
# Quota update happens in a separate transaction, so previous must have
# been committed first.
for project_id, count in project_id_to_quota_count.items():
try:
reservations = quota.QUOTAS.reserve(context,
project_id=project_id,
floating_ips=count)
quota.QUOTAS.commit(context, reservations, project_id=project_id)
except Exception:
with excutils.save_and_reraise_exception():
LOG.exception(_LE("Failed to update usages bulk "
"deallocating floating IP"))
@require_context
@pick_context_manager_writer