diff options
| author | Julien Danjou <julien@danjou.info> | 2018-05-02 16:24:30 +0200 |
|---|---|---|
| committer | Julien Danjou <julien@danjou.info> | 2018-05-04 09:32:11 +0000 |
| commit | f8e7d5252deec7781e4a09fb7ef92561c14c4b1c (patch) | |
| tree | 6bfd1417763b4cc68b2a455fedd4984e9de6ce66 | |
| parent | 420e621f40a70c7caa378f200c08520144c9a773 (diff) | |
| download | ceilometer-f8e7d5252deec7781e4a09fb7ef92561c14c4b1c.tar.gz | |
There's no need to try to convert before ignoring.
Change-Id: Ie9dcb63c43e7d69ce25aff62a2575b89f26ffca5
(cherry picked from commit 7de90448e6c61a8bef7663ad87a87b3be587b36e)
| -rw-r--r-- | ceilometer/hardware/inspector/snmp.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ceilometer/hardware/inspector/snmp.py b/ceilometer/hardware/inspector/snmp.py index fc9d410c..b5264a4f 100644 --- a/ceilometer/hardware/inspector/snmp.py +++ b/ceilometer/hardware/inspector/snmp.py @@ -195,14 +195,12 @@ class SNMPInspector(base.Inspector): def get_oid_value(oid_cache, oid_def, suffix='', host=None): oid, converter = oid_def value = oid_cache[oid + suffix] + if isinstance(value, rfc1905.NoSuchObject): + LOG.debug("OID %s%s has no value" % ( + oid, " on %s" % host.hostname if host else "")) + return None if converter: - try: - value = converter(value) - except ValueError: - if isinstance(value, rfc1905.NoSuchObject): - LOG.debug("OID %s%s has no value" % ( - oid, " on %s" % host.hostname if host else "")) - return None + value = converter(value) return value @classmethod |