openstack
/
horizon
Code Issues Proposed changes

Merge "Incorrect config item in local_settings.py.example"

This commit is contained in:
Jenkins 2014-07-14 23:45:54 +00:00 committed by Gerrit Code Review
parent 301d48757a ee5d9bbfcd
commit bd44b9f8ce
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/topics/settings.rst
View File

@ -273,12 +273,12 @@ Default::
{
'flavor_keys': [
('quota:read_bytes_sec', _('Quota: Read bytes')),
('quota:write_bytes_sec', _('Quota: Write bytes')),
('quota:disk_read_bytes_sec', _('Quota: Read bytes')),
('quota:disk_write_bytes_sec', _('Quota: Write bytes')),
('quota:cpu_quota', _('Quota: CPU')),
('quota:cpu_period', _('Quota: CPU period')),
('quota:inbound_average', _('Quota: Inbound average')),
('quota:outbound_average', _('Quota: Outbound average'))
('quota:vif_inbound_average', _('Quota: Inbound average')),
('quota:vif_outbound_average', _('Quota: Outbound average'))
]
}

4
openstack_dashboard/dashboards/admin/flavors/extras/tests.py
View File

@ -71,11 +71,11 @@ class FlavorExtrasTests(test.BaseAdminViewTests):
# GET to display the flavor_name
api.nova.flavor_extra_set(IsA(http.HttpRequest),
flavor.id,
{'quota:read_bytes_sec': '1000'})
{'quota:disk_read_bytes_sec': '1000'})
self.mox.ReplayAll()
data = {'flavor_id': flavor.id,
'keys': 'quota:read_bytes_sec',
'keys': 'quota:disk_read_bytes_sec',
'value': '1000'}
resp = self.client.post(create_url, data)
self.assertNoFormErrors(resp)

8
openstack_dashboard/local/local_settings.py.example
View File

@ -492,12 +492,12 @@ SECURITY_GROUP_RULES = {
FLAVOR_EXTRA_KEYS = {
'flavor_keys': [
('quota:read_bytes_sec', _('Quota: Read bytes')),
('quota:write_bytes_sec', _('Quota: Write bytes')),
('quota:disk_read_bytes_sec', _('Quota: Read bytes')),
('quota:disk_write_bytes_sec', _('Quota: Write bytes')),
('quota:cpu_quota', _('Quota: CPU')),
('quota:cpu_period', _('Quota: CPU period')),
('quota:inbound_average', _('Quota: Inbound average')),
('quota:outbound_average', _('Quota: Outbound average')),
('quota:vif_inbound_average', _('Quota: Inbound average')),
('quota:vif_outbound_average', _('Quota: Outbound average')),
]
}

8
openstack_dashboard/test/settings.py
View File

@ -213,12 +213,12 @@ POLICY_FILES = {
FLAVOR_EXTRA_KEYS = {
'flavor_keys': [
('quota:read_bytes_sec', 'Quota: Read bytes'),
('quota:write_bytes_sec', 'Quota: Write bytes'),
('quota:disk_read_bytes_sec', 'Quota: Read bytes'),
('quota:disk_write_bytes_sec', 'Quota: Write bytes'),
('quota:cpu_quota', 'Quota: CPU'),
('quota:cpu_period', 'Quota: CPU period'),
('quota:inbound_average', 'Quota: Inbound average'),
('quota:outbound_average', 'Quota: Outbound average'),
('quota:vif_inbound_average', 'Quota: Inbound average'),
('quota:vif_outbound_average', 'Quota: Outbound average'),
]
}