PYCBC-1682: Use the server default for storage backend when creating buckets

Motivation
==========
The default storage backend can change in the future. We should not set the storage backend in create_bucket requests, to ensure the server default is used.

Changes
=======
* If storage_backend is not set, don't set it to couchstore in the request. Leave it unset so the server uses its own default.
* Update tests to reflect this change.

Results
=======
All tests pass.

Change-Id: I3630d75b823879e163d078b0292574b35b49f32f
Reviewed-on: https://review.couchbase.org/c/couchbase-python-client/+/225951
Tested-by: Build Bot <build@couchbase.com>
Reviewed-by: Jared Casey <jared.casey@couchbase.com>

Author: DemetrisChr

acouchbase/tests/bucketmgmt_t.py

@@ -265,7 +265,10 @@ async def test_bucket_backend_default(self, cb_env, test_bucket):
                 ram_quota_mb=100,
                 flush_enabled=False))
         bucket = await cb_env.try_n_times(10, 3, cb_env.bm.get_bucket, test_bucket)
-        assert bucket.storage_backend == StorageBackend.COUCHSTORE
+        if cb_env.supports_feature('magma_128_buckets'):
+            assert bucket.storage_backend == StorageBackend.MAGMA
+        else:
+            assert bucket.storage_backend == StorageBackend.COUCHSTORE
 
     @pytest.mark.usefixtures("check_bucket_storage_backend_supported")
     @pytest.mark.usefixtures("purge_buckets")
@@ -281,6 +284,20 @@ async def test_bucket_backend_magma(self, cb_env, test_bucket):
         bucket = await cb_env.try_n_times(10, 3, cb_env.bm.get_bucket, test_bucket)
         assert bucket.storage_backend == StorageBackend.MAGMA
 
+    @pytest.mark.usefixtures("check_bucket_storage_backend_supported")
+    @pytest.mark.usefixtures("purge_buckets")
+    @pytest.mark.asyncio
+    async def test_bucket_backend_couchstore(self, cb_env, test_bucket):
+        # Create the bucket
+        await cb_env.bm.create_bucket(
+            CreateBucketSettings(
+                name=test_bucket,
+                ram_quota_mb=100,
+                flush_enabled=False,
+                storage_backend=StorageBackend.COUCHSTORE))
+        bucket = await cb_env.try_n_times(10, 3, cb_env.bm.get_bucket, test_bucket)
+        assert bucket.storage_backend == StorageBackend.COUCHSTORE
+
     @pytest.mark.usefixtures("check_bucket_storage_backend_supported")
     @pytest.mark.usefixtures("purge_buckets")
     @pytest.mark.asyncio

couchbase/management/logic/buckets_logic.py

@@ -401,8 +401,7 @@ class BucketSettings(dict):
                                ParamTransform("storageBackend",
                                               EnumToStr(StorageBackend)),
                                ParamTransform("storageBackend",
-                                              StrToEnum(StorageBackend)),
-                               default=StorageBackend.COUCHSTORE),
+                                              StrToEnum(StorageBackend))),
         BidirectionalTransform("history_retention_collection_default",
                                ParamTransform("historyRetentionCollectionDefault", Identity(bool, optional=True)),
                                ParamTransform("historyRetentionCollectionDefault", Identity(bool, optional=True))),

couchbase/tests/bucketmgmt_t.py

@@ -40,6 +40,7 @@ class BucketManagementTestSuite:
         'test_bucket_backend_default',
         'test_bucket_backend_ephemeral',
         'test_bucket_backend_magma',
+        'test_bucket_backend_couchstore',
         'test_bucket_create',
         'test_bucket_create_durability',
         'test_bucket_create_fail',
@@ -88,6 +89,11 @@ def check_non_deduped_history_supported(self, cb_env):
                                                        cb_env.server_version_short,
                                                        cb_env.mock_server_type)
 
+    def supports_magma_128_buckets(self, cb_env):
+        return EnvironmentFeatures.supports_feature('magma_128_buckets',
+                                                    cb_env.server_version_short,
+                                                    cb_env.mock_server_type) is None
+
     @pytest.fixture()
     def drop_bucket(self, cb_env):
         yield
@@ -105,7 +111,10 @@ def test_bucket_backend_default(self, cb_env):
                 flush_enabled=False))
         cb_env.consistency.wait_until_bucket_present(bucket_name)
         bucket = cb_env.bm.get_bucket(bucket_name)
