From 362bd7fd09a5c6ff67e751ae5927f5b45deeac11 Mon Sep 17 00:00:00 2001 From: Zhongyue Luo Date: Wed, 15 May 2013 08:36:11 +0800 Subject: [PATCH] Reference QUOTA OptGoup names in lowercase To have consistent option group name format across projects, oslo.config now normalizes all non lowercase group names to lowercase when loading conf files. Thus conf files are backwards compatible but option group references in the code must now use lowercase before we update oslo.config. This patch replaces all 'QUOTA' references to 'quota' Change-Id: I74c2a35aea7a52f9586eb598fe52d2cecb1851ef --- etc/quantum.conf | 2 +- etc/quantum/plugins/nicira/nvp.ini | 2 +- quantum/db/migration/cli.py | 2 +- quantum/extensions/l3.py | 2 +- quantum/extensions/quotasv2.py | 4 ++-- quantum/extensions/securitygroup.py | 2 +- .../cisco/tests/unit/v2/quantumv2.conf.cisco.test | 2 +- quantum/plugins/nec/extensions/packetfilter.py | 2 +- quantum/plugins/nicira/extensions/nvp_networkgw.py | 2 +- quantum/quota.py | 10 +++++----- quantum/tests/unit/test_api_v2.py | 6 +++--- quantum/tests/unit/test_db_plugin.py | 6 +++--- quantum/tests/unit/test_quota_ext.py | 4 ++-- quantum/tests/unit/test_routerserviceinsertion.py | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/etc/quantum.conf b/etc/quantum.conf index 095d1e9d4..ddccd7287 100644 --- a/etc/quantum.conf +++ b/etc/quantum.conf @@ -258,7 +258,7 @@ notification_topics = notifications #ssl_ca_file = /path/to/cafile # ======== end of WSGI parameters related to the API server ========== -[QUOTAS] +[quotas] # resource name(s) that are supported in quota features # quota_items = network,subnet,port diff --git a/etc/quantum/plugins/nicira/nvp.ini b/etc/quantum/plugins/nicira/nvp.ini index e46dc195e..9eeaf3767 100644 --- a/etc/quantum/plugins/nicira/nvp.ini +++ b/etc/quantum/plugins/nicira/nvp.ini @@ -91,7 +91,7 @@ sql_connection = sqlite:// # sql_idle_timeout = 3600 -[QUOTAS] +[quotas] # number of network gateways allowed per tenant, -1 means unlimited # quota_network_gateway = 5 diff --git a/quantum/db/migration/cli.py b/quantum/db/migration/cli.py index 8a033115b..cc9932163 100644 --- a/quantum/db/migration/cli.py +++ b/quantum/db/migration/cli.py @@ -45,7 +45,7 @@ _db_opts = [ CONF = cfg.ConfigOpts() CONF.register_opts(_core_opts) CONF.register_opts(_db_opts, 'DATABASE') -CONF.register_opts(_quota_opts, 'QUOTAS') +CONF.register_opts(_quota_opts, 'quotas') def do_alembic_command(config, cmd, *args, **kwargs): diff --git a/quantum/extensions/l3.py b/quantum/extensions/l3.py index 99691b1bf..ba5285318 100644 --- a/quantum/extensions/l3.py +++ b/quantum/extensions/l3.py @@ -159,7 +159,7 @@ l3_quota_opts = [ help=_('Number of floating IPs allowed per tenant, ' '-1 for unlimited')), ] -cfg.CONF.register_opts(l3_quota_opts, 'QUOTAS') +cfg.CONF.register_opts(l3_quota_opts, 'quotas') class L3(extensions.ExtensionDescriptor): diff --git a/quantum/extensions/quotasv2.py b/quantum/extensions/quotasv2.py index d49ffd3c4..6ae86062c 100644 --- a/quantum/extensions/quotasv2.py +++ b/quantum/extensions/quotasv2.py @@ -43,7 +43,7 @@ class QuotaSetsController(wsgi.Controller): def __init__(self, plugin): self._resource_name = RESOURCE_NAME self._plugin = plugin - self._driver = importutils.import_class(cfg.CONF.QUOTAS.quota_driver) + self._driver = importutils.import_class(cfg.CONF.quotas.quota_driver) self._update_extended_attributes = True def _update_attributes(self): @@ -117,7 +117,7 @@ class Quotasv2(extensions.ExtensionDescriptor): @classmethod def get_description(cls): description = 'Expose functions for quotas management' - if cfg.CONF.QUOTAS.quota_driver == DB_QUOTA_DRIVER: + if cfg.CONF.quotas.quota_driver == DB_QUOTA_DRIVER: description += ' per tenant' return description diff --git a/quantum/extensions/securitygroup.py b/quantum/extensions/securitygroup.py index 04adb37e5..825f03bf0 100644 --- a/quantum/extensions/securitygroup.py +++ b/quantum/extensions/securitygroup.py @@ -212,7 +212,7 @@ security_group_quota_opts = [ help=_('Number of security rules allowed per tenant, ' '-1 for unlimited')), ] -cfg.CONF.register_opts(security_group_quota_opts, 'QUOTAS') +cfg.CONF.register_opts(security_group_quota_opts, 'quotas') class Securitygroup(extensions.ExtensionDescriptor): diff --git a/quantum/plugins/cisco/tests/unit/v2/quantumv2.conf.cisco.test b/quantum/plugins/cisco/tests/unit/v2/quantumv2.conf.cisco.test index dc855a7cc..742d482c0 100644 --- a/quantum/plugins/cisco/tests/unit/v2/quantumv2.conf.cisco.test +++ b/quantum/plugins/cisco/tests/unit/v2/quantumv2.conf.cisco.test @@ -22,7 +22,7 @@ core_plugin = quantum.plugins.cisco.network_plugin.PluginV2 # The messaging module to use, defaults to kombu. rpc_backend = quantum.openstack.common.rpc.impl_fake -[QUOTAS] +[quotas] # resource name(s) that are supported in quota features quota_items = network,subnet,port diff --git a/quantum/plugins/nec/extensions/packetfilter.py b/quantum/plugins/nec/extensions/packetfilter.py index fe3bb6f92..944050562 100644 --- a/quantum/plugins/nec/extensions/packetfilter.py +++ b/quantum/plugins/nec/extensions/packetfilter.py @@ -34,7 +34,7 @@ quota_packet_filter_opts = [ "-1 for unlimited")) ] # Register the configuration options -cfg.CONF.register_opts(quota_packet_filter_opts, 'QUOTAS') +cfg.CONF.register_opts(quota_packet_filter_opts, 'quotas') PACKET_FILTER_ACTION_REGEX = "(?i)^(allow|accept|drop|deny)$" diff --git a/quantum/plugins/nicira/extensions/nvp_networkgw.py b/quantum/plugins/nicira/extensions/nvp_networkgw.py index 0bed36a11..29fb9e7f2 100644 --- a/quantum/plugins/nicira/extensions/nvp_networkgw.py +++ b/quantum/plugins/nicira/extensions/nvp_networkgw.py @@ -89,7 +89,7 @@ nw_gw_quota_opts = [ '-1 for unlimited')) ] -cfg.CONF.register_opts(nw_gw_quota_opts, 'QUOTAS') +cfg.CONF.register_opts(nw_gw_quota_opts, 'quotas') attributes.validators['type:device_list'] = _validate_device_list diff --git a/quantum/quota.py b/quantum/quota.py index 3d229eaff..e02fee698 100644 --- a/quantum/quota.py +++ b/quantum/quota.py @@ -50,7 +50,7 @@ quota_opts = [ help=_('Default driver to use for quota checks')), ] # Register the configuration options -cfg.CONF.register_opts(quota_opts, 'QUOTAS') +cfg.CONF.register_opts(quota_opts, 'quotas') class ConfDriver(object): @@ -163,9 +163,9 @@ class BaseResource(object): @property def default(self): """Return the default value of the quota.""" - return getattr(cfg.CONF.QUOTAS, + return getattr(cfg.CONF.quotas, self.flag, - cfg.CONF.QUOTAS.default_quota) + cfg.CONF.quotas.default_quota) class CountableResource(BaseResource): @@ -206,7 +206,7 @@ class QuotaEngine(object): """Initialize a Quota object.""" if not quota_driver_class: - quota_driver_class = cfg.CONF.QUOTAS.quota_driver + quota_driver_class = cfg.CONF.quotas.quota_driver if isinstance(quota_driver_class, basestring): quota_driver_class = importutils.import_object(quota_driver_class) @@ -306,7 +306,7 @@ def _count_resource(context, plugin, resources, tenant_id): def register_resources_from_config(): resources = [] - for resource_item in cfg.CONF.QUOTAS.quota_items: + for resource_item in cfg.CONF.quotas.quota_items: resources.append(CountableResource(resource_item, _count_resource, 'quota_' + resource_item)) QUOTAS.register_resources(resources) diff --git a/quantum/tests/unit/test_api_v2.py b/quantum/tests/unit/test_api_v2.py index b5c250317..3398ba867 100644 --- a/quantum/tests/unit/test_api_v2.py +++ b/quantum/tests/unit/test_api_v2.py @@ -1299,7 +1299,7 @@ class NotificationTest(APIv2TestBase): class QuotaTest(APIv2TestBase): def test_create_network_quota(self): - cfg.CONF.set_override('quota_network', 1, group='QUOTAS') + cfg.CONF.set_override('quota_network', 1, group='quotas') initial_input = {'network': {'name': 'net1', 'tenant_id': _uuid()}} full_input = {'network': {'admin_state_up': True, 'subnets': []}} full_input['network'].update(initial_input['network']) @@ -1314,7 +1314,7 @@ class QuotaTest(APIv2TestBase): res.json['QuantumError']) def test_create_network_quota_no_counts(self): - cfg.CONF.set_override('quota_network', 1, group='QUOTAS') + cfg.CONF.set_override('quota_network', 1, group='quotas') initial_input = {'network': {'name': 'net1', 'tenant_id': _uuid()}} full_input = {'network': {'admin_state_up': True, 'subnets': []}} full_input['network'].update(initial_input['network']) @@ -1331,7 +1331,7 @@ class QuotaTest(APIv2TestBase): res.json['QuantumError']) def test_create_network_quota_without_limit(self): - cfg.CONF.set_override('quota_network', -1, group='QUOTAS') + cfg.CONF.set_override('quota_network', -1, group='quotas') initial_input = {'network': {'name': 'net1', 'tenant_id': _uuid()}} instance = self.plugin.return_value instance.get_networks_count.return_value = 3 diff --git a/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py index 2b7269a7c..90d226072 100644 --- a/quantum/tests/unit/test_db_plugin.py +++ b/quantum/tests/unit/test_db_plugin.py @@ -1949,7 +1949,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): if self._skip_native_bulk: self.skipTest("Plugin does not support native bulk network create") quota = 4 - cfg.CONF.set_override('quota_network', quota, group='QUOTAS') + cfg.CONF.set_override('quota_network', quota, group='quotas') res = self._create_network_bulk(self.fmt, quota + 1, 'test', True) self._validate_behavior_on_bulk_failure(res, 'networks', errcode=409) @@ -1957,7 +1957,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): if self._skip_native_bulk: self.skipTest("Plugin does not support native bulk network create") quota = 2 - cfg.CONF.set_override('quota_network', quota, group='QUOTAS') + cfg.CONF.set_override('quota_network', quota, group='quotas') networks = [{'network': {'name': 'n1', 'tenant_id': self._tenant_id}}, {'network': {'name': 'n2', @@ -1974,7 +1974,7 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): if self._skip_native_bulk: self.skipTest("Plugin does not support native bulk network create") quota = 2 - cfg.CONF.set_override('quota_network', quota, group='QUOTAS') + cfg.CONF.set_override('quota_network', quota, group='quotas') networks = [{'network': {'name': 'n1', 'tenant_id': self._tenant_id}}, {'network': {'name': 'n2', diff --git a/quantum/tests/unit/test_quota_ext.py b/quantum/tests/unit/test_quota_ext.py index 73cfc74f9..9035986a0 100644 --- a/quantum/tests/unit/test_quota_ext.py +++ b/quantum/tests/unit/test_quota_ext.py @@ -48,7 +48,7 @@ class QuotaExtensionTestCase(testlib_api.WebTestCase): cfg.CONF.set_override( 'quota_items', ['network', 'subnet', 'port', 'extra1'], - group='QUOTAS') + group='quotas') quota.QUOTAS = quota.QuotaEngine() quota.register_resources_from_config() self._plugin_patcher = mock.patch(TARGET_PLUGIN, autospec=True) @@ -83,7 +83,7 @@ class QuotaExtensionDbTestCase(QuotaExtensionTestCase): cfg.CONF.set_override( 'quota_driver', 'quantum.db.quota_db.DbQuotaDriver', - group='QUOTAS') + group='quotas') super(QuotaExtensionDbTestCase, self).setUp() def test_quotas_loaded_right(self): diff --git a/quantum/tests/unit/test_routerserviceinsertion.py b/quantum/tests/unit/test_routerserviceinsertion.py index f7494ae28..f4866d656 100644 --- a/quantum/tests/unit/test_routerserviceinsertion.py +++ b/quantum/tests/unit/test_routerserviceinsertion.py @@ -169,7 +169,7 @@ class RouterServiceInsertionTestCase(base.BaseTestCase): #just stubbing core plugin with LoadBalancer plugin cfg.CONF.set_override('core_plugin', plugin) cfg.CONF.set_override('service_plugins', []) - cfg.CONF.set_override('quota_router', -1, group='QUOTAS') + cfg.CONF.set_override('quota_router', -1, group='quotas') self.addCleanup(cfg.CONF.reset) # Ensure 'stale' patched copies of the plugin are never returned -- 2.45.2