Permalink
Browse files

Merge "Allow admin to edit project quotas for fixed IPs"

  • Loading branch information...
2 parents 6013a3f + d5f2dc3 commit acb5eeb11389fca22157b5954649a72197a2e690 Jenkins committed with openstack-gerrit Mar 28, 2013
@@ -57,17 +57,7 @@ def test_index(self):
'<Quota: (gigabytes, 1000)>',
'<Quota: (ram, 10000)>',
'<Quota: (floating_ips, 1)>',
- '<Quota: (instances, 10)>',
- '<Quota: (volumes, 1)>',
- '<Quota: (cores, 10)>',
- '<Quota: (security_groups, 10)>',
- '<Quota: (security_group_rules, 20)>',
- '<Quota: (injected_file_content_bytes, 1)>',
- '<Quota: (metadata_items, 1)>',
- '<Quota: (injected_files, 1)>',
- '<Quota: (gigabytes, 1000)>',
- '<Quota: (ram, 10000)>',
- '<Quota: (floating_ips, 1)>',
+ '<Quota: (fixed_ips, 10)>',
'<Quota: (instances, 10)>',
'<Quota: (volumes, 1)>',
'<Quota: (cores, 10)>',
@@ -54,6 +54,7 @@ class UpdateProjectQuotaAction(workflows.Action):
gigabytes = forms.IntegerField(min_value=-1, label=_("Gigabytes"))
ram = forms.IntegerField(min_value=-1, label=_("RAM (MB)"))
floating_ips = forms.IntegerField(min_value=-1, label=_("Floating IPs"))
+ fixed_ips = forms.IntegerField(min_value=-1, label=_("Fixed IPs"))
security_groups = forms.IntegerField(min_value=-1,
label=_("Security Groups"))
security_group_rules = forms.IntegerField(min_value=-1,
@@ -312,6 +312,7 @@ def get_id(is_uuid):
gigabytes='1000',
ram=10000,
floating_ips='1',
+ fixed_ips='10',
instances='10',
injected_files='1',
cores='10',
@@ -62,6 +62,7 @@ def test_tenant_quota_usages(self):
'injected_files': {'quota': 1},
'security_groups': {'quota': 10},
'security_group_rules': {'quota': 20},
+ 'fixed_ips': {'quota': 10},
'gigabytes': {'available': 920, 'used': 80, 'quota': 1000},
'ram': {'available': 8976, 'used': 1024, 'quota': 10000},
'floating_ips': {'available': 0, 'used': 2, 'quota': 1},
@@ -99,6 +100,7 @@ def test_tenant_quota_usages_without_volume(self):
'injected_files': {'quota': 1},
'security_groups': {'quota': 10},
'security_group_rules': {'quota': 20},
+ 'fixed_ips': {'quota': 10},
'ram': {'available': 8976, 'used': 1024, 'quota': 10000},
'floating_ips': {'available': 0, 'used': 2, 'quota': 1},
'instances': {'available': 8, 'used': 2, 'quota': 10},
@@ -133,6 +135,7 @@ def test_tenant_quota_usages_no_instances_running(self):
'injected_files': {'quota': 1},
'security_groups': {'quota': 10},
'security_group_rules': {'quota': 20},
+ 'fixed_ips': {'quota': 10},
'ram': {'available': 10000, 'used': 0, 'quota': 10000},
'floating_ips': {'available': 1, 'used': 0, 'quota': 1},
'instances': {'available': 10, 'used': 0, 'quota': 10},
@@ -176,6 +179,7 @@ def test_tenant_quota_usages_unlimited_quota(self):
'injected_files': {'quota': 1},
'security_groups': {'quota': 10},
'security_group_rules': {'quota': 20},
+ 'fixed_ips': {'quota': 10},
'gigabytes': {'available': 920, 'used': 80, 'quota': 1000},
'ram': {'available': float("inf"), 'used': 1024,
'quota': float("inf")},
@@ -14,6 +14,7 @@
"injected_file_content_bytes",
"ram",
"floating_ips",
+ "fixed_ips",
"security_groups",
"security_group_rules",)
View
@@ -6,7 +6,7 @@ netaddr
python-cinderclient>=1.0.2,<2.0.0
python-glanceclient<2
python-keystoneclient
-python-novaclient>=2.11.1,<3
+python-novaclient>=2.12.0,<3
python-quantumclient>=2.2.0,<3.0.0
python-swiftclient>1.1,<2
pytz

0 comments on commit acb5eeb

Please sign in to comment.