solve pylint issues and add result context to filesystem operations

Author: saimonation

cterasdk/core/ssl.py

@@ -11,9 +11,6 @@ class SSL(BaseCommand):
     Portal SSL Certificate APIs
     """
 
-    def __init__(self, portal):
-        super().__init__(portal)
-
     def get(self):
         """
         Retrieve details of the current installed SSL certificate
@@ -46,7 +43,8 @@ def export(self, destination=None):
         logging.getLogger('cterasdk.core').info('Exported SSL certificate. %s', {'filepath': filepath})
         return filepath
 
-    def create_zip_archive(self, private_key, *certificates):
+    @staticmethod
+    def create_zip_archive(private_key, *certificates):
         """
         Create a ZIP archive that can be imported to CTERA Portal
 
@@ -92,7 +90,7 @@ def import_from_chain(self, private_key, *certificates):
         :param str private_key: The PEM-encoded private key, or a path to the PEM-encoded private key file
         :param list[str] certificates: The PEM-encoded certificates, or a list of paths of the PEM-encoded certificate files
         """
-        zipflie = self.create_zip_archive(private_key, *certificates)
+        zipflie = SSL.create_zip_archive(private_key, *certificates)
         return self.import_from_zip(zipflie)
 
     def _import_certificate(self, zipfile):

cterasdk/edge/config.py

@@ -16,9 +16,6 @@
 class Config(BaseCommand):
     """ Edge Filer General Configuration APIs """
 
-    def __init__(self, edge):
-        super().__init__(edge)
-
     def get_location(self):
         """
         Get the location of the Edge Filer
@@ -67,7 +64,7 @@ def import_config(self, config, exclude=None):
         if isinstance(config, Device):
             database = copy.deepcopy(config)
         elif isinstance(config, str):
-            database = self.load_config(config)
+            database = Config.load_config(config)
 
         if exclude:
             delete_attrs(database, exclude)
@@ -92,7 +89,8 @@ def _import_configuration(self, path):
             logger.info('Imported Edge Filer configuration.')
         return response
 
-    def load_config(self, config):
+    @staticmethod
+    def load_config(config):
         """
         Load the Edge Filer configuration
 
@@ -126,6 +124,7 @@ def export(self, destination=None):
         handle = self._edge.api.handle('/export')
         filepath = synfs.write(directory, filename, handle)
         logger.info('Exported configuration. %s', {'filepath': filepath})
+        return filepath
 
     def is_wizard_enabled(self):
         """

cterasdk/edge/files/browser.py

@@ -7,9 +7,6 @@
 class FileBrowser(BaseCommand):
     """ Edge Filer File Browser APIs """
 
-    def __init__(self, edge):
-        super().__init__(edge)
-
     def listdir(self, path):
         """
         List Directory

cterasdk/edge/firmware.py

@@ -12,9 +12,6 @@ class UploadTaskStatus():
 class Firmware(BaseCommand):
     """ Edge Filer Firmware upgrade API """
 
-    def __init__(self, edge):
-        super().__init__(edge)
-
     def upgrade(self, file_path, reboot=True, wait_for_reboot=True):
         """
         Upgrade the Filer firmware with the provided file

cterasdk/lib/storage/asynfs.py

@@ -1,6 +1,6 @@
 import logging
 import aiofiles
-from .commonfs import write_new_version
+from .commonfs import write_new_version, ResultContext
 
 
 logger = logging.getLogger('cterasdk.filesystem')
@@ -16,8 +16,10 @@ async def write(directory, name, handle):
     :returns: Path
     :rtype: str
     """
+    ctx = ResultContext()
     with write_new_version(directory, name) as tempfile:
         await overwrite(tempfile, handle)
+    return ctx.value
 
 
 async def overwrite(p, handle):

cterasdk/lib/storage/commonfs.py

@@ -140,13 +140,29 @@ def rename(source, new_name):
     return destination.as_posix()
 
 
+class ResultContext:
+    """Context Manager Result Context"""
+
+    def __init__(self):
+        self._value = None
+
+    @property
+    def value(self):
+        return self._value
+
+    @value.setter
+    def value(self, v):
+        self._value = v
+
+
 @contextmanager
-def write_new_version(directory, name):
+def write_new_version(directory, name, *, ctx=None):
     """
     Context manager for writing a file without conflicts.
 
     :param str directory: Parent directory
     :param str name: File name
+    :param ResultContext,optional ctx: Result Context
     :returns: Path
     :rtype: str
     :raises: FileNotFoundError
@@ -171,7 +187,9 @@ def write_new_version(directory, name):
 
     p = parent.joinpath(name)
     logger.info('Saved: %s', p.as_posix())
-    return p.as_posix()
+
+    if ctx and isinstance(ctx, ResultContext):
+        ctx.value = p.as_posix()
 
 
 def split_file_directory(location):

cterasdk/lib/storage/synfs.py

@@ -1,5 +1,5 @@
 import logging
-from .commonfs import write_new_version
+from .commonfs import write_new_version, ResultContext
 
 
 logger = logging.getLogger('cterasdk.filesystem')
@@ -15,8 +15,10 @@ def write(directory, name, handle):
     :returns: Path
     :rtype: str
     """
-    with write_new_version(directory, name) as tempfile:
+    ctx = ResultContext()
+    with write_new_version(directory, name, ctx=ctx) as tempfile:
         overwrite(tempfile, handle)
+    return ctx.value
 
 
 def overwrite(p, handle):