Merge 'test.py: merge all 'Topology' suite types int one folder 'cluster'' from Artsiom Mishuta

Now that we support suite subfolders, there is no
need to create an own suite for object_store and auth_cluster, topology, topology_custom.
this PR merge all these folders into one: 'cluster"

this pr also introduce and apply 'prepare_3_nodes_cluster' fixture  that  allow preparing non-dirty 3 nodes cluster
that can be reused between tests(for tests that was in topology folder)

number of tests in master
release -3461
dev       -3472
debug   -3446

number of tests in this PR
release -3460
dev       -3471
debug   -3445

There is a minus one test in each mode because It was 2 test_topology_failure_recovery files(topology and topology_custom) with the same utility functions but different test cases. This PR merged them into one

Closes scylladb#22917

* github.com:scylladb/scylladb:
  test.py: merge object_store into cluster folder
  test.py: merge auth_cluster into cluster folter
  test.py: rename topology_custom folder to cluster
  test.py: merge topology test suite into topology_custom
  test.py delete conftest in topology_custom
  test.py apply prepare_3_nodes_cluster in topology
  test.py: introduce prepare_3_nodes_cluster marker

Author: nyh

test/auth_cluster/suite.yaml

@@ -0,0 +1,11 @@
+#
+# Copyright (C) 2025-present ScyllaDB
+#
+# SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
+#
+# This file configures pytest for all tests in this directory, and also
+# defines common test fixtures for all of them to use
+
+# migrated from old suite.yaml when tasks tests was in separate folder auth_cluster
+extra_scylla_config_options = {'authenticator':'PasswordAuthenticator',
+                                 'authorizer':'CassandraAuthorizer'}

test/auth_cluster/__init__.py test/cluster/__init__.pytest/auth_cluster/__init__.py renamed to test/cluster/__init__.py

@@ -6,7 +6,6 @@
 # This file configures pytest for all tests in this directory, and also
 # defines common test fixtures for all of them to use
 from pytest import Config
-from test.topology.conftest import *
 
 def pytest_configure(config: Config):
     config.option.auth_username = 'cassandra'

test/cluster/auth_cluster/__init__.py

@@ -11,7 +11,8 @@
 from cassandra.auth import PlainTextAuthProvider
 from test.pylib.rest_client import read_barrier
 from test.pylib.util import unique_name, wait_for_cql_and_get_hosts
-from test.topology.util import trigger_snapshot
+from test.cluster.util import trigger_snapshot
+from test.cluster.auth_cluster import extra_scylla_config_options as auth_config
 
 
 """
@@ -21,6 +22,7 @@
 @pytest.mark.asyncio
 async def test_auth_no_quorum(manager: ManagerClient) -> None:
     config = {
+        **auth_config,
         # disable auth cache
         'permissions_validity_in_ms': 0,
         'permissions_update_interval_in_ms': 0,
@@ -60,7 +62,7 @@ async def test_auth_no_quorum(manager: ManagerClient) -> None:
 """
 @pytest.mark.asyncio
 async def test_auth_raft_snapshot_transfer(manager: ManagerClient) -> None:
-    servers = await manager.servers_add(1)
+    servers = await manager.servers_add(1, config=auth_config)
 
     cql = manager.get_cql()
     await wait_for_cql_and_get_hosts(cql, servers, time.time() + 60)
@@ -73,7 +75,7 @@ async def test_auth_raft_snapshot_transfer(manager: ManagerClient) -> None:
     await trigger_snapshot(manager, servers[0])
 
     # on startup node should receive snapshot
-    snapshot_receiving_server = await manager.server_add()
+    snapshot_receiving_server = await manager.server_add(config=auth_config)
     servers.append(snapshot_receiving_server)
     await wait_for_cql_and_get_hosts(cql, servers, time.time() + 60)
     await manager.servers_see_each_other(servers)

test/auth_cluster/conftest.py test/cluster/auth_cluster/conftest.pytest/auth_cluster/conftest.py renamed to test/cluster/auth_cluster/conftest.py

