The dependency on the FM module was changed, resulting in it
returning HTTP code 500 instead of HTTP code 404 for not found
errors.
This commit is a workaround to track the 500 error and skip.
When the FM module upgrade, need to be change back
Test Plan:
PASS - Started the watcher service and checked the logs on the O2
environment for alarms that do not exist on the O-Cloud.
Issue-ID: INF-457
Change-Id: Ie2050bda5dd9fc724051de5e861a82fe9f495c44
Signed-off-by: Zhang Rong(Jon) <rong.zhang@windriver.com>
from cgtsclient.exc import EndpointException
from dcmanagerclient.api.client import client as get_dc_client
from fmclient.client import get_client as get_fm_client
from cgtsclient.exc import EndpointException
from dcmanagerclient.api.client import client as get_dc_client
from fmclient.client import get_client as get_fm_client
-from fmclient.common.exceptions import HTTPNotFound
+from fmclient.common.exceptions import HTTPNotFound, HttpServerError
from o2app.adapter import unit_of_work
from o2common.config import config
from o2app.adapter import unit_of_work
from o2common.config import config
logger.debug('alarm {} not in this resource pool {}'
.format(alarm, self._pool_id))
continue
logger.debug('alarm {} not in this resource pool {}'
.format(alarm, self._pool_id))
continue
+ except HttpServerError:
+ # TODO(jon): This exception needs to be removed when the
+ # INF-457 related FM client upgrade and issue fix occur.
+ logger.debug('alarm {} query failed'.format(alarm))
+ continue
ret.append(event)
return ret
ret.append(event)
return ret