Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Revert "Add the PATCH method for the monitoring API""
[pti/o2.git]
/
o2ims
/
adapter
/
clients
/
fault_client.py
diff --git
a/o2ims/adapter/clients/fault_client.py
b/o2ims/adapter/clients/fault_client.py
index
53602b4
..
3717487
100644
(file)
--- a/
o2ims/adapter/clients/fault_client.py
+++ b/
o2ims/adapter/clients/fault_client.py
@@
-21,7
+21,7
@@
from cgtsclient.client import get_client as get_stx_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 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
@@
-85,6
+85,11
@@
class StxAlarmClient(BaseClient):
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