-        assert bucket.storage_backend == StorageBackend.COUCHSTORE
+        if self.supports_magma_128_buckets(cb_env):
+            assert bucket.storage_backend == StorageBackend.MAGMA
+        else:
+            assert bucket.storage_backend == StorageBackend.COUCHSTORE
 
     @pytest.mark.usefixtures('check_bucket_storage_backend_supported')
     @pytest.mark.usefixtures('drop_bucket')
@@ -137,6 +146,21 @@ def test_bucket_backend_magma(self, cb_env):
         bucket = cb_env.bm.get_bucket(bucket_name)
         assert bucket.storage_backend == StorageBackend.MAGMA
 
+    @pytest.mark.usefixtures('check_bucket_storage_backend_supported')
+    @pytest.mark.usefixtures('drop_bucket')
+    def test_bucket_backend_couchstore(self, cb_env):
+        bucket_name = cb_env.get_bucket_name()
+        # Create the bucket
+        cb_env.bm.create_bucket(
+            CreateBucketSettings(
+                name=bucket_name,
+                ram_quota_mb=100,
+                flush_enabled=False,
+                storage_backend=StorageBackend.COUCHSTORE))
+        cb_env.consistency.wait_until_bucket_present(bucket_name)
+        bucket = cb_env.bm.get_bucket(bucket_name)
+        assert bucket.storage_backend == StorageBackend.COUCHSTORE
+
     @pytest.mark.usefixtures('check_bucket_mgmt_supported')
     @pytest.mark.usefixtures('drop_bucket')
     def test_bucket_create(self, cb_env):

tests/helpers.py

@@ -138,6 +138,7 @@ class ServerFeatures(Enum):
     ScopeSearchIndexManagement = 'scope_search_index_mgmt'
     ScopeEventingFunctionManagement = 'scope_eventing_function_mgmt'
     ServerGroups = 'server_groups'
+    Magma128Buckets = 'magma_128_buckets'
 
 
 # mock and real server (all versions) should have these features
@@ -217,6 +218,8 @@ class ServerFeatures(Enum):
 
 AT_LEAST_V7_6_2_FEATURES = [ServerFeatures.ServerGroups]
 
+AT_LEAST_V8_0_0_FEATURES = [ServerFeatures.Magma128Buckets]
+
 # Only set the baseline needed
 TEST_SUITE_MAP = {
     'analytics_t': [ServerFeatures.Analytics],
@@ -519,6 +522,11 @@ def supports_feature(self, feature  # type: str  # noqa: C901
                         or self.server_version_short > 7.6)
             return not self.is_mock_server
 
+        if feature in map(lambda f: f.value, AT_LEAST_V8_0_0_FEATURES):
+            if self.is_real_server:
+                return self.server_version_short >= 8.0
+            return not self.is_mock_server
+
         raise CouchbaseTestEnvironmentException(f"Unable to determine if server has provided feature: {feature}")
 
     def feature_not_supported_text(self, feature  # type: str  # noqa: C901

tests/test_features.py

@@ -73,6 +73,7 @@ class ServerFeatures(Enum):
     ScopeEventingFunctionManagement = 'scope_eventing_function_mgmt'
     BinaryTxns = 'binary_txns'
     ServerGroups = 'server_groups'
+    Magma128Buckets = 'magma_128_buckets'
 
 
 class EnvironmentFeatures:
@@ -156,6 +157,8 @@ class EnvironmentFeatures:
     AT_LEAST_V7_6_2_FEATURES = [ServerFeatures.BinaryTxns,
                                 ServerFeatures.ServerGroups]
 
+    AT_LEAST_V8_0_0_FEATURES = [ServerFeatures.Magma128Buckets]
+
     AT_MOST_V7_2_0_FEATURES = [ServerFeatures.RateLimiting]
 
     @staticmethod
@@ -369,3 +372,13 @@ def supports_feature(feature,  # type: str  # noqa: C901
                         f'Using server version: {server_version}.{patch}.')
 
             return None
+
+        if feature in map(lambda f: f.value, EnvironmentFeatures.AT_LEAST_V8_0_0_FEATURES):
+            if is_mock_server:
+                return f'Mock server does not support feature: {feature}'
+
+            if server_version < 8:
+                return (f'Feature: {feature} only supported on server versions >= 8.0. '
+                        f'Using server version: {server_version}.')
+
+            return None