feat(treewide): move from SimpleStrategy to NetworkTopologyStrategy in tests

Because of #4555, but also because
it's better to test recommended keyspace replication strategy, we need to replace
SimpleStrategy with NetworkTopologyStrategy in tests wherever possible.
In case test is aiming to run against SimpleStrategy specifically, it needs to be
adjusted so that it ensures that keyspace with SimpleStrategy does not use tablets.

Refs #4555

Author: Michal-Leszczynski

pkg/scyllaclient/client_scylla_integration_test.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2017 ScyllaDB
+// Copyright (C) 2025 ScyllaDB
 
 //go:build all || integration
 
@@ -125,10 +125,20 @@ func TestClientDescribeRingIntegration(t *testing.T) {
 	clusterSession := db.CreateSessionAndDropAllKeyspaces(t, client)
 	defer clusterSession.Close()
 
+	ni, err := client.AnyNodeInfo(t.Context())
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	ringDescriber := scyllaclient.NewRingDescriber(context.Background(), client)
 	for i := range testCases {
 		tc := testCases[i]
 		t.Run(tc.name, func(t *testing.T) {
+			if CheckConstraint(t, ni.ScyllaVersion, ">= 2025.1") && tc.replication != scyllaclient.NetworkTopologyStrategy {
+				// Tablets need to be manually disabled when using non
+				// NetworkTopologyStrategy keyspace replication strategy.
+				tc.replicationStmt += " AND tablets = {'enabled': false}"
+			}
 			if err := clusterSession.ExecStmt(fmt.Sprintf("CREATE KEYSPACE %s WITH replication = %s", tc.name, tc.replicationStmt)); err != nil {
 				t.Fatal(err)
 			}

pkg/service/restore/restore_integration_test.go

@@ -65,7 +65,7 @@ func TestRestoreTablesUserIntegration(t *testing.T) {
 	Print("Log in via restored user and check permissions")
 	userSession := CreateManagedClusterSession(t, false, h.dstCluster.Client, user, pass)
 	newKs := randomizedName("ks_")
-	ExecStmt(t, userSession, fmt.Sprintf("CREATE KEYSPACE %s WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 2}", newKs))
+	ExecStmt(t, userSession, fmt.Sprintf("CREATE KEYSPACE %s WITH replication = {'class': 'NetworkTopologyStrategy', 'replication_factor': 2}", newKs))
 }
 
 func TestRestoreTablesNoReplicationIntegration(t *testing.T) {
@@ -74,7 +74,7 @@ func TestRestoreTablesNoReplicationIntegration(t *testing.T) {
 	ks := randomizedName("no_rep_ks_")
 	tab := randomizedName("tab_")
 	Printf("Create non replicated %s.%s in both cluster", ks, tab)
-	ksStmt := fmt.Sprintf("CREATE KEYSPACE %q WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}", ks)
+	ksStmt := fmt.Sprintf("CREATE KEYSPACE %q WITH replication = {'class': 'NetworkTopologyStrategy', 'dc1': 1}", ks)
 	tabStmt := fmt.Sprintf("CREATE TABLE %q.%q (id int PRIMARY KEY, data int)", ks, tab)
 	ExecStmt(t, h.srcCluster.rootSession, ksStmt)
 	ExecStmt(t, h.srcCluster.rootSession, tabStmt)

pkg/testutils/db/db.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2017 ScyllaDB
+// Copyright (C) 2025 ScyllaDB
 
 package db
 
@@ -154,7 +154,7 @@ func createTestKeyspace(tb testing.TB, cluster *gocql.ClusterConfig, keyspace st
 
 	ExecStmt(tb, session, fmt.Sprintf(`CREATE KEYSPACE %s
 	WITH replication = {
-		'class' : 'SimpleStrategy',
+		'class' : 'NetworkTopologyStrategy',
 		'replication_factor' : %d
 	}`, keyspace, 1))
 }