Merge branch 'master' into saimon/improved-file-browsing-exception-handling

Author: saimonation

cterasdk/edge/snmp.py

@@ -37,6 +37,7 @@ def enable(self, port=161, community_str=None, username=None, auth_password=None
         param.readCommunity = community_str
         if username is not None and auth_password is not None and privacy_password is not None:
             param.snmpV3 = Object()
+            param.snmpV3._classname = 'SnmpV3Config'  # pylint: disable=protected-access
             param.snmpV3.mode = enum.Mode.Enabled
             param.snmpV3.username = username
             param.snmpV3.authenticationPassword = auth_password
@@ -53,9 +54,15 @@ def disable(self):
         logger.info("Disabled SNMP.")
 
     def get_configuration(self):
+        """
+        Get current SNMP configuration
+
+        :return: Current SNMP configuration
+        :rtype: cterasdk.common.object.Object
+        """
         return self._edge.api.get('/config/snmp')
 
-    def modify(self, port=None, community_str=None, username=None, auth_password=None, privacy_password=None):
+    def modify(self, port=161, community_str=None, username=None, auth_password=None, privacy_password=None):
         """
         Modify current SNMP configuration. Only configurations that are not `None` will be changed. SNMP must be enabled
 
@@ -68,12 +75,12 @@ def modify(self, port=None, community_str=None, username=None, auth_password=Non
         current_config = self.get_configuration()
         if current_config.mode == enum.Mode.Disabled:
             raise CTERAException("SNMP configuration cannot be modified when disabled")
-        if port:
-            current_config.port = port
+        current_config.port = port
         if community_str:
             current_config.readCommunity = community_str
         if username is not None and auth_password is not None and privacy_password is not None:
             current_config.snmpV3 = Object()
+            current_config.snmpV3._classname = 'SnmpV3Config'  # pylint: disable=protected-access
             current_config.snmpV3.mode = enum.Mode.Enabled
             current_config.snmpV3.username = username
             current_config.snmpV3.authenticationPassword = auth_password

docs/source/UserGuides/Miscellaneous/Changelog.rst

@@ -1,6 +1,17 @@
 Changelog
 =========
 
+2.20.21
+-------
+
+Related issues and pull requests on GitHub: `#319 <https://github.com/ctera/ctera-python-sdk/pull/319>`_
+
+Bug Fixes
+^^^^^^^^^
+
+* Fixed SNMPv3 configuration on Edge Filers - added missing XML class name for proper serialization
+* Fixed whitespace in SNMP docstring to resolve flake8 W293 warning
+
 2.20.20
 -------
 

tests/ut/edge/test_snmp.py

@@ -76,6 +76,7 @@ def _get_snmp_object(self, port=None, community_str=None, username=None, auth_pa
         param.readCommunity = community_str
         if username is not None and auth_password is not None and privacy_password is not None:
             param.snmpV3 = Object()
+            param.snmpV3._classname = 'SnmpV3Config'  # pylint: disable=protected-access
             param.snmpV3.mode = Mode.Enabled
             param.snmpV3.username = username
             param.snmpV3.authenticationPassword = auth_password