openstack/placement
Code Issues Proposed changes

Count networks to check quota

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

Co-Authored-By: melanie witt <melwittt@gmail.com>

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

Change-Id: If2e279728be056566829ae58d45d31801cd59b6c
This commit is contained in:
Dan Smith 2017-03-15 16:19:14 -07:00 committed by melanie witt
parent 7d54cfcdb0
commit c098da89d4
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nova/tests/fixtures.py
View File

@ -31,6 +31,7 @@ from oslo_config import cfg
import oslo_messaging as messaging import oslo_messaging as messaging
from oslo_messaging import conffixture as messaging_conffixture from oslo_messaging import conffixture as messaging_conffixture
from nova.api.openstack.compute import tenant_networks
from nova.api.openstack.placement import deploy as placement_deploy from nova.api.openstack.placement import deploy as placement_deploy
from nova.compute import rpcapi as compute_rpcapi from nova.compute import rpcapi as compute_rpcapi
from nova import context from nova import context
@ -41,6 +42,7 @@ from nova.network import model as network_model
from nova import objects from nova import objects
from nova.objects import base as obj_base from nova.objects import base as obj_base
from nova.objects import service as service_obj from nova.objects import service as service_obj
from nova import quota as nova_quota
from nova import rpc from nova import rpc
from nova import service from nova import service
from nova.tests.functional.api import client from nova.tests.functional.api import client
@ -989,6 +991,18 @@ class AllServicesCurrent(fixtures.Fixture):
return service_obj.SERVICE_VERSION return service_obj.SERVICE_VERSION
class RegisterNetworkQuota(fixtures.Fixture):
def setUp(self):
super(RegisterNetworkQuota, self).setUp()
# Quota resource registration modifies the global QUOTAS engine, so
# this fixture registers and unregisters network quota for a test.
tenant_networks._register_network_quota()
self.addCleanup(self.cleanup)
def cleanup(self):
nova_quota.QUOTAS._resources.pop('networks', None)
class NeutronFixture(fixtures.Fixture): class NeutronFixture(fixtures.Fixture):
"""A fixture to boot instances with neutron ports""" """A fixture to boot instances with neutron ports"""