From 79302e5e303e5032d561c45289b8e0cd4a2a5779 Mon Sep 17 00:00:00 2001 From: Lucas Kent Date: Fri, 18 Nov 2022 11:37:41 +1100 Subject: [PATCH] Splitup cassandra-cluster config folder into v3 and v4 folders (#916) --- .../docker-compose.yaml} | 0 .../topology-dummy-peers.yaml} | 0 .../topology.yaml} | 0 .../docker-compose.yaml} | 0 .../topology-dummy-peers.yaml} | 0 .../topology.yaml} | 0 .../tests/cassandra_int_tests/mod.rs | 19 ++++++++----------- test-helpers/src/docker_compose.rs | 4 ++-- 8 files changed, 10 insertions(+), 13 deletions(-) rename shotover-proxy/example-configs/{cassandra-cluster/docker-compose-cassandra-v3.yaml => cassandra-cluster-v3/docker-compose.yaml} (100%) rename shotover-proxy/example-configs/{cassandra-cluster/topology-dummy-peers-v3.yaml => cassandra-cluster-v3/topology-dummy-peers.yaml} (100%) rename shotover-proxy/example-configs/{cassandra-cluster/topology-v3.yaml => cassandra-cluster-v3/topology.yaml} (100%) rename shotover-proxy/example-configs/{cassandra-cluster/docker-compose-cassandra-v4.yaml => cassandra-cluster-v4/docker-compose.yaml} (100%) rename shotover-proxy/example-configs/{cassandra-cluster/topology-dummy-peers-v4.yaml => cassandra-cluster-v4/topology-dummy-peers.yaml} (100%) rename shotover-proxy/example-configs/{cassandra-cluster/topology-v4.yaml => cassandra-cluster-v4/topology.yaml} (100%) diff --git a/shotover-proxy/example-configs/cassandra-cluster/docker-compose-cassandra-v3.yaml b/shotover-proxy/example-configs/cassandra-cluster-v3/docker-compose.yaml similarity index 100% rename from shotover-proxy/example-configs/cassandra-cluster/docker-compose-cassandra-v3.yaml rename to shotover-proxy/example-configs/cassandra-cluster-v3/docker-compose.yaml diff --git a/shotover-proxy/example-configs/cassandra-cluster/topology-dummy-peers-v3.yaml b/shotover-proxy/example-configs/cassandra-cluster-v3/topology-dummy-peers.yaml similarity index 100% rename from shotover-proxy/example-configs/cassandra-cluster/topology-dummy-peers-v3.yaml rename to shotover-proxy/example-configs/cassandra-cluster-v3/topology-dummy-peers.yaml diff --git a/shotover-proxy/example-configs/cassandra-cluster/topology-v3.yaml b/shotover-proxy/example-configs/cassandra-cluster-v3/topology.yaml similarity index 100% rename from shotover-proxy/example-configs/cassandra-cluster/topology-v3.yaml rename to shotover-proxy/example-configs/cassandra-cluster-v3/topology.yaml diff --git a/shotover-proxy/example-configs/cassandra-cluster/docker-compose-cassandra-v4.yaml b/shotover-proxy/example-configs/cassandra-cluster-v4/docker-compose.yaml similarity index 100% rename from shotover-proxy/example-configs/cassandra-cluster/docker-compose-cassandra-v4.yaml rename to shotover-proxy/example-configs/cassandra-cluster-v4/docker-compose.yaml diff --git a/shotover-proxy/example-configs/cassandra-cluster/topology-dummy-peers-v4.yaml b/shotover-proxy/example-configs/cassandra-cluster-v4/topology-dummy-peers.yaml similarity index 100% rename from shotover-proxy/example-configs/cassandra-cluster/topology-dummy-peers-v4.yaml rename to shotover-proxy/example-configs/cassandra-cluster-v4/topology-dummy-peers.yaml diff --git a/shotover-proxy/example-configs/cassandra-cluster/topology-v4.yaml b/shotover-proxy/example-configs/cassandra-cluster-v4/topology.yaml similarity index 100% rename from shotover-proxy/example-configs/cassandra-cluster/topology-v4.yaml rename to shotover-proxy/example-configs/cassandra-cluster-v4/topology.yaml diff --git a/shotover-proxy/tests/cassandra_int_tests/mod.rs b/shotover-proxy/tests/cassandra_int_tests/mod.rs index a6c68021a..0b8e4e6bc 100644 --- a/shotover-proxy/tests/cassandra_int_tests/mod.rs +++ b/shotover-proxy/tests/cassandra_int_tests/mod.rs @@ -129,12 +129,11 @@ async fn source_tls_and_single_tls(#[case] driver: CassandraDriver) { #[tokio::test(flavor = "multi_thread")] #[serial] async fn cluster_single_rack_v3(#[case] driver: CassandraDriver) { - let _compose = - DockerCompose::new("example-configs/cassandra-cluster/docker-compose-cassandra-v3.yaml"); + let _compose = DockerCompose::new("example-configs/cassandra-cluster-v3/docker-compose.yaml"); { let _shotover_manager = ShotoverManager::from_topology_file( - "example-configs/cassandra-cluster/topology-dummy-peers-v3.yaml", + "example-configs/cassandra-cluster-v3/topology-dummy-peers.yaml", ); let connection = || async { @@ -162,8 +161,7 @@ async fn cluster_single_rack_v3(#[case] driver: CassandraDriver) { #[tokio::test(flavor = "multi_thread")] #[serial] async fn cluster_single_rack_v4(#[case] driver: CassandraDriver) { - let compose = - DockerCompose::new("example-configs/cassandra-cluster/docker-compose-cassandra-v4.yaml"); + let compose = DockerCompose::new("example-configs/cassandra-cluster-v4/docker-compose.yaml"); let connection = || async { let mut connection = CassandraConnection::new("127.0.0.1", 9042, driver).await; @@ -174,7 +172,7 @@ async fn cluster_single_rack_v4(#[case] driver: CassandraDriver) { }; { let _shotover_manager = ShotoverManager::from_topology_file( - "example-configs/cassandra-cluster/topology-v4.yaml", + "example-configs/cassandra-cluster-v4/topology.yaml", ); standard_test_suite(&connection, driver).await; @@ -191,7 +189,7 @@ async fn cluster_single_rack_v4(#[case] driver: CassandraDriver) { { let _shotover_manager = ShotoverManager::from_topology_file( - "example-configs/cassandra-cluster/topology-dummy-peers-v4.yaml", + "example-configs/cassandra-cluster-v4/topology-dummy-peers.yaml", ); cluster::single_rack_v4::test_dummy_peers(&connection().await).await; @@ -200,7 +198,7 @@ async fn cluster_single_rack_v4(#[case] driver: CassandraDriver) { cluster::single_rack_v4::test_topology_task(None, Some(9044)).await; let shotover_manager = - ShotoverManager::from_topology_file("example-configs/cassandra-cluster/topology-v4.yaml"); + ShotoverManager::from_topology_file("example-configs/cassandra-cluster-v4/topology.yaml"); cluster::single_rack_v4::test_node_going_down(compose, shotover_manager, driver, false).await; } @@ -211,11 +209,10 @@ async fn cluster_single_rack_v4(#[case] driver: CassandraDriver) { #[tokio::test(flavor = "multi_thread")] #[serial] async fn cluster_single_rack_node_lost(#[case] driver: CassandraDriver) { - let compose = - DockerCompose::new("example-configs/cassandra-cluster/docker-compose-cassandra-v4.yaml"); + let compose = DockerCompose::new("example-configs/cassandra-cluster-v4/docker-compose.yaml"); let shotover_manager = - ShotoverManager::from_topology_file("example-configs/cassandra-cluster/topology-v4.yaml"); + ShotoverManager::from_topology_file("example-configs/cassandra-cluster-v4/topology.yaml"); cluster::single_rack_v4::test_node_going_down(compose, shotover_manager, driver, true).await; } diff --git a/test-helpers/src/docker_compose.rs b/test-helpers/src/docker_compose.rs index 682b2c166..dd52601b0 100644 --- a/test-helpers/src/docker_compose.rs +++ b/test-helpers/src/docker_compose.rs @@ -144,8 +144,8 @@ impl DockerCompose { self.wait_for_log("Startup complete", 2) } "example-configs-docker/cassandra-peers-rewrite/docker-compose.yaml" - | "example-configs/cassandra-cluster/docker-compose-cassandra-v4.yaml" - | "example-configs/cassandra-cluster/docker-compose-cassandra-v3.yaml" + | "example-configs/cassandra-cluster-v4/docker-compose.yaml" + | "example-configs/cassandra-cluster-v3/docker-compose.yaml" | "example-configs/cassandra-cluster-multi-rack/docker-compose.yaml" | "example-configs/cassandra-cluster-tls/docker-compose.yaml" => { self.wait_for_log("Startup complete", 3)