Removed additional add_document function from couchbaseserver.py and modified overwritten changes to non-edge server code

Author: barkha06

client/src/cbltest/api/couchbaseserver.py

@@ -20,9 +20,9 @@
     ScopeAlreadyExistsException,
 )
 from couchbase.management.buckets import CreateBucketSettings
-from couchbase.management.collections import CollectionSpec
 from couchbase.management.options import CreatePrimaryQueryIndexOptions
 from couchbase.options import ClusterOptions
+from couchbase.subdocument import upsert
 from opentelemetry.trace import get_tracer
 
 from cbltest.api.error import CblTestError
@@ -87,7 +87,7 @@ def create_collections(self, bucket: str, scope: str, names: list[str]) -> None:
                 ):
                     try:
                         if name != "_default":
-                            c.create_collection(CollectionSpec(name, scope))
+                            c.create_collection(scope_name=scope, collection_name=name)
                     except CollectionAlreadyExistsException:
                         pass
 
@@ -294,6 +294,151 @@ def upsert_document(
                     f"Failed to insert document '{doc_id}' into {bucket}.{scope}.{collection}: {e}"
                 )
 
+    def delete_document(
+        self,
+        bucket: str,
+        doc_id: str,
+        scope: str = "_default",
+        collection: str = "_default",
+    ) -> None:
+        """
+        Deletes a document from the specified bucket.scope.collection.
+        """
+        with self.__tracer.start_as_current_span(
+            "delete_document",
+            attributes={
+                "cbl.bucket.name": bucket,
+                "cbl.scope.name": scope,
+                "cbl.collection.name": collection,
+                "cbl.document.id": doc_id,
+            },
+        ):
+            try:
+                bucket_obj = _try_n_times(10, 1, False, self.__cluster.bucket, bucket)
+                coll = bucket_obj.scope(scope).collection(collection)
+                coll.remove(doc_id)
+            except DocumentNotFoundException:
+                pass
+            except Exception as e:
+                raise CblTestError(
+                    f"Failed to delete document '{doc_id}' from {bucket}.{scope}.{collection}: {e}"
+                )
+
+    def get_document(
+        self,
+        bucket: str,
+        doc_id: str,
+        scope: str = "_default",
+        collection: str = "_default",
+    ) -> dict | None:
+        """
+        Gets a document from the specified bucket.scope.collection.
+
+        :param bucket: The bucket name.
+        :param doc_id: The document ID.
+        :param scope: The scope name.
+        :param collection: The collection name.
+        :return: The document content as a dictionary, or None if not found.
+        """
+        with self.__tracer.start_as_current_span(
+            "get_document",
+            attributes={
+                "cbl.bucket.name": bucket,
+                "cbl.scope.name": scope,
+                "cbl.collection.name": collection,
+                "cbl.document.id": doc_id,
+            },
+        ):
+            try:
+                bucket_obj = _try_n_times(10, 1, False, self.__cluster.bucket, bucket)
+                coll = bucket_obj.scope(scope).collection(collection)
+                result = coll.get(doc_id)
+                return result.content_as[dict] if result else None
+            except DocumentNotFoundException:
+                return None
+            except Exception as e:
+                raise CblTestError(
+                    f"Failed to get document '{doc_id}' from {bucket}.{scope}.{collection}: {e}"
+                )
+
+    def upsert_document_xattr(
+        self,
+        bucket: str,
+        doc_id: str,
+        xattr_key: str,
+        xattr_value: str,
+        scope: str = "_default",
+        collection: str = "_default",
+    ) -> None:
+        """
+        Upserts an xattr on a document using subdocument operations
+
+        :param bucket: The bucket containing the document
+        :param doc_id: The ID of the document to update
+        :param xattr_key: The xattr key to upsert
+        :param xattr_value: The value to set for the xattr
+        :param scope: The scope containing the document (default '_default')
+        :param collection: The collection containing the document (default '_default')
+        """
+        with self.__tracer.start_as_current_span(
+            "upsert_document_xattr",
+            attributes={
+                "cbl.bucket": bucket,
+                "cbl.scope": scope,
+                "cbl.collection": collection,
+                "cbl.document.id": doc_id,
+                "cbl.xattr.key": xattr_key,
+            },
+        ):
+            try:
+                col = self.__cluster.bucket(bucket).scope(scope).collection(collection)
+                col.mutate_in(
+                    doc_id,
+                    [upsert(xattr_key, xattr_value, xattr=True, create_parents=True)],
+                )
+            except Exception as e:
+                raise CblTestError(
+                    f"Failed to upsert xattr '{xattr_key}' on document '{doc_id}' in {bucket}.{scope}.{collection}: {e}"
+                )
+
+    def delete_document_xattr(
+        self,
+        bucket: str,
+        doc_id: str,
+        xattr_key: str,
+        scope: str = "_default",
+        collection: str = "_default",
+    ) -> None:
+        """
+        Deletes an xattr from a document using subdocument operations
+
+        :param bucket: The bucket containing the document
+        :param doc_id: The ID of the document
+        :param xattr_key: The xattr key to delete
+        :param scope: The scope containing the document (default '_default')
+        :param collection: The collection containing the document (default '_default')
+        """
+        with self.__tracer.start_as_current_span(
+            "delete_document_xattr",
+            attributes={
+                "cbl.bucket": bucket,
+                "cbl.scope": scope,
+                "cbl.collection": collection,
+                "cbl.document.id": doc_id,
+                "cbl.xattr.key": xattr_key,
+            },
+        ):
+            try:
+                from couchbase.subdocument import remove
+
+                col = self.__cluster.bucket(bucket).scope(scope).collection(collection)
+                col.mutate_in(
+                    doc_id,
+                    [remove(xattr_key, xattr=True)],
+                )
+            except Exception:
+                pass
+
     def start_xdcr(self, target: "CouchbaseServer", bucket_name: str) -> None:
         """
         Starts an XDCR replication from this cluster to the target cluster
@@ -449,4 +594,4 @@ def stop_xcdr(self, target: "CouchbaseServer", bucket_name: str) -> None:
                     resp = session.delete(
                         f"http://{self.__hostname}:8091/controller/cancelXDCR/{encoded}",
                     )
-                    resp.raise_for_status()
+                    resp.raise_for_status()

client/src/cbltest/api/jsongenerator.py

@@ -34,7 +34,7 @@ async def test_blobs_create_delete(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("2 documents created in Couchbase Server.")
 
         self.mark_test_step(
@@ -753,7 +753,7 @@ async def test_blob_special_characters(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("2 documents created in Couchbase Server.")
 
         self.mark_test_step(

tests/QE/edge_server/test_blobs.py

@@ -33,7 +33,7 @@ async def test_changes_feed_longpoll(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("5 documents created in Couchbase Server.")
 
         self.mark_test_step(

tests/QE/edge_server/test_changes_feed.py

@@ -11,7 +11,7 @@
 from cbltest.api.cloud import CouchbaseCloud
 from cbltest.api.edgeserver import BulkDocOperation
 from cbltest.api.httpclient import ClientFactory, HTTPClient
-from cbltest.api.jsongenerator import JSONGenerator
+from cbltest.api.json_generator import JSONGenerator
 
 
 class TestEdgeServerChaos(CBLTestClass):

tests/QE/edge_server/test_chaos_scenarios.py

@@ -32,7 +32,7 @@ async def test_conflicts(self, cblpytest: CBLPyTest, dataset_path: Path) -> None
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("10 documents created in Couchbase Server.")
 
         self.mark_test_step(

tests/QE/edge_server/test_conflicts.py

@@ -40,7 +40,7 @@ async def test_end_to_end_sgw(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("10 documents created in Couchbase Server.")
 
         self.mark_test_step(

tests/QE/edge_server/test_end_to_end.py

@@ -33,7 +33,7 @@ async def test_audit_logging_default(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("5 documents created in Couchbase Server.")
 
         self.mark_test_step(
@@ -170,7 +170,7 @@ async def test_audit_logging_disabled(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("5 documents created in Couchbase Server.")
 
         self.mark_test_step(
@@ -288,7 +288,7 @@ async def test_audit_logging_enabled(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("5 documents created in Couchbase Server.")
 
         self.mark_test_step(

tests/QE/edge_server/test_logging.py

@@ -44,7 +44,7 @@ async def test_system_one_client_l(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("10 documents created in Couchbase Server.")
 
         self.mark_test_step(
@@ -376,7 +376,7 @@ async def test_system_one_client_chaos(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("10 documents created in Couchbase Server.")
 
         self.mark_test_step(
@@ -759,7 +759,7 @@ async def test_system_multiple_clients_l(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("10 documents created in Couchbase Server.")
 
         self.mark_test_step(
@@ -1203,7 +1203,7 @@ async def test_system_multiple_clients_chaos(
                 "channels": ["public"],
                 "timestamp": datetime.utcnow().isoformat(),
             }
-            server.add_document(bucket_name, doc["id"], doc)
+            server.upsert_document(bucket_name, doc["id"], doc)
         logger.info("10 documents created in Couchbase Server.")
 
         self.mark_test_step(