diff options
Diffstat (limited to 'snmptrap/mod/trapd_vb_types.py')
| -rw-r--r-- | snmptrap/mod/trapd_vb_types.py | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/snmptrap/mod/trapd_vb_types.py b/snmptrap/mod/trapd_vb_types.py index 2d01a30..98d5d2c 100644 --- a/snmptrap/mod/trapd_vb_types.py +++ b/snmptrap/mod/trapd_vb_types.py @@ -1,7 +1,5 @@ # ============LICENSE_START======================================================= -# org.onap.dcae -# ================================================================================ -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,9 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# """ module for converting varbind types from Net-SNMP to PYSNMP @@ -47,22 +42,24 @@ prog_name = os.path.basename(__file__) # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # _pysnmp_to_netsnmp_vb_type = { - 'Integer' : 'integer', - 'Gauge32' : 'unsigned', - 'Counter32' : 'counter32', - 'OctetString' : 'octet', - 'py_type_5' : 'hex', - 'py_type_6' : 'decimal', - 'Null' : 'null', - 'ObjectIdentifier' : 'oid', - 'TimeTicks' : 'timeticks', - 'IpAddress' : 'ipaddress', - 'Bits' : 'bits' - } + 'Integer32': 'integer', + 'Integer': 'integer', + 'Gauge32': 'unsigned', + 'Counter32': 'counter32', + 'OctetString': 'octet', + 'py_type_5': 'hex', + 'py_type_6': 'decimal', + 'Null': 'null', + 'ObjectIdentifier': 'oid', + 'TimeTicks': 'timeticks', + 'IpAddress': 'ipaddress', + 'Bits': 'bits' +} default_vb_type = "octet" -def pysnmp_to_netsnmp_varbind_convert (_pysnmp_vb_type): + +def pysnmp_to_netsnmp_varbind_convert(_pysnmp_vb_type): """ Convert pysnmp varbind types to Net-SNMP nomenclature to maintain backward compatibilty with existing solutions @@ -76,14 +73,11 @@ def pysnmp_to_netsnmp_varbind_convert (_pysnmp_vb_type): # lookup _pysnmp_vb_type in conversion dictionary try: - msg = ("checking for netsnmp equiv of varbind type: %s" \ - % _pysnmp_vb_type) - ecomp_logger(tds.LOG_TYPE_DEBUG, tds.SEV_INFO, tds.CODE_GENERAL, msg) _netsnmp_vb_type = _pysnmp_to_netsnmp_vb_type[_pysnmp_vb_type] return _netsnmp_vb_type except Exception as e: # if not found, return original pysnmp type - msg = ("%s not configured as pysnmp varbind type" \ - % _pysnmp_vb_type) + msg = ("%s not configured as pysnmp varbind type - returning %s" + % (_pysnmp_vb_type,default_vb_type)) ecomp_logger(tds.LOG_TYPE_DEBUG, tds.SEV_INFO, tds.CODE_GENERAL, msg) return default_vb_type |