From 97074667b58a980de0a2ddd2d1ddfc6078ecfc75 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Tue, 10 Apr 2012 10:28:10 -0400 Subject: Standardize quota flag format Only three quota flags used max_ even though all quotas are max Change-Id: I0eb26bdca863d96df2bd00e59f7e8b9827308be7 --- etc/nova/nova.conf.sample | 6 +++--- nova/quota.py | 12 ++++++------ nova/tests/test_quota.py | 38 +++++++++++++++++++------------------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index b2607a9c2..dafd19b41 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -350,11 +350,11 @@ ###### (IntOpt) number of instances allowed per project # quota_instances=10 ###### (IntOpt) number of bytes allowed per injected file -# quota_max_injected_file_content_bytes=10240 +# quota_injected_file_content_bytes=10240 ###### (IntOpt) number of bytes allowed per injected file path -# quota_max_injected_file_path_bytes=255 +# quota_injected_file_path_bytes=255 ###### (IntOpt) number of injected files allowed -# quota_max_injected_files=5 +# quota_injected_files=5 ###### (IntOpt) number of metadata items allowed per instance # quota_metadata_items=128 ###### (IntOpt) megabytes of instance ram allowed per project diff --git a/nova/quota.py b/nova/quota.py index 358c8229c..a5ee5cdd0 100644 --- a/nova/quota.py +++ b/nova/quota.py @@ -45,13 +45,13 @@ quota_opts = [ cfg.IntOpt('quota_metadata_items', default=128, help='number of metadata items allowed per instance'), - cfg.IntOpt('quota_max_injected_files', + cfg.IntOpt('quota_injected_files', default=5, help='number of injected files allowed'), - cfg.IntOpt('quota_max_injected_file_content_bytes', + cfg.IntOpt('quota_injected_file_content_bytes', default=10 * 1024, help='number of bytes allowed per injected file'), - cfg.IntOpt('quota_max_injected_file_path_bytes', + cfg.IntOpt('quota_injected_file_path_bytes', default=255, help='number of bytes allowed per injected file path'), ] @@ -74,9 +74,9 @@ def _get_default_quotas(): 'gigabytes': FLAGS.quota_gigabytes, 'floating_ips': FLAGS.quota_floating_ips, 'metadata_items': FLAGS.quota_metadata_items, - 'injected_files': FLAGS.quota_max_injected_files, + 'injected_files': FLAGS.quota_injected_files, 'injected_file_content_bytes': - FLAGS.quota_max_injected_file_content_bytes, + FLAGS.quota_injected_file_content_bytes, } # -1 in the quota flags means unlimited return defaults @@ -197,4 +197,4 @@ def allowed_injected_file_content_bytes(context, requested_bytes): def allowed_injected_file_path_bytes(context): """Return the number of bytes allowed in an injected file path.""" - return FLAGS.quota_max_injected_file_path_bytes + return FLAGS.quota_injected_file_path_bytes diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py index e95f7b2c6..ae3232338 100644 --- a/nova/tests/test_quota.py +++ b/nova/tests/test_quota.py @@ -42,8 +42,8 @@ class GetQuotaTestCase(test.TestCase): quota_gigabytes=1000, quota_floating_ips=10, quota_metadata_items=128, - quota_max_injected_files=5, - quota_max_injected_file_content_bytes=10 * 1024) + quota_injected_files=5, + quota_injected_file_content_bytes=10 * 1024) self.context = context.RequestContext('admin', 'admin', is_admin=True) def _stub_class(self): @@ -110,8 +110,8 @@ class GetQuotaTestCase(test.TestCase): quota_gigabytes=-1, quota_floating_ips=-1, quota_metadata_items=-1, - quota_max_injected_files=-1, - quota_max_injected_file_content_bytes=-1) + quota_injected_files=-1, + quota_injected_file_content_bytes=-1) result = quota._get_default_quotas() self.assertEqual(result, dict( instances=-1, @@ -492,42 +492,42 @@ class QuotaTestCase(test.TestCase): metadata=metadata) def test_default_allowed_injected_files(self): - self.flags(quota_max_injected_files=55) + self.flags(quota_injected_files=55) self.assertEqual(quota.allowed_injected_files(self.context, 100), 55) def test_overridden_allowed_injected_files(self): - self.flags(quota_max_injected_files=5) + self.flags(quota_injected_files=5) db.quota_create(self.context, self.project_id, 'injected_files', 77) self.assertEqual(quota.allowed_injected_files(self.context, 100), 77) def test_unlimited_default_allowed_injected_files(self): - self.flags(quota_max_injected_files=-1) + self.flags(quota_injected_files=-1) self.assertEqual(quota.allowed_injected_files(self.context, 100), 100) def test_unlimited_db_allowed_injected_files(self): - self.flags(quota_max_injected_files=5) + self.flags(quota_injected_files=5) db.quota_create(self.context, self.project_id, 'injected_files', -1) self.assertEqual(quota.allowed_injected_files(self.context, 100), 100) def test_default_allowed_injected_file_content_bytes(self): - self.flags(quota_max_injected_file_content_bytes=12345) + self.flags(quota_injected_file_content_bytes=12345) limit = quota.allowed_injected_file_content_bytes(self.context, 23456) self.assertEqual(limit, 12345) def test_overridden_allowed_injected_file_content_bytes(self): - self.flags(quota_max_injected_file_content_bytes=12345) + self.flags(quota_injected_file_content_bytes=12345) db.quota_create(self.context, self.project_id, 'injected_file_content_bytes', 5678) limit = quota.allowed_injected_file_content_bytes(self.context, 23456) self.assertEqual(limit, 5678) def test_unlimited_default_allowed_injected_file_content_bytes(self): - self.flags(quota_max_injected_file_content_bytes=-1) + self.flags(quota_injected_file_content_bytes=-1) limit = quota.allowed_injected_file_content_bytes(self.context, 23456) self.assertEqual(limit, 23456) def test_unlimited_db_allowed_injected_file_content_bytes(self): - self.flags(quota_max_injected_file_content_bytes=12345) + self.flags(quota_injected_file_content_bytes=12345) db.quota_create(self.context, self.project_id, 'injected_file_content_bytes', -1) limit = quota.allowed_injected_file_content_bytes(self.context, 23456) @@ -553,25 +553,25 @@ class QuotaTestCase(test.TestCase): def test_max_injected_files(self): files = [] - for i in xrange(FLAGS.quota_max_injected_files): + for i in xrange(FLAGS.quota_injected_files): files.append(('/my/path%d' % i, 'config = test\n')) self._create_with_injected_files(files) # no QuotaError def test_too_many_injected_files(self): files = [] - for i in xrange(FLAGS.quota_max_injected_files + 1): + for i in xrange(FLAGS.quota_injected_files + 1): files.append(('/my/path%d' % i, 'my\ncontent%d\n' % i)) self.assertRaises(exception.QuotaError, self._create_with_injected_files, files) def test_max_injected_file_content_bytes(self): - max = FLAGS.quota_max_injected_file_content_bytes + max = FLAGS.quota_injected_file_content_bytes content = ''.join(['a' for i in xrange(max)]) files = [('/test/path', content)] self._create_with_injected_files(files) # no QuotaError def test_too_many_injected_file_content_bytes(self): - max = FLAGS.quota_max_injected_file_content_bytes + max = FLAGS.quota_injected_file_content_bytes content = ''.join(['a' for i in xrange(max + 1)]) files = [('/test/path', content)] self.assertRaises(exception.QuotaError, @@ -580,16 +580,16 @@ class QuotaTestCase(test.TestCase): def test_allowed_injected_file_path_bytes(self): self.assertEqual( quota.allowed_injected_file_path_bytes(self.context), - FLAGS.quota_max_injected_file_path_bytes) + FLAGS.quota_injected_file_path_bytes) def test_max_injected_file_path_bytes(self): - max = FLAGS.quota_max_injected_file_path_bytes + max = FLAGS.quota_injected_file_path_bytes path = ''.join(['a' for i in xrange(max)]) files = [(path, 'config = quotatest')] self._create_with_injected_files(files) # no QuotaError def test_too_many_injected_file_path_bytes(self): - max = FLAGS.quota_max_injected_file_path_bytes + max = FLAGS.quota_injected_file_path_bytes path = ''.join(['a' for i in xrange(max + 1)]) files = [(path, 'config = quotatest')] self.assertRaises(exception.QuotaError, -- cgit