@@ -9,9 +9,11 @@
 import time
 
 from cassandra.cluster import NoHostAvailable
-from test.auth_cluster.conftest import skip_mode
+from test.cluster.conftest import skip_mode
 from test.pylib.manager_client import ManagerClient, ServerUpState
 from test.pylib.util import wait_for
+from test.cluster.auth_cluster import extra_scylla_config_options as auth_config
+
 
 async def repeat_if_host_unavailable(f):
     async def try_execute(f):
@@ -30,6 +32,7 @@ async def try_execute(f):
 @skip_mode('release', 'error injection is disabled in release mode')
 async def test_auth_password_ensured(manager: ManagerClient) -> None:
     config = {
+        **auth_config,
         'authenticator': "com.scylladb.auth.TransitionalAuthenticator",
         'error_injections_at_startup': ['password_authenticator_start_pause'],
     }

test/auth_cluster/test_auth_no_quorum.py …ster/auth_cluster/test_auth_no_quorum.pytest/auth_cluster/test_auth_no_quorum.py renamed to test/cluster/auth_cluster/test_auth_no_quorum.py test/auth_cluster/test_auth_no_quorum.py renamed to test/cluster/auth_cluster/test_auth_no_quorum.py

@@ -9,14 +9,15 @@
 import pytest
 from test.pylib.rest_client import inject_error, read_barrier
 from test.pylib.util import unique_name
+from test.cluster.auth_cluster import extra_scylla_config_options as auth_config
 
 
 """
 Tests case when bigger auth operation is split into multiple raft commands.
 """
 @pytest.mark.asyncio
 async def test_auth_raft_command_split(manager: ManagerClient) -> None:
-    servers = await manager.servers_add(3)
+    servers = await manager.servers_add(3, config=auth_config)
     cql, hosts = await manager.get_ready_cql(servers)
 
     initial_perms = await cql.run_async("SELECT * FROM system.role_permissions")

…th_cluster/test_auth_password_ensured.py …th_cluster/test_auth_password_ensured.pytest/auth_cluster/test_auth_password_ensured.py renamed to test/cluster/auth_cluster/test_auth_password_ensured.py test/auth_cluster/test_auth_password_ensured.py renamed to test/cluster/auth_cluster/test_auth_password_ensured.py

@@ -13,8 +13,10 @@
 from test.pylib.rest_client import get_host_api_address, read_barrier
 from test.pylib.util import wait_for_cql_and_get_hosts, unique_name
 from cassandra.cluster import ConsistencyLevel
-from test.topology.util import wait_until_topology_upgrade_finishes, enter_recovery_state, reconnect_driver, \
+from test.cluster.util import wait_until_topology_upgrade_finishes, enter_recovery_state, reconnect_driver, \
         delete_raft_topology_state, delete_raft_data_and_upgrade_state, wait_until_upgrade_finishes
