Manila-UI breaks Horizon's "Network" panel group

Since the OpenStack Pike release, the Manila UI dashboard integration
for Horizon breaks the "Network" panel group, causing the "Network
Topology" panel to fail and the buttons "Create Network", "Create
Router", "Create Security Group" and "Allocate IP To Project" to
silently disappear from the panels "Networks", "Routers", "Security
Groups" and "Floating IPs".

This commit adds the parameter "targets" to the method
"tenant_quota_usages" that was introduced by the fix of Horizon
Bug#1675504.

Closes-Bug #1715540
Signed-off-by: Christoph Fiehe <fiehe@gmx.de>

Change-Id: I6d8f9ae2ae03577e63cc985d37fcbba824d68a9d
(cherry picked from commit f49f885b32)
This commit is contained in:
Christoph Fiehe 2017-09-12 16:32:22 +02:00 committed by Tom Barron
parent e2df2952e0
commit e5e8628233
1 changed files with 2 additions and 2 deletions

View File

@ -143,9 +143,9 @@ def get_disabled_quotas(f, request):
@wrap(quotas.tenant_quota_usages)
def tenant_quota_usages(f, request, tenant_id=None):
def tenant_quota_usages(f, request, tenant_id=None, targets=None):
usages = f(request, tenant_id)
usages = f(request, tenant_id, targets)
if 'shares' not in _get_manila_disabled_quotas(request):
shares = manila.share_list(request)