Merge "Add check whether nova is enable or not in aggregate panel"

This commit is contained in:
Jenkins 2016-06-21 19:12:41 +00:00 committed by Gerrit Code Review
commit 2620791889

View File

@ -16,7 +16,7 @@ from django.utils.translation import ugettext_lazy as _
import horizon import horizon
from openstack_dashboard.api import nova from openstack_dashboard import api
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -30,7 +30,9 @@ class Aggregates(horizon.Panel):
# extend basic permission-based check with a check to see whether # extend basic permission-based check with a check to see whether
# the Aggregates extension is even enabled in nova # the Aggregates extension is even enabled in nova
try: try:
if not nova.extension_supported('Aggregates', context['request']): request = context['request']
if not (api.base.is_service_enabled(request, 'compute') and
api.nova.extension_supported('Aggregates', request)):
return False return False
except Exception: except Exception:
LOG.error("Call to list supported extensions failed. This is " LOG.error("Call to list supported extensions failed. This is "