openstack
/
horizon
Code Issues Proposed changes

Fixed wrong quota check for instance launch 

The quota check for instance launch was accidentally
modified by a recent commit. This fixes the correct behaviour.

Change-Id: Ibd9ef2a4843ad9e3788bac1c0e41e97abba4282f
Closes-Bug: #1349798
This commit is contained in:
Tihomir Trifonov 2014-07-29 15:02:41 +03:00
parent 4b1a605dee
commit 91f3fe9973
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/project/instances/tables.py
View File

@ -235,7 +235,7 @@ class LaunchLink(tables.LinkAction):
- limits['totalCoresUsed']
ram_available = limits['maxTotalRAMSize'] - limits['totalRAMUsed']
if instances_available >= 0 or cores_available <= 0 \
if instances_available <= 0 or cores_available <= 0 \
or ram_available <= 0:
if "disabled" not in self.classes:
self.classes = [c for c in self.classes] + ['disabled']

1
openstack_dashboard/dashboards/project/instances/tests.py
View File

@ -85,6 +85,7 @@ class InstanceTests(test.TestCase):
instances = res.context['instances_table'].data
self.assertItemsEqual(instances, self.servers.list())
self.assertNotContains(res, "Launch Instance (Quota exceeded)")
@test.create_stubs({api.nova: ('server_list',
'tenant_absolute_limits',)})