+from test.cluster.auth_cluster import extra_scylla_config_options as auth_config
+
 
 def auth_data():
     return [
@@ -147,12 +149,12 @@ async def check_auth_v2_works(manager: ManagerClient, hosts):
 @pytest.mark.asyncio
 async def test_auth_v2_migration(request, manager: ManagerClient):
     # First, force the first node to start in legacy mode
-    cfg = {'force_gossip_topology_changes': True}
+    cfg = {**auth_config, 'force_gossip_topology_changes': True, 'enable_tablets': False}
 
     servers = [await manager.server_add(config=cfg)]
     # Enable raft-based node operations for subsequent nodes - they should fall back to
     # using gossiper-based node operations
-    del cfg['force_gossip_topology_changes']
+    cfg.pop('force_gossip_topology_changes')
 
     servers += [await manager.server_add(config=cfg) for _ in range(2)]
     cql = manager.cql
@@ -184,7 +186,7 @@ async def test_auth_v2_migration(request, manager: ManagerClient):
 
 @pytest.mark.asyncio
 async def test_auth_v2_during_recovery(manager: ManagerClient):
-    servers = await manager.servers_add(3)
+    servers = await manager.servers_add(3, config=auth_config)
     cql, hosts = await manager.get_ready_cql(servers)
 
     logging.info("Checking auth version before recovery")

…_cluster/test_auth_raft_command_split.py …_cluster/test_auth_raft_command_split.pytest/auth_cluster/test_auth_raft_command_split.py renamed to test/cluster/auth_cluster/test_auth_raft_command_split.py test/auth_cluster/test_auth_raft_command_split.py renamed to test/cluster/auth_cluster/test_auth_raft_command_split.py

@@ -11,6 +11,8 @@
 from test.pylib.manager_client import ManagerClient
 
 import pytest
+from test.cluster.auth_cluster import extra_scylla_config_options as auth_config
+
 
 @pytest.mark.asyncio
 async def test_maintenance_socket(manager: ManagerClient):
@@ -19,6 +21,7 @@ async def test_maintenance_socket(manager: ManagerClient):
     even if the authentication is enabled on the regular port.
     """
     config = {
+        **auth_config,
         "authenticator": "PasswordAuthenticator",
         "authorizer": "CassandraAuthorizer",
     }

…t/auth_cluster/test_auth_v2_migration.py …r/auth_cluster/test_auth_v2_migration.pytest/auth_cluster/test_auth_v2_migration.py renamed to test/cluster/auth_cluster/test_auth_v2_migration.py test/auth_cluster/test_auth_v2_migration.py renamed to test/cluster/auth_cluster/test_auth_v2_migration.py

@@ -10,13 +10,14 @@
 from test.pylib.rest_client import get_host_api_address, read_barrier
 from test.pylib.util import unique_name, wait_for_cql_and_get_hosts
 from test.pylib.manager_client import ManagerClient
-from test.topology.util import trigger_snapshot, wait_until_topology_upgrade_finishes, enter_recovery_state, reconnect_driver, \
+from test.cluster.util import trigger_snapshot, wait_until_topology_upgrade_finishes, enter_recovery_state, reconnect_driver, \
         delete_raft_topology_state, delete_raft_data_and_upgrade_state, wait_until_upgrade_finishes, wait_for_token_ring_and_group0_consistency
-from test.topology.conftest import skip_mode
+from test.cluster.conftest import skip_mode
 from cassandra import ConsistencyLevel
 from cassandra.query import SimpleStatement
 from cassandra.protocol import InvalidRequest
 from cassandra.auth import PlainTextAuthProvider
+from test.cluster.auth_cluster import extra_scylla_config_options as auth_config
 
 
 logger = logging.getLogger(__name__)
@@ -28,7 +29,7 @@ async def test_service_levels_snapshot(manager: ManagerClient):
         Add 10 service levels. Start new server and it should get a snapshot on bootstrap.
         Stop 3 `old` servers and query the new server to validete if it has the same service levels.
     """
-    servers = await manager.servers_add(3)
+    servers = await manager.servers_add(3, config=auth_config)
     cql = manager.get_cql()
     await wait_for_cql_and_get_hosts(cql, servers, time.time() + 60)
     await manager.servers_see_each_other(servers)
@@ -44,7 +45,7 @@ async def test_service_levels_snapshot(manager: ManagerClient):
     host0 = cql.cluster.metadata.get_host(servers[0].ip_addr)
     result = await cql.run_async("SELECT service_level FROM system.service_levels_v2", host=host0)
 
-    new_server = await manager.server_add()
+    new_server = await manager.server_add(config=auth_config)
     all_servers = servers + [new_server]
     await wait_for_cql_and_get_hosts(cql, all_servers, time.time() + 60)
     await manager.servers_see_each_other(all_servers)
@@ -61,12 +62,12 @@ async def test_service_levels_snapshot(manager: ManagerClient):
 @pytest.mark.asyncio
 async def test_service_levels_upgrade(request, manager: ManagerClient):
     # First, force the first node to start in legacy mode
-    cfg = {'force_gossip_topology_changes': True}
+    cfg = {**auth_config, 'force_gossip_topology_changes': True, 'enable_tablets': False}
 
     servers = [await manager.server_add(config=cfg)]
     # Enable raft-based node operations for subsequent nodes - they should fall back to
     # using gossiper-based node operations
-    del cfg['force_gossip_topology_changes']
+    cfg.pop('force_gossip_topology_changes')
 
     servers += [await manager.server_add(config=cfg) for _ in range(2)]
     cql = manager.get_cql()
@@ -105,7 +106,7 @@ async def test_service_levels_upgrade(request, manager: ManagerClient):
 
 @pytest.mark.asyncio
 async def test_service_levels_work_during_recovery(manager: ManagerClient):
-    servers = await manager.servers_add(3)
+    servers = await manager.servers_add(3, config=auth_config)
 
     logging.info("Waiting until driver connects to every server")
     cql = manager.get_cql()
@@ -235,7 +236,7 @@ async def assert_connections_params(manager: ManagerClient, hosts, expect):
 @pytest.mark.asyncio
 @skip_mode('release', 'cql server testing REST API is not supported in release mode')
 async def test_connections_parameters_auto_update(manager: ManagerClient, build_mode):
-    servers = await manager.servers_add(3)
+    servers = await manager.servers_add(3, config=auth_config)
     cql = manager.get_cql()
     hosts = await wait_for_cql_and_get_hosts(cql, servers, time.time() + 60)
 
@@ -318,7 +319,7 @@ async def test_connections_parameters_auto_update(manager: ManagerClient, build_
 
 @pytest.mark.asyncio
 async def test_service_level_cache_after_restart(manager: ManagerClient):
-    servers = await manager.servers_add(1)
+    servers = await manager.servers_add(1, config=auth_config)
     cql = manager.get_cql()
     hosts = await wait_for_cql_and_get_hosts(cql, servers, time.time() + 60)
 
@@ -379,9 +380,11 @@ async def test_workload_prioritization_upgrade(manager: ManagerClient):
     # Using error injection, the test disables WORKLOAD_PRIORITIZATION feature
     # and removes `shares` column from system_distributed.service_levels table.
     config = {
+        **auth_config,
         'authenticator': 'AllowAllAuthenticator',
         'authorizer': 'AllowAllAuthorizer',
         'force_gossip_topology_changes': True,
+        'enable_tablets': False,
         'error_injections_at_startup': [
             {
                 'name': 'suppress_features',
@@ -417,7 +420,7 @@ async def test_workload_prioritization_upgrade(manager: ManagerClient):
 @pytest.mark.asyncio
 @skip_mode('release', 'error injection is disabled in release mode')
 async def test_service_levels_over_limit(manager: ManagerClient):
-    srv = await manager.server_add(config={
+    srv = await manager.server_add(config={**auth_config,
         "error_injections_at_startup": ['allow_service_level_over_limit']
     })
     await manager.server_start(srv.server_id)
@@ -445,7 +448,7 @@ async def test_service_levels_over_limit(manager: ManagerClient):
 # Reproduces issue scylla-enterprise#4912
 @pytest.mark.asyncio
 async def test_service_level_metric_name_change(manager: ManagerClient) -> None:
-    servers = await manager.servers_add(2)
+    servers = await manager.servers_add(2, config=auth_config)
     s = servers[0]
     cql = manager.get_cql()
     [h] = await wait_for_cql_and_get_hosts(cql, [s], time.time() + 60)
@@ -476,5 +479,5 @@ async def test_service_level_metric_name_change(manager: ManagerClient) -> None:
     await cql.run_async(f"DROP SERVICE LEVEL {sl2}", host=h)
 
     # Check if group0 is healthy
-    s2 = await manager.server_add()
+    s2 = await manager.server_add(config=auth_config)
     await wait_for_token_ring_and_group0_consistency(manager, time.time() + 30)