Merge pull request #47 from QualiSystems/bugfix-snmpv3

Bugfix snmpv3

Author: Costya-Y

cloudshell/snmp/core/domain/quali_mib_table.py

@@ -34,7 +34,6 @@ def get_columns(self, *names):
         :param names: list of requested columns names.
         :return: a partial table containing only the requested columns.
         """
-        names = [n for n in names]
         return QualiMibTable(
             self._name,
             OrderedDict(

cloudshell/snmp/core/snmp_service.py

@@ -61,6 +61,19 @@ def load_mib_tables(self, mib_list):
         for mib in mib_list:
             mib_builder.loadModules(mib)
 
+    def translate_oid(self, snmp_oid):
+        """Translates Raw OID into a human readable identifiers.
+
+        :param str snmp_oid: OID string. like: '1.3.6.1.2.1.1.4.0'
+        :return translated OID name
+        :rtype str
+        """
+        result = SnmpResponse(
+            snmp_oid, None, snmp_engine=self._snmp_engine, logger=self._logger
+        )
+
+        return result.mib_id
+
     def set(self, snmp_set_oids):  # noqa: A003
         """SNMP Set operation.
 

cloudshell/snmp/core/tools/snmp_parameters_helper.py

@@ -5,9 +5,6 @@ class SnmpParametersConverter(object):
     AUTH_PRIV = "authPriv"
 
     class PySnmpVersion:
-        def __init__(self):
-            pass
-
         V1 = 0
         V2 = 1
         V3 = 3
@@ -44,7 +41,7 @@ def version(self):
     def user(self):
         if not self._user:
             self._user = self.DEFAULT_USER
-            if hasattr(self.snmp_parameters, "user"):
+            if hasattr(self.snmp_parameters, "snmp_user"):
                 self._user = self.snmp_parameters.snmp_user
         return self._user
 

cloudshell/snmp/core/tools/snmp_security.py

@@ -12,20 +12,20 @@ def __init__(self, py_snmp_params, logger):
         self._logger = logger
 
     def add_security(self, snmp_engine):
-        if hasattr(self._py_snmp_params, "snmp_password"):
+        if hasattr(self._py_snmp_params.snmp_parameters, "snmp_password"):
             auth_protocol = AUTH_PROTOCOL_MAP.get(
                 self._py_snmp_params.snmp_parameters.snmp_auth_protocol
             )
             priv_protocol = PRIV_PROTOCOL_MAP.get(
-                self._py_snmp_params.snmp_parameters.snmp_priv_protocol
+                self._py_snmp_params.snmp_parameters.snmp_private_key_protocol
             )
             config.addV3User(
-                snmp_engine,
-                self._py_snmp_params.user,
-                auth_protocol,
-                self._py_snmp_params.snmp_parameters.snmp_password,
-                priv_protocol,
-                self._py_snmp_params.snmp_parameters.snmp_v3_priv_key,
+                snmpEngine=snmp_engine,
+                userName=self._py_snmp_params.user,
+                authProtocol=auth_protocol,
+                authKey=self._py_snmp_params.snmp_parameters.snmp_password,
+                privProtocol=priv_protocol,
+                privKey=self._py_snmp_params.snmp_parameters.snmp_private_key,
             )
         else:
             config.addV1System(

cloudshell/snmp/snmp_parameters.py

@@ -1,3 +1,6 @@
+import warnings
+
+
 class SnmpParameters(object):
     class SnmpVersion:
         def __init__(self):
@@ -112,8 +115,50 @@ def __init__(
         self.snmp_user = snmp_user
         self.snmp_password = snmp_password
         self.snmp_private_key = snmp_private_key
-        self.auth_protocol = auth_protocol
-        self.private_key_protocol = private_key_protocol
+        self.snmp_auth_protocol = auth_protocol
+        self.snmp_private_key_protocol = private_key_protocol
+
+    # For backward compatibility auth_protocol and private_key_protocol
+    @property
+    def auth_protocol(self):
+        warnings.warn(
+            "auth_protocol is obsolete please use snmp_auth_protocol field instead",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self.snmp_auth_protocol
+
+    @auth_protocol.setter
+    def auth_protocol(self, value):
+        warnings.warn(
+            "auth_protocol is obsolete please use snmp_auth_protocol field instead",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        self.snmp_auth_protocol = value
+
+    @property
+    def private_key_protocol(self):
+        warnings.warn(
+            "private_key_protocol is obsolete please "
+            "use snmp_private_key_protocol "
+            "field instead",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+
+        return self.snmp_private_key_protocol
+
+    @private_key_protocol.setter
+    def private_key_protocol(self, value):
+        warnings.warn(
+            "private_key_protocol is obsolete please "
+            "use snmp_private_key_protocol "
+            "field instead",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        self.snmp_private_key_protocol = value
 
     def validate(self):
         super(SNMPV3Parameters, self).validate()

tests/snmp/core/domain/__init__.py

@@ -0,0 +1,3 @@
+from pkgutil import extend_path
+
+__path__ = extend_path(__path__, __name__)

tests/snmp/core/tools/__init__.py

@@ -0,0 +1,3 @@
+from pkgutil import extend_path
+
+__path__ = extend_path(__path__, __name__)

version.txt

@@ -1 +1 @@
-4.0.0
+4.0.1