diff --git a/tests/kafkatest/tests/core/network_degrade_test.py b/tests/kafkatest/tests/core/network_degrade_test.py index 68cce856528..1c55d9b7e06 100644 --- a/tests/kafkatest/tests/core/network_degrade_test.py +++ b/tests/kafkatest/tests/core/network_degrade_test.py @@ -22,7 +22,7 @@ from ducktape.utils.util import wait_until from kafkatest.services.trogdor.degraded_network_fault_spec import DegradedNetworkFaultSpec from kafkatest.services.trogdor.trogdor import TrogdorService -from kafkatest.services.zookeeper import ZookeeperService +from kafkatest.services.kafka import KafkaService, quorum class NetworkDegradeTest(Test): @@ -34,36 +34,37 @@ class NetworkDegradeTest(Test): def __init__(self, test_context): super(NetworkDegradeTest, self).__init__(test_context) - self.zk = ZookeeperService(test_context, num_nodes=3) - self.trogdor = TrogdorService(context=self.test_context, client_services=[self.zk]) + self.kafka = KafkaService(test_context, num_nodes=2, zk=None, controller_num_nodes_override=2) + self.trogdor = TrogdorService(context=self.test_context, client_services=[self.kafka.controller_quorum]) def setUp(self): - self.zk.start() + self.kafka.start() self.trogdor.start() def teardown(self): self.trogdor.stop() - self.zk.stop() + self.kafka.stop() - @cluster(num_nodes=5) - @parametrize(task_name="latency-100", device_name="eth0", latency_ms=50, rate_limit_kbit=0) - @parametrize(task_name="latency-100-rate-1000", device_name="eth0", latency_ms=50, rate_limit_kbit=1000) - def test_latency(self, task_name, device_name, latency_ms, rate_limit_kbit): + @cluster(num_nodes=3) + @parametrize(task_name="latency-100", device_name="eth0", latency_ms=50, rate_limit_kbit=0, metadata_quorum=quorum.combined_kraft) + @parametrize(task_name="latency-100-rate-1000", device_name="eth0", latency_ms=50, rate_limit_kbit=1000, metadata_quorum=quorum.combined_kraft) + def test_latency(self, task_name, device_name, latency_ms, rate_limit_kbit, metadata_quorum=quorum.combined_kraft): spec = DegradedNetworkFaultSpec(0, 10000) - for node in self.zk.nodes: + for node in self.kafka.controller_quorum.nodes: spec.add_node_spec(node.name, device_name, latency_ms, rate_limit_kbit) latency = self.trogdor.create_task(task_name, spec) - zk0 = self.zk.nodes[0] - zk1 = self.zk.nodes[1] + quorum0 = self.kafka.controller_quorum.nodes[0] + quorum1 = self.kafka.controller_quorum.nodes[1] + # Capture the ping times from the ping stdout # 64 bytes from ducker01 (172.24.0.2): icmp_seq=1 ttl=64 time=0.325 ms r = re.compile(r".*time=(?P