From aca7787e61c960ab91629c4c2cdaf54b4c2384b5 Mon Sep 17 00:00:00 2001 From: Dmitry Volodin Date: Sat, 16 May 2020 15:28:11 +0000 Subject: [PATCH] Merge branch 'patch-avs-portmap' into 'master' Catch portmapper exception on NRI discovery. See merge request noc/noc!3612 (cherry picked from commit a68a1c3301d95f881790ab0919a7cbc7f28497fc) 061196b7 Catch portmapper exception on NRI discovery. --- services/discovery/jobs/box/nri_portmap.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/services/discovery/jobs/box/nri_portmap.py b/services/discovery/jobs/box/nri_portmap.py index 4e63f19bf4..d31b5c13cc 100644 --- a/services/discovery/jobs/box/nri_portmap.py +++ b/services/discovery/jobs/box/nri_portmap.py @@ -56,7 +56,13 @@ class NRIPortmapperCheck(DiscoveryCheck): {"managed_object": self.object.id, "type": "physical"}, {"_id": 1, "name": 1, "nri_name": 1}, ): - nri_name = portmapper.to_remote(d["name"], iface_hints=ifaces_hints) + try: + nri_name = portmapper.to_remote(d["name"], iface_hints=ifaces_hints) + except Exception as e: + self.logger.error( + "[%s] Unhandled exception on portmapper handler '%s'. Skipping checks.", nri, e + ) + break self.logger.debug("[%s] Port mapping %s <-> %s", nri, d["name"], nri_name) if not nri_name: self.logger.info("[%s] Cannot map port name '%s'", nri, d["name"]) -- GitLab