starlingx
/
gui
Code Issues Proposed changes

Fault Management panel 

Changes that allow fault_management panel communicate with stx-horizon
as a plugin

Change-Id: I5f942502b9501eec50040faea065b75bc810b6cb
This commit is contained in:
Eddie Ramirez 2018-08-10 15:14:24 -07:00
parent a814981a9f
commit a4512acaad
8 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
starlingx_dashboard/api/__init__.py
View File

@ -17,21 +17,16 @@
#from cgcs_dashboard.api import dc_manager
#from cgcs_dashboard.api import iservice
#from cgcs_dashboard.api import sysinv
from starlingx_dashboard.api import vim
from starlingx_dashboard.api import base
from starlingx_dashboard.api import dc_manager
from starlingx_dashboard.api import sysinv
from starlingx_dashboard.api import patch
from starlingx_dashboard.api import vim
#from starlingx_dashboard.api import patch
# TODO (ediardo): cleanup the imports below
__all__ = [
"nova",
"base",
"dc_manager",
"sysinv",
"vim",
"patch"
# "ceilometer",
# "ceph",
# "dc_manager",
# "iservice",
# "patch",
# "sysinv",
# "vim",
]

1
starlingx_dashboard/api/base.py
View File

@ -15,3 +15,4 @@ def get_request_page_size(request, limit=None):
except Exception:
default_page_size = getattr(settings, 'API_RESULT_PAGE_SIZE', 20)
return request.session.get('horizon_pagesize', default_page_size)

1
starlingx_dashboard/api/sysinv.py
View File

@ -1060,7 +1060,6 @@ def alarm_list(request, search_opts=None):
sort_key = search_opts.get('sort_key', None)
sort_dir = search_opts.get('sort_dir', None)
page_size = stx_base.get_request_page_size(request, limit)
if "suppression" in search_opts:
suppression = search_opts.pop('suppression')

9
starlingx_dashboard/dashboards/admin/fault_management/tables.py
View File

@ -29,7 +29,6 @@ from django.utils.translation import ungettext_lazy
from horizon import exceptions
from horizon import tables
from starlingx_dashboard.horizon import tables as stx_tables
from horizon.utils import filters as utils_filters
from openstack_dashboard import api
from starlingx_dashboard import api as stx_api
@ -48,11 +47,11 @@ SUPPRESSION_STATUS_DISPLAY_CHOICES = (
)
class AlarmsLimitAction(stx_tables.LimitAction):
class AlarmsLimitAction(tables.LimitAction):
verbose_name = _("Alarms")
class AlarmFilterAction(stx_tables.FixedWithQueryFilter):
class AlarmFilterAction(tables.FixedWithQueryFilter):
def __init__(self, **kwargs):
super(AlarmFilterAction, self).__init__(**kwargs)
@ -103,11 +102,11 @@ class AlarmsTable(tables.DataTable):
hidden_title = False
class EventLogsLimitAction(stx_tables.LimitAction):
class EventLogsLimitAction(tables.LimitAction):
verbose_name = _("Events")
class EventLogsFilterAction(stx_tables.FixedWithQueryFilter):
class EventLogsFilterAction(tables.FixedWithQueryFilter):
def __init__(self, **kwargs):
super(EventLogsFilterAction, self).__init__(**kwargs)

12
starlingx_dashboard/dashboards/admin/fault_management/tabs.py
View File

@ -115,12 +115,12 @@ class ActiveAlarmsTab(tabs.TableTab):
def get_alarms_data(self):
search_opts = {}
# get retrieve parameters from request/session env
#marker = \
# self.request.GET.get(tables.AlarmsTable._meta.pagination_param,
# None)
#limit = \
# self.request.GET.get(tables.AlarmsTable._meta.limit_param,
# None)
marker = \
self.request.GET.get(tables.AlarmsTable._meta.pagination_param,
None)
limit = \
self.request.GET.get(tables.AlarmsTable._meta.limit_param,
None)
search_opts = self.get_filters()
search_opts.update({

12
starlingx_dashboard/dashboards/admin/fault_management/views.py
View File

@ -30,7 +30,9 @@ from horizon import exceptions
from horizon import tabs
from horizon import views
from openstack_dashboard.api.base import is_service_enabled
from starlingx_dashboard import api as stx_api
from starlingx_dashboard.api import sysinv
from starlingx_dashboard.api import dc_manager
from starlingx_dashboard.dashboards.admin.fault_management import \
tabs as project_tabs
@ -56,7 +58,7 @@ class DetailView(views.HorizonTemplateView):
if not hasattr(self, "_alarm"):
alarm_uuid = self.kwargs['id']
try:
alarm = stx_api.sysinv.alarm_get(self.request, alarm_uuid)
alarm = sysinv.alarm_get(self.request, alarm_uuid)
except Exception:
redirect = reverse('horizon:admin:fault_management:index')
@ -118,7 +120,7 @@ class EventLogDetailView(views.HorizonTemplateView):
if not hasattr(self, "_eventlog"):
uuid = self.kwargs['id']
try:
self._eventlog = stx_api.sysinv.event_log_get(self.request, uuid)
self._eventlog = sysinv.event_log_get(self.request, uuid)
self._detectEventLogType()
except Exception:
redirect = reverse('horizon:admin:fault_management:index')
@ -163,11 +165,11 @@ class BannerView(TemplateView):
def get_data(self):
summary = None
try:
summary = stx_api.sysinv.alarm_summary_get(self.request)
summary = sysinv.alarm_summary_get(self.request)
except Exception:
exceptions.handle(self.request,
_('Unable to retrieve alarm summary.'))
return summary
def get_subcloud_data(self):
return stx_api.dc_manager.alarm_summary_list(self.request)
return dc_manager.alarm_summary_list(self.request)

2
starlingx_dashboard/dashboards/dc_admin/cloud_overview/urls.py
View File

@ -7,7 +7,7 @@
from django.conf.urls import url
from openstack_dashboard.dashboards.dc_admin.cloud_overview import views
from starlingx_dashboard.dashboards.dc_admin.cloud_overview import views
urlpatterns = [

2
starlingx_dashboard/enabled/_2200_starlingx_dc_admin.py
View File

@ -5,7 +5,7 @@ DEFAULT = False
# A dictionary of exception classes to be added to HORIZON['exceptions'].
ADD_EXCEPTIONS = {}
# A list of applications to be added to INSTALLED_APPS.
ADD_INSTALLED_APPS = ['starlingx_dashboard', ]
ADD_INSTALLED_APPS = ['starlingx_dashboard.dashboards.dc_admin', ]
ADD_ANGULAR_MODULES = [
'horizon.dashboard.dc_admin',
]