Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ST] Remove un-necessary check inside testKafkaConnectAndConnectorStatus #9673

Merged
merged 2 commits into from
Feb 11, 2024
Merged

[ST] Remove un-necessary check inside testKafkaConnectAndConnectorStatus #9673

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14bd1e7
[ST] Remove un-necessary check inside testKafkaConnectAndConnectorStatus
see-quick Feb 10, 2024
6aa95fb
checkstyle and imports
see-quick Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 0 additions & 28 deletions systemtest/src/test/java/io/strimzi/systemtest/operators/CustomResourceStatusST.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import io.strimzi.api.kafka.model.connect.ConnectorPlugin;
import io.strimzi.api.kafka.model.connect.KafkaConnectResources;
import io.strimzi.api.kafka.model.connect.KafkaConnectStatus;
import io.strimzi.api.kafka.model.connector.KafkaConnectorStatus;
import io.strimzi.api.kafka.model.kafka.KafkaBuilder;
import io.strimzi.api.kafka.model.kafka.KafkaResources;
import io.strimzi.api.kafka.model.kafka.KafkaStatus;
Expand Down Expand Up @@ -64,15 +63,13 @@
import io.strimzi.systemtest.utils.kafkaUtils.KafkaUtils;
import io.strimzi.systemtest.utils.kubeUtils.controllers.DeploymentUtils;
import io.strimzi.systemtest.utils.kubeUtils.objects.PodUtils;
import io.strimzi.test.TestUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.extension.ExtensionContext;

import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -266,7 +263,6 @@ void testKafkaConnectAndConnectorStatus(ExtensionContext extensionContext) {
.build());

assertKafkaConnectStatus(1, connectUrl);
assertKafkaConnectorStatus(1, "RUNNING|UNASSIGNED", "source", List.of(EXAMPLE_TOPIC_NAME));

KafkaConnectResource.replaceKafkaConnectResourceInSpecificNamespace(CUSTOM_RESOURCE_STATUS_CLUSTER_NAME,
kb -> kb.getSpec().setBootstrapServers("non-existing-bootstrap"), testStorage.getNamespaceName());
Expand All @@ -290,8 +286,6 @@ void testKafkaConnectAndConnectorStatus(ExtensionContext extensionContext) {
KafkaConnectorUtils.waitForConnectorReady(testStorage.getNamespaceName(), CUSTOM_RESOURCE_STATUS_CLUSTER_NAME);
KafkaConnectUtils.waitForConnectReady(testStorage.getNamespaceName(), CUSTOM_RESOURCE_STATUS_CLUSTER_NAME);

assertKafkaConnectorStatus(1, "RUNNING|UNASSIGNED", "source", List.of(EXAMPLE_TOPIC_NAME));

String defaultClass = KafkaConnectorResource.kafkaConnectorClient().inNamespace(testStorage.getNamespaceName()).withName(CUSTOM_RESOURCE_STATUS_CLUSTER_NAME).get().getSpec().getClassName();

KafkaConnectorResource.replaceKafkaConnectorResourceInSpecificNamespace(CUSTOM_RESOURCE_STATUS_CLUSTER_NAME,
Expand All @@ -306,7 +300,6 @@ void testKafkaConnectAndConnectorStatus(ExtensionContext extensionContext) {
}, testStorage.getNamespaceName());

KafkaConnectorUtils.waitForConnectorReady(testStorage.getNamespaceName(), CUSTOM_RESOURCE_STATUS_CLUSTER_NAME);
assertKafkaConnectorStatus(3, "RUNNING|UNASSIGNED", "source", List.of(EXAMPLE_TOPIC_NAME));
}

@ParallelTest
Expand Down Expand Up @@ -532,25 +525,4 @@ void validateConnectPlugins(List<ConnectorPlugin> pluginsList) {
"org.apache.kafka.connect.mirror.MirrorHeartbeatConnector",
"org.apache.kafka.connect.mirror.MirrorSourceConnector"));
}

@SuppressWarnings("unchecked")
void assertKafkaConnectorStatus(long expectedObservedGeneration, String connectorStates, String type, List<String> topics) {
TestUtils.waitFor("KafkaConnector status to except observed generation", TestConstants.GLOBAL_POLL_INTERVAL,
TestConstants.GLOBAL_TIMEOUT, () -> {
KafkaConnectorStatus kafkaConnectorStatus = KafkaConnectorResource.kafkaConnectorClient().inNamespace(Environment.TEST_SUITE_NAMESPACE).withName(CUSTOM_RESOURCE_STATUS_CLUSTER_NAME).get().getStatus();
boolean formulaResult = kafkaConnectorStatus.getObservedGeneration() == expectedObservedGeneration;

final Map<String, Object> connectorStatus = kafkaConnectorStatus.getConnectorStatus();
final String currentState = ((LinkedHashMap<String, String>) connectorStatus.get("connector")).get("state");

formulaResult = formulaResult && connectorStates.contains(currentState);
formulaResult = formulaResult && connectorStatus.get("name").equals(CUSTOM_RESOURCE_STATUS_CLUSTER_NAME);
formulaResult = formulaResult && connectorStatus.get("type").equals(type);
formulaResult = formulaResult && connectorStatus.get("tasks") != null;
formulaResult = formulaResult && kafkaConnectorStatus.getTopics().equals(topics);
LOGGER.info("KafkaConnectorStatus Topic: {}, and expected Topic: {}", kafkaConnectorStatus.getTopics().toString(), topics);

return formulaResult;
});
}
}