openstack
/
manila
Code Issues Proposed changes

Increase share-network default quota 

Now Manila has too small quota for share networks, that affects gate tests with
exception "ShareNetworksLimitExceeded".

Changes:
- increased quota from 5 to 10;
- updated description of quota with proper info.

Change-Id: I1e3127780785ec689d02a4a0bcce42d903df7d72
Closes-Bug: #1368460
This commit is contained in:
Your Name 2014-09-12 12:23:46 -04:00
parent 7d79a8cc5b
commit ef921f29e2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manila/quota.py
View File

@ -41,8 +41,8 @@ quota_opts = [
help='Number of share gigabytes (snapshots are also included) '
'allowed per project.'),
cfg.IntOpt('quota_share_networks',
default=5,
help='Number of activated share-networks allowed per project.'),
default=10,
help='Number of share-networks allowed per project.'),
cfg.IntOpt('reservation_expire',
default=86400,
help='Number of seconds until a reservation expires.'),

12
manila/tests/test_quota.py
View File

@ -615,7 +615,7 @@ class DbQuotaDriverTestCase(test.TestCase):
"shares": {"limit": 10, "in_use": 2, "reserved": 0, },
"gigabytes": {"limit": 50, "in_use": 10, "reserved": 0, },
"snapshots": {"limit": 10, "in_use": 0, "reserved": 0, },
"share_networks": {"limit": 5, "in_use": 0, "reserved": 0, },
"share_networks": {"limit": 10, "in_use": 0, "reserved": 0, },
}
def setUp(self):
@ -648,7 +648,7 @@ class DbQuotaDriverTestCase(test.TestCase):
"shares": 10,
"gigabytes": 1000,
"snapshots": 10,
"share_networks": 5,
"share_networks": 10,
}
self.assertEqual(result, expected)
@ -670,7 +670,7 @@ class DbQuotaDriverTestCase(test.TestCase):
"shares": 10,
"gigabytes": 500,
"snapshots": 10,
"share_networks": 5,
"share_networks": 10,
}
self.assertEqual(result, expected)
@ -849,7 +849,7 @@ class DbQuotaDriverTestCase(test.TestCase):
"shares": {"limit": 10, },
"gigabytes": {"limit": 50, },
"snapshots": {"limit": 10, },
"share_networks": {"limit": 5, },
"share_networks": {"limit": 10, },
}
self.assertEqual(result, expected)
@ -865,7 +865,7 @@ class DbQuotaDriverTestCase(test.TestCase):
"shares": {"limit": 10, },
"gigabytes": {"limit": 50, },
"snapshots": {"limit": 10, },
"share_networks": {"limit": 5, },
"share_networks": {"limit": 10, },
}
self.assertEqual(result, expected)
@ -919,7 +919,7 @@ class DbQuotaDriverTestCase(test.TestCase):
"shares": {"minimum": 0, "maximum": 12, },
"gigabytes": {"minimum": 0, "maximum": 1000, },
"snapshots": {"minimum": 0, "maximum": 10, },
"share_networks": {"minimum": 0, "maximum": 5, },
"share_networks": {"minimum": 0, "maximum": 10, },
}
self.assertEqual(result, expected)