feat(testcontainers): refactor vshard and cartridge containers

Alex-pvl · Alex-pvl · commit 519dbbe20684 · 2026-03-04T12:56:26.000+03:00
diff --git a/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientTest.java b/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientTest.java
@@ -34,7 +34,6 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
@@ -45,8 +44,8 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.msgpack.value.ValueFactory;
 import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.ClusterContainer;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
-import org.testcontainers.containers.TarantoolContainerOperations;
 import org.testcontainers.containers.VshardClusterContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -86,7 +85,6 @@
 import io.tarantool.pool.IProtoClientPool;
 import io.tarantool.pool.InstanceConnectionGroup;
 
-@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Timeout(value = 10)
 @Testcontainers
 public class TarantoolCrudClientTest extends BaseTest {
@@ -103,7 +101,7 @@ public class TarantoolCrudClientTest extends BaseTest {
   public static final Person STUB_PERSON = new Person(0, true, String.valueOf(0));
   private static TarantoolCartridgeContainer cartridgeContainer;
   private static VshardClusterContainer vshardClusterContainer;
-  private static TarantoolContainerOperations clusterContainer;
+  private static ClusterContainer clusterContainer;
   public static final String ROUTER_1 = "ROUTER_1";
   public static final String ROUTER_2 = "ROUTER_2";
   private static TarantoolCrudClient client;
diff --git a/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientWithRetryTest.java b/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientWithRetryTest.java
@@ -21,7 +21,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
@@ -36,7 +35,6 @@
 import io.tarantool.core.exceptions.BoxError;
 import io.tarantool.mapping.Tuple;
 
-@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Timeout(value = 5)
 @Testcontainers
 public class TarantoolCrudClientWithRetryTest {
diff --git a/tarantool-spring-data/tarantool-spring-data-27/src/test/java/io/tarantool/spring/data27/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-27/src/test/java/io/tarantool/spring/data27/integration/BaseIntegrationTest.java
@@ -11,11 +11,10 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.ClusterContainer;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
-import org.testcontainers.containers.TarantoolContainerOperations;
 import org.testcontainers.containers.VshardClusterContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
@@ -24,11 +23,10 @@
 import static io.tarantool.spring.data27.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data27.config.properties.TarantoolProperties;
 
-@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Timeout(60)
 public abstract class BaseIntegrationTest {
 
-  protected static TarantoolContainerOperations<?> clusterContainer;
+  protected static ClusterContainer clusterContainer;
 
   private static final String dockerRegistry =
       System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "");
diff --git a/tarantool-spring-data/tarantool-spring-data-27/src/test/java/io/tarantool/spring/data27/integration/crud/CrudConfigurations.java b/tarantool-spring-data/tarantool-spring-data-27/src/test/java/io/tarantool/spring/data27/integration/crud/CrudConfigurations.java
@@ -13,7 +13,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -34,7 +33,6 @@
 import io.tarantool.spring.data27.integration.BaseIntegrationTest;
 import io.tarantool.spring.data27.repository.config.EnableTarantoolRepositories;
 
-@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
 abstract class CrudConfigurations extends BaseIntegrationTest {
 
diff --git a/tarantool-spring-data/tarantool-spring-data-31/src/test/java/io/tarantool/spring/data31/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-31/src/test/java/io/tarantool/spring/data31/integration/BaseIntegrationTest.java
@@ -11,11 +11,10 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.ClusterContainer;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
-import org.testcontainers.containers.TarantoolContainerOperations;
 import org.testcontainers.containers.VshardClusterContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
@@ -24,11 +23,10 @@
 import static io.tarantool.spring.data31.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data31.config.properties.TarantoolProperties;
 
-@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Timeout(60)
 public abstract class BaseIntegrationTest {
 
-  protected static TarantoolContainerOperations<?> clusterContainer;
+  protected static ClusterContainer clusterContainer;
 
   private static final String dockerRegistry =
       System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "");
diff --git a/tarantool-spring-data/tarantool-spring-data-31/src/test/java/io/tarantool/spring/data31/integration/crud/CrudConfigurations.java b/tarantool-spring-data/tarantool-spring-data-31/src/test/java/io/tarantool/spring/data31/integration/crud/CrudConfigurations.java
@@ -13,7 +13,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -34,7 +33,6 @@
 import io.tarantool.spring.data31.integration.BaseIntegrationTest;
 import io.tarantool.spring.data31.repository.config.EnableTarantoolRepositories;
 
-@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
 abstract class CrudConfigurations extends BaseIntegrationTest {
 
diff --git a/tarantool-spring-data/tarantool-spring-data-32/src/test/java/io/tarantool/spring/data32/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-32/src/test/java/io/tarantool/spring/data32/integration/BaseIntegrationTest.java
@@ -11,11 +11,10 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.ClusterContainer;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
-import org.testcontainers.containers.TarantoolContainerOperations;
 import org.testcontainers.containers.VshardClusterContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
@@ -24,11 +23,10 @@
 import static io.tarantool.spring.data32.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data32.config.properties.TarantoolProperties;
 
-@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Timeout(60)
 public abstract class BaseIntegrationTest {
 
-  protected static TarantoolContainerOperations<?> clusterContainer;
+  protected static ClusterContainer clusterContainer;
 
   private static final String dockerRegistry =
       System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "");
diff --git a/tarantool-spring-data/tarantool-spring-data-32/src/test/java/io/tarantool/spring/data32/integration/crud/CrudConfigurations.java b/tarantool-spring-data/tarantool-spring-data-32/src/test/java/io/tarantool/spring/data32/integration/crud/CrudConfigurations.java
@@ -13,7 +13,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -34,7 +33,6 @@
 import io.tarantool.spring.data32.integration.BaseIntegrationTest;
 import io.tarantool.spring.data32.repository.config.EnableTarantoolRepositories;
 
-@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
 abstract class CrudConfigurations extends BaseIntegrationTest {
 
diff --git a/tarantool-spring-data/tarantool-spring-data-33/src/test/java/io/tarantool/spring/data33/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-33/src/test/java/io/tarantool/spring/data33/integration/BaseIntegrationTest.java
@@ -11,11 +11,10 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.ClusterContainer;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
-import org.testcontainers.containers.TarantoolContainerOperations;
 import org.testcontainers.containers.VshardClusterContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
@@ -24,11 +23,10 @@
 import static io.tarantool.spring.data33.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data33.config.properties.TarantoolProperties;
 
-@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Timeout(60)
 public abstract class BaseIntegrationTest {
 
-  protected static TarantoolContainerOperations<?> clusterContainer;
+  protected static ClusterContainer clusterContainer;
 
   private static final String dockerRegistry =
       System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "");
diff --git a/tarantool-spring-data/tarantool-spring-data-33/src/test/java/io/tarantool/spring/data33/integration/crud/CrudConfigurations.java b/tarantool-spring-data/tarantool-spring-data-33/src/test/java/io/tarantool/spring/data33/integration/crud/CrudConfigurations.java
@@ -13,7 +13,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -34,7 +33,6 @@
 import io.tarantool.spring.data33.integration.BaseIntegrationTest;
 import io.tarantool.spring.data33.repository.config.EnableTarantoolRepositories;
 
-@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
 abstract class CrudConfigurations extends BaseIntegrationTest {
 
diff --git a/tarantool-spring-data/tarantool-spring-data-34/src/test/java/io/tarantool/spring/data34/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-34/src/test/java/io/tarantool/spring/data34/integration/BaseIntegrationTest.java
@@ -11,11 +11,10 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.ClusterContainer;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
-import org.testcontainers.containers.TarantoolContainerOperations;
 import org.testcontainers.containers.VshardClusterContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
@@ -24,11 +23,10 @@
 import static io.tarantool.spring.data34.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data34.config.properties.TarantoolProperties;
 
-@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Timeout(60)
 public abstract class BaseIntegrationTest {
 
-  protected static TarantoolContainerOperations<?> clusterContainer;
+  protected static ClusterContainer clusterContainer;
 
   private static final String dockerRegistry =
       System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "");
diff --git a/tarantool-spring-data/tarantool-spring-data-34/src/test/java/io/tarantool/spring/data34/integration/crud/CrudConfigurations.java b/tarantool-spring-data/tarantool-spring-data-34/src/test/java/io/tarantool/spring/data34/integration/crud/CrudConfigurations.java
@@ -13,7 +13,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -34,7 +33,6 @@
 import io.tarantool.spring.data34.integration.BaseIntegrationTest;
 import io.tarantool.spring.data34.repository.config.EnableTarantoolRepositories;
 
-@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
 abstract class CrudConfigurations extends BaseIntegrationTest {
 
diff --git a/tarantool-spring-data/tarantool-spring-data-35/src/test/java/io/tarantool/spring/data35/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-35/src/test/java/io/tarantool/spring/data35/integration/BaseIntegrationTest.java
@@ -11,11 +11,10 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.ClusterContainer;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
-import org.testcontainers.containers.TarantoolContainerOperations;
 import org.testcontainers.containers.VshardClusterContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
@@ -24,11 +23,10 @@
 import static io.tarantool.spring.data35.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data35.config.properties.TarantoolProperties;
 
-@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Timeout(60)
 public abstract class BaseIntegrationTest {
 
-  protected static TarantoolContainerOperations<?> clusterContainer;
+  protected static ClusterContainer clusterContainer;
 
   private static final String dockerRegistry =
       System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "");
diff --git a/tarantool-spring-data/tarantool-spring-data-35/src/test/java/io/tarantool/spring/data35/integration/crud/CrudConfigurations.java b/tarantool-spring-data/tarantool-spring-data-35/src/test/java/io/tarantool/spring/data35/integration/crud/CrudConfigurations.java
@@ -13,7 +13,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -34,7 +33,6 @@
 import io.tarantool.spring.data35.integration.BaseIntegrationTest;
 import io.tarantool.spring.data35.repository.config.EnableTarantoolRepositories;
 
-@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
 abstract class CrudConfigurations extends BaseIntegrationTest {
 
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/ClusterContainer.java b/testcontainers/src/main/java/org/testcontainers/containers/ClusterContainer.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2025 VK DIGITAL TECHNOLOGIES LIMITED LIABILITY COMPANY
+ * All Rights Reserved.
+ */
+
+package org.testcontainers.containers;
+
+/**
+ * Common interface for Tarantool cluster containers (vshard-based and cartridge-based). Provides
+ * access to the router endpoint and command execution.
+ */
+public interface ClusterContainer {
+
+  /**
+   * Get the router host.
+   *
+   * @return router hostname
+   */
+  String getHost();
+
+  /**
+   * Get the mapped router port (default router port 3301).
+   *
+   * @return mapped router port
+   */
+  int getPort();
+
+  /**
+   * Get the mapped port for the given original container port.
+   *
+   * @param originalPort the container-internal port
+   * @return the mapped host port
+   */
+  Integer getMappedPort(int originalPort);
+
+  /**
+   * Execute a Lua command inside the cluster router.
+   *
+   * @param command a valid Lua command or sequence of Lua commands
+   * @return command execution result
+   */
+  Container.ExecResult executeCommand(String command);
+}
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java b/testcontainers/src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/VshardClusterContainer.java b/testcontainers/src/main/java/org/testcontainers/containers/VshardClusterContainer.java
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/utils/TarantoolContainerClientHelper.java b/testcontainers/src/main/java/org/testcontainers/containers/utils/TarantoolContainerClientHelper.java
