Merge branch 'master' into ronerez/edge-mapping

Author: saimonation

cterasdk/core/buckets.py

@@ -40,27 +40,30 @@ def get(self, name, include=None):
             raise ObjectNotFoundException(f'/locations/{name}')
         return bucket
 
-    def add(self, name, bucket, read_only=False, dedicated_to=None):
+    def add(self, name, bucket, read_only=False, dedicated_to=None, direct=None):
         """
         Add a Bucket
 
         :param str name: Name of the bucket
         :param cterasdk.core.types.Bucket bucket: Storage bucket to add
         :param bool,optional read_only: Set bucket to read-delete only, defaults to False
         :param str,optional dedicated_to: Name of a tenant, defaults to ``None``
+        :param bool,optional direct: Enable CTERA Direct IO
         """
         param = bucket.to_server_object()
         param.name = name
         param.readOnly = read_only
         param.dedicated = bool(dedicated_to)
         param.dedicatedPortal = self._get_tenant_base_object_ref(dedicated_to) if dedicated_to else None
+        if direct is not None:
+            param.directUpload = direct
 
-        logger.info('Adding bucket. %s', {'name': name, 'bucket': bucket.bucket, 'type': bucket.__class__.__name__})
+        logger.info('Adding %s bucket: %s', bucket.__class__.__name__, name)
         response = self._core.api.add('/locations', param)
-        logger.info('Bucket added. %s', {'name': name, 'bucket': bucket.bucket, 'type': bucket.__class__.__name__})
+        logger.info('Bucket added: %s', name)
         return response
 
-    def modify(self, current_name, new_name=None, read_only=None, dedicated_to=None, verify_ssl=None):
+    def modify(self, current_name, new_name=None, read_only=None, dedicated_to=None, verify_ssl=None, direct=None):
         """
         Modify a Bucket
 
@@ -70,6 +73,7 @@ def modify(self, current_name, new_name=None, read_only=None, dedicated_to=None,
         :param bool,optional dedicated: Dedicate bucket to a tenant
         :param bool,optional verify_ssl: ``False`` to trust all certificate, ``True`` to verify.
         :param str,optional dedicated_to: Tenant name
+        :param bool,optional direct: Set CTERA Direct IO
         """
         param = self._get_entire_object(current_name)
         if new_name:
@@ -88,9 +92,11 @@ def modify(self, current_name, new_name=None, read_only=None, dedicated_to=None,
                 param.dedicatedPortal = self._get_tenant_base_object_ref(dedicated_to) if dedicated_to else None
         if verify_ssl is not None:
             param.trustAllCertificates = not verify_ssl
-        logger.info("Modifying bucket. %s", {'name': current_name})
+        if direct is not None:
+            param.directUpload = direct
+        logger.info("Modifying bucket: %s", current_name)
         response = self._core.api.put(f'/locations/{current_name}', param)
-        logger.info("Bucket modified. %s", {'name': current_name})
+        logger.info("Bucket modified: %s", current_name)
         return response
 
     def list_buckets(self, include=None):

docs/source/UserGuides/Miscellaneous/Changelog.rst

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+2.20.16
+-------
+
+Improvements
+^^^^^^^^^^^^
+
+* Added support for enabling or disabling Direct Mode on CTERA Portal Storage Nodes.
+
+Related issues and pull requests on GitHub: `#310 <https://github.com/ctera/ctera-python-sdk/pull/310>`_
+
 2.20.15
 -------
 

tests/ut/core/admin/test_buckets.py

@@ -43,7 +43,9 @@ def test_add_bucket(self):
         get_multi_response = munch.Munch({'name': self._tenant_name, 'baseObjectRef': self._tenant_base_object_ref})
         self._init_global_admin(get_multi_response=get_multi_response, add_response=add_response)
         bucket = AmazonS3(self._bucket_name, self._access_key, self._secret_key)
-        ret = buckets.Buckets(self._global_admin).add(self._bucket_name, bucket, read_only=True, dedicated_to=self._tenant_name)
+        ret = buckets.Buckets(self._global_admin).add(
+            self._bucket_name, bucket, read_only=True,
+            dedicated_to=self._tenant_name, direct=True)
         self._global_admin.api.get_multi.assert_called_once_with(f'/portals/{self._tenant_name}', mock.ANY)
         expected_include = ['/' + attr for attr in portals.Portals.default + ['baseObjectRef']]
         actual_include = self._global_admin.api.get_multi.call_args[0][1]
@@ -53,7 +55,21 @@ def test_add_bucket(self):
         self._global_admin.api.add.assert_called_once_with('/locations', mock.ANY)
         expected_param = TestCoreBuckets._customize_bucket(bucket.to_server_object(), name=self._bucket_name,
                                                            readOnly=True, dedicated=True,
-                                                           dedicatedPortal=self._tenant_base_object_ref, trustAllCertificates=False)
+                                                           dedicatedPortal=self._tenant_base_object_ref,
+                                                           trustAllCertificates=False, directUpload=True)
+        actual_param = self._global_admin.api.add.call_args[0][1]
+        self._assert_equal_objects(actual_param, expected_param)
+        self.assertEqual(ret, add_response)
+
+    def test_add_bucket_default_attrs(self):
+        add_response = 'Success'
+        self._init_global_admin(add_response=add_response)
+        bucket = AmazonS3(self._bucket_name, self._access_key, self._secret_key)
+        ret = buckets.Buckets(self._global_admin).add(self._bucket_name, bucket)
+        self._global_admin.api.add.assert_called_once_with('/locations', mock.ANY)
+        expected_param = TestCoreBuckets._customize_bucket(bucket.to_server_object(), name=self._bucket_name,
+                                                           readOnly=False, dedicated=False,
+                                                           dedicatedPortal=None, trustAllCertificates=False)
         actual_param = self._global_admin.api.add.call_args[0][1]
         self._assert_equal_objects(actual_param, expected_param)
         self.assertEqual(ret, add_response)
@@ -68,6 +84,16 @@ def test_modify_bucket_name_ro_remove_dedication(self):
         actual_param = self._global_admin.api.put.call_args[0][1]
         self._assert_equal_objects(actual_param, expected_param)
 
+    def test_modify_bucket_direct_mode(self):
+        get_response = munch.Munch({'name': self._bucket_name, 'directUpload': False})
+        self._init_global_admin(get_response=get_response)
+        buckets.Buckets(self._global_admin).modify(self._bucket_name, direct=True)
+        self._global_admin.api.get.assert_called_once_with(f'/locations/{self._bucket_name}')
+        self._global_admin.api.put.assert_called_once_with(f'/locations/{self._bucket_name}', mock.ANY)
+        expected_param = TestCoreBuckets._get_bucket_param(name=self._bucket_name, directUpload=True)
+        actual_param = self._global_admin.api.put.call_args[0][1]
+        self._assert_equal_objects(actual_param, expected_param)
+
     def test_modify_bucket_value_error(self):
         self._init_global_admin(get_response=None)
         with self.assertRaises(ValueError):