At 9.37

dell · Jan 15, 2025 · bb77bfd · bb77bfd
1 parent e6c739f
commit bb77bfd
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 69 deletions.
diff --git a/.pylintrc b/.pylintrc
@@ -7,4 +7,18 @@ disable=
     inconsistent-return-statements,
     arguments-differ,
     too-many-arguments,
-    too-many-positional-arguments
+    too-many-positional-arguments,
+    too-few-public-methods,
+    broad-exception-raised,
+    invalid-name,
+    assignment-from-no-return,
+    global-statement,
+    fixme,
+    assignment-from-none,
+    too-many-instance-attributes,
+    too-many-lines,
+    redefined-builtin,
+    super-with-arguments,
+    too-many-public-methods,
+    no-member,
+    too-many-return-statements
diff --git a/PyPowerStore/client.py b/PyPowerStore/client.py
@@ -428,20 +428,20 @@ def request(self, http_method, url, payload=None, querystring=None, all_pages=No
                 raise PowerStoreException(PowerStoreException.VALUE_ERROR, error_msg)
         except SSLError as exception:
             LOG.error(str(exception))
-            raise PowerStoreException(PowerStoreException.SSL_ERROR, str(exception))
+            raise PowerStoreException(PowerStoreException.SSL_ERROR, str(exception)) from exception
         except ConnectionError as exception:
             LOG.error(str(exception))
             raise PowerStoreException(
-                PowerStoreException.CONNECTION_ERROR, str(exception)
+                PowerStoreException.CONNECTION_ERROR, str(exception) from exception
             )
         except TooManyRedirects as exception:
             LOG.error(str(exception))
             raise PowerStoreException(
-                PowerStoreException.TOO_MANY_REDIRECTS_ERROR, str(exception)
+                PowerStoreException.TOO_MANY_REDIRECTS_ERROR, str(exception) from exception
             )
         except Timeout as exception:
             LOG.error(str(exception))
-            raise PowerStoreException(PowerStoreException.TIMEOUT_ERROR, str(exception))
+            raise PowerStoreException(PowerStoreException.TIMEOUT_ERROR, str(exception)) from exception
         except socket.error as exception:
             LOG.error(str(exception))
-            raise PowerStoreException(PowerStoreException.SOCKET_ERR, str(exception))
+            raise PowerStoreException(PowerStoreException.SOCKET_ERR, str(exception)) from exception
diff --git a/PyPowerStore/tests/unit_tests/data/common_data.py b/PyPowerStore/tests/unit_tests/data/common_data.py
@@ -722,7 +722,7 @@ class CommonData:
             "messages": [
                 {
                     "arguments": [
-                        "[File system delete rejected due " "to existing snap(s).]"
+                        "[File system delete rejected due to existing snap(s).]"
                     ],
                     "code": "0xE08010080003",
                     "message_l10n": "Deletion of File System failed "

diff --git a/PyPowerStore/tests/unit_tests/data/file_system_data.py b/PyPowerStore/tests/unit_tests/data/file_system_data.py
@@ -78,7 +78,7 @@ class FileSystemData:
             "messages": [
                 {
                     "arguments": [
-                        "[File system delete rejected due " "to existing snap(s).]"
+                        "[File system delete rejected due to existing snap(s).]"
                     ],
                     "code": "0xE08010080003",
                     "message_l10n": "Deletion of File System failed "

diff --git a/PyPowerStore/tests/unit_tests/mock_client.py b/PyPowerStore/tests/unit_tests/mock_client.py
@@ -1,7 +1,7 @@
 import base64
 import json
 
-import PyPowerStore.tests.unit_tests.myrequests as myrequests
+from PyPowerStore.tests.unit_tests import myrequests
 from PyPowerStore.utils import constants
 
 # from myrequests.exceptions import SSLError
@@ -232,23 +232,6 @@ def request(self, http_method, url, payload=None, querystring=None, all_pages=No
                         str(ex), http_method, url, payload, querystring
                     )
                 )
-                raise PowerStoreException(PowerStoreException.VALUE_ERROR, error_msg)
+                raise PowerStoreException(PowerStoreException.VALUE_ERROR, error_msg) from ex
         except Exception:
             raise
-        """
-        except socket.error as exception:
-            raise PowerStoreException(PowerStoreException.SOCKET_ERR,
-                                      str(exception))
-        except SSLError as exception:
-            raise PowerStoreException(PowerStoreException.SSL_ERROR,
-                                      str(exception))
-        except ConnectionError as exception:
-            raise PowerStoreException(PowerStoreException.CONNECTION_ERROR,
-                                      str(exception))
-        except TooManyRedirects as exception:
-            raise PowerStoreException(
-                PowerStoreException.TOO_MANY_REDIRECTS_ERROR, str(exception))
-        except Timeout as exception:
-            raise PowerStoreException(PowerStoreException.TIMEOUT_ERROR,
-                                      str(exception))
-        """
diff --git a/PyPowerStore/tests/unit_tests/myrequests.py b/PyPowerStore/tests/unit_tests/myrequests.py
@@ -151,6 +151,7 @@ def json(self):
 
 
 def get_entity_class(url):
+    klass = ''
     url_split = url.split("/")
     if ENTITY_CLASS_MAPPING.get(url_split[-1]):
         # generic request .i.e. '/<entity>'

diff --git a/PyPowerStore/utils/constants.py b/PyPowerStore/utils/constants.py
@@ -679,7 +679,7 @@
 RESTORE_FILESYSTEM_URL = "https://{0}/api/rest/file_system/{1}/restore"
 
 MODIFY_FILESYSTEM_URL = GET_FILESYSTEM_DETAILS_URL
-CREATE_FILESYSTEM_SNAPSHOT_URL = "https://{0}/api/rest/file_system/{1}/" "snapshot"
+CREATE_FILESYSTEM_SNAPSHOT_URL = "https://{0}/api/rest/file_system/{1}/snapshot"
 GET_SNAPSHOTS_FILESYSTEM_URL = GET_FILE_SYSTEM_LIST_URL
 
 # Network endpoints

diff --git a/pylint_issue.log b/pylint_issue.log