Saimon/improve ntp config (#137)

* Add ntp commands, fix docs and log print

Author: saimonation

cterasdk/core/cloudfs.py

@@ -62,7 +62,7 @@ def mkfg(self, name, user=None):
             logging.getLogger().info('Folder group created. %s', {'name': name, 'owner': param.owner})
             return response
         except CTERAException as error:
-            logging.getLogger().error('Folder group creation failed. %s', {'name': name, 'owner': user})
+            logging.getLogger().error('Folder group creation failed. %s', {'name': name, 'owner': str(user)})
             raise error
 
     def rmfg(self, name):

cterasdk/edge/ntp.py

@@ -7,29 +7,30 @@
 class NTP(BaseCommand):
     """ Gateway NTP configuration """
 
+    def get_configuration(self):
+        return self._gateway.get('/config/time')
+
+    @property
+    def servers(self):
+        return self._gateway.get('/config/time/NTPServer')
+
     def enable(self, servers=None):
         """
         Enable NTP
 
         :param list[str] servers: List of NTP servers address
         """
         logging.getLogger().info("Enabling time synchronization with ntp servers.")
-
         self._gateway.put('/config/time/NTPMode', Mode.Enabled)
-
         logging.getLogger().info("Time synchronization enabled.")
 
         if servers:
             logging.getLogger().info("Updating time servers. %s", {'servers': servers})
-
             self._gateway.put('/config/time/NTPServer', servers)
-
             logging.getLogger().info("Time servers updated. %s", {'servers': servers})
 
     def disable(self):
         """ Disable NTP """
         logging.getLogger().info("Disabling time synchronization with ntp servers.")
-
         self._gateway.put('/config/time/NTPMode', Mode.Disabled)
-
         logging.getLogger().info("Time synchronization disabled.")

docs/source/user_guides/Gateway/Gateway.rst

@@ -1080,7 +1080,7 @@ SSL
 .. automethod:: cterasdk.edge.ssl.SSL.remove_storage_ca
    :noindex:
 
-.. automethod:: cterasdk.edge.ssl.SSL.set_certificate
+.. automethod:: cterasdk.edge.ssl.SSL.import_certificate
    :noindex:
 
 .. code-block:: python
@@ -1096,7 +1096,7 @@ SSL
    Specify certificates in the following order: domain cert, intermediary certs, CA cert
    You may include as many intermediate certificates as needed
    """
-   filer.ssl.set_certificate(private_key, certificate, intermediate_cert, ca_certificate)
+   filer.ssl.import_certificate(private_key, certificate, intermediate_cert, ca_certificate)
 
 .. danger: Exercise caution. Test thoroughly prior to implementing in production. Ensure the integrity of the PEM encoded private key and certificates. Supplying an invalid private key or certificate will disable administrative access to the filer and would require CTERA Support to re-enable it.
 

tests/ut/test_edge_ntp.py

@@ -7,6 +7,13 @@
 
 class TestEdgeNTP(base_edge.BaseEdgeTest):
 
+    def test_get_configuration(self):
+        get_response = 'Success'
+        self._init_filer(get_response=get_response)
+        ret = ntp.NTP(self._filer).get_configuration()
+        self._filer.get.assert_called_once_with('/config/time')
+        self.assertEqual(ret, get_response)
+
     def test_enable_ntp(self):
         self._init_filer()
         ntp.NTP(self._filer).enable()