From f7c240e869b252ad50a249467131c6d3164ab04a Mon Sep 17 00:00:00 2001 From: Anusha Ramineni Date: Thu, 2 Feb 2017 12:21:41 +0530 Subject: [PATCH] Supress ceilometer event list error Closes-Bug:#1657629 Change-Id: Ib8d987458676a3407fe68cdfee2c481843fb5af6 --- congress/datasources/ceilometer_driver.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/congress/datasources/ceilometer_driver.py b/congress/datasources/ceilometer_driver.py index b4ae324c3..6794aaf7b 100644 --- a/congress/datasources/ceilometer_driver.py +++ b/congress/datasources/ceilometer_driver.py @@ -199,14 +199,22 @@ class CeilometerDriver(datasource_driver.PollingDataSourceDriver, alarms_list_suppress_no_aodh_error(self.ceilometer_client)) self.add_update_method(alarms_method, self.alarms_translator) - events_method = lambda: self._translate_events( - self.ceilometer_client.events.list()) + events_method = lambda: self._translate_events(self._events_list()) self.add_update_method(events_method, self.events_translator) statistics_method = lambda: self._translate_statistics( self._get_statistics(self.ceilometer_client.meters.list())) self.add_update_method(statistics_method, self.statistics_translator) + def _events_list(self): + try: + return self.ceilometer_client.events.list() + except (ceilometerclient.exc.HTTPException, + exceptions.ConnectFailure): + LOG.info('events list not available because Panko is disabled or ' + 'unavailable. Empty list reported instead') + return [] + def _get_statistics(self, meters): statistics = [] names = set()