bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

test: Reuse S3 fixtures facilities in cqlpy/test_tools.py

Browse Source 
Creating endpoint conf can be made with the s3_server method
Getting boto3 resource from s3_server itself is also possible

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>

Closes scylladb/scylladb#27380
This commit is contained in:
Pavel Emelyanov
2025-12-02 08:10:19 +03:00
committed by Botond Dénes
parent 9213a163cb
commit 6ae72ed134
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/cluster/object_store/conftest.py
View File

@@ -135,17 +135,6 @@ async def s3_server(pytestconfig, tmpdir):
finally:
await server.stop()
def get_s3_resource(s3_server):
"""Creates boto3.resource object that can be used to communicate to the given server"""
return boto3.resource('s3',
endpoint_url=f'http://{s3_server.address}:{s3_server.port}',
aws_access_key_id=s3_server.acc_key,
aws_secret_access_key=s3_server.secret_key,
aws_session_token=None,
config=boto3.session.Config(signature_version='s3v4'),
verify=False
)
class GSFront:
def __init__(self, endpoint, bucket_name, credentials_file):
self.endpoint = endpoint

8
test/cqlpy/test_tools.py
View File

@@ -31,7 +31,7 @@ from typing import Iterable, Type, Union
from cassandra.util import Duration
import yaml
from test.cluster.object_store.conftest import s3_server, get_s3_resource
from test.cluster.object_store.conftest import s3_server
from test.pylib.minio_server import MinioServer
@@ -198,7 +198,7 @@ def all_sstables(sstables):
def upload_folder_to_s3(folder_path, s3_server):
s3_resource = get_s3_resource(s3_server)
s3_resource = s3_server.get_resource()
bucket = s3_resource.Bucket(s3_server.bucket_name)
prefix = "just/some/s3/prefix"
sstables = []
@@ -217,7 +217,7 @@ def upload_folder_to_s3(folder_path, s3_server):
def test_scylla_sstable_dump_component_with_s3(skip_s3_tests, cql, test_keyspace, scylla_path, scylla_data_dir,
scylla_home_dir, what,
where, s3_server):
objconf = MinioServer.create_conf(s3_server.address, s3_server.port, s3_server.region)
objconf = s3_server.create_endpoint_conf()
scylla_yaml_file = os.path.join(scylla_home_dir, "conf", "scylla.yaml")
with open(scylla_yaml_file, "a") as f:
f.write(f"\n{yaml.dump({'object_storage_endpoints': objconf})}")
@@ -238,7 +238,7 @@ def test_scylla_sstable_dump_component_with_s3(skip_s3_tests, cql, test_keyspace
def test_scylla_sstable_dump_data_with_s3(skip_s3_tests, cql, test_keyspace, scylla_path, scylla_data_dir,
scylla_home_dir, where,
s3_server):
objconf = MinioServer.create_conf(s3_server.address, s3_server.port, s3_server.region)
objconf = s3_server.create_endpoint_conf()
scylla_yaml_file = os.path.join(scylla_home_dir, "conf", "scylla.yaml")
with open(scylla_yaml_file, "a") as f:
f.write(f"\n{yaml.dump({'object_storage_endpoints': objconf})}")