Skip to content

Commit 22c4a81

Browse files
geso02geso02
committed
Adjust topic-available timeouts and kafka healthcheck
Also rremove label from broker list and just use localhost with portname
1 parent 483d869 commit 22c4a81

14 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎basyx.aasenvironment/basyx.aasenvironment.component/src/test/java/org/eclipse/digitaltwin/basyx/aasenvironment/component/KafkaEventsInMemoryStorageIntegrationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
@TestPropertySource(properties = {
7171
"basyx.environment=",
7272
"basyx.feature.kafka.enabled=true",
73-
"spring.kafka.bootstrap-servers=PLAINTEXT_HOST://localhost:9092"
73+
"spring.kafka.bootstrap-servers=localhost:9092"
7474
})
7575
@AutoConfigureMockMvc
7676
@Import({ SubmodelEventKafkaListener.class, AasEventKafkaListener.class})

‎basyx.aasregistry/basyx.aasregistry-service-release-kafka-mem/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/service/storage/memory/AuthorizedKafkaInMemoryIntegrationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
*
3434
* @author danish
3535
*/
36-
@TestPropertySource(properties = {"spring.profiles.active=kafkaEvents,inMemoryStorage", "spring.kafka.bootstrap-servers=PLAINTEXT_HOST://localhost:9092", "spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:9096/realms/BaSyx", "basyx.feature.authorization.enabled=true", "basyx.feature.authorization.type=rbac", "basyx.feature.authorization.jwtBearerTokenProvider=keycloak", "basyx.feature.authorization.rbac.file=classpath:rbac_rules.json", "spring.data.mongodb.database=aasregistry", "spring.data.mongodb.uri=mongodb://mongoAdmin:mongoPassword@localhost:27017/"})
36+
@TestPropertySource(properties = {"spring.profiles.active=kafkaEvents,inMemoryStorage", "spring.kafka.bootstrap-servers=localhost:9092", "spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:9096/realms/BaSyx", "basyx.feature.authorization.enabled=true", "basyx.feature.authorization.type=rbac", "basyx.feature.authorization.jwtBearerTokenProvider=keycloak", "basyx.feature.authorization.rbac.file=classpath:rbac_rules.json", "spring.data.mongodb.database=aasregistry", "spring.data.mongodb.uri=mongodb://mongoAdmin:mongoPassword@localhost:27017/"})
3737
public class AuthorizedKafkaInMemoryIntegrationTest extends AuthorizedAasRegistryTestSuite {
3838

3939
}

‎basyx.aasregistry/basyx.aasregistry-service-release-kafka-mem/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/service/storage/memory/KafkaEventsInMemoryStorageIntegrationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
@TestPropertySource(
4444
properties = {"spring.profiles.active=kafkaEvents,inMemoryStorage",
45-
"spring.kafka.bootstrap-servers=PLAINTEXT_HOST://localhost:9092"})
45+
"spring.kafka.bootstrap-servers=localhost:9092"})
4646
public class KafkaEventsInMemoryStorageIntegrationTest extends BaseIntegrationTest {
4747

4848
@Autowired
@@ -88,7 +88,7 @@ public void onPartitionsAssigned(Map<TopicPartition, Long> assignments,
8888
}
8989

9090
public void awaitTopicAssignment() throws InterruptedException {
91-
if (!latch.await(5, TimeUnit.MINUTES)) {
91+
if (!latch.await(30, TimeUnit.MINUTES)) {
9292
throw new RuntimeException("Timeout occured while waiting for partition assignment. Is kafka running?");
9393
}
9494
}

‎basyx.aasregistry/basyx.aasregistry-service-release-kafka-mongodb/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/service/storage/mongodb/AuthorizedClientTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
*
5353
* @author danish
5454
*/
55-
@TestPropertySource(properties = {"spring.profiles.active=kafkaEvents,mongoDbStorage", "spring.kafka.bootstrap-servers=PLAINTEXT_HOST://localhost:9092", "spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:9096/realms/BaSyx", "basyx.feature.authorization.enabled=true", "basyx.feature.authorization.type=rbac", "basyx.feature.authorization.jwtBearerTokenProvider=keycloak", "basyx.feature.authorization.rbac.file=classpath:rbac_rules.json", "spring.data.mongodb.database=aasregistry", "spring.data.mongodb.uri=mongodb://mongoAdmin:mongoPassword@localhost:27017/"})
55+
@TestPropertySource(properties = {"spring.profiles.active=kafkaEvents,mongoDbStorage", "spring.kafka.bootstrap-servers=localhost:9092", "spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:9096/realms/BaSyx", "basyx.feature.authorization.enabled=true", "basyx.feature.authorization.type=rbac", "basyx.feature.authorization.jwtBearerTokenProvider=keycloak", "basyx.feature.authorization.rbac.file=classpath:rbac_rules.json", "spring.data.mongodb.database=aasregistry", "spring.data.mongodb.uri=mongodb://mongoAdmin:mongoPassword@localhost:27017/"})
5656
public class AuthorizedClientTest extends BaseIntegrationTest {
5757

5858
@Autowired

‎basyx.aasregistry/basyx.aasregistry-service-release-kafka-mongodb/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/service/storage/mongodb/AuthorizedKafkaMongoDBIntegrationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
*
3434
* @author danish
3535
*/
36-
@TestPropertySource(properties = {"spring.profiles.active=kafkaEvents,mongoDbStorage", "spring.kafka.bootstrap-servers=PLAINTEXT_HOST://localhost:9092", "spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:9096/realms/BaSyx", "basyx.feature.authorization.enabled=true", "basyx.feature.authorization.type=rbac", "basyx.feature.authorization.jwtBearerTokenProvider=keycloak", "basyx.feature.authorization.rbac.file=classpath:rbac_rules.json", "spring.data.mongodb.database=aasregistry", "spring.data.mongodb.uri=mongodb://mongoAdmin:mongoPassword@localhost:27017/"})
36+
@TestPropertySource(properties = {"spring.profiles.active=kafkaEvents,mongoDbStorage", "spring.kafka.bootstrap-servers=localhost:9092", "spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:9096/realms/BaSyx", "basyx.feature.authorization.enabled=true", "basyx.feature.authorization.type=rbac", "basyx.feature.authorization.jwtBearerTokenProvider=keycloak", "basyx.feature.authorization.rbac.file=classpath:rbac_rules.json", "spring.data.mongodb.database=aasregistry", "spring.data.mongodb.uri=mongodb://mongoAdmin:mongoPassword@localhost:27017/"})
3737
public class AuthorizedKafkaMongoDBIntegrationTest extends AuthorizedAasRegistryTestSuite {
3838

3939
}

‎basyx.aasregistry/basyx.aasregistry-service-release-kafka-mongodb/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/service/storage/mongodb/KafkaEventsMongoDbStorageIntegrationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import com.fasterxml.jackson.databind.ObjectMapper;
4444

4545
@TestPropertySource(properties = { "spring.profiles.active=kafkaEvents,mongoDbStorage",
46-
"spring.kafka.bootstrap-servers=PLAINTEXT_HOST://localhost:9092", "spring.data.mongodb.database=aasregistry",
46+
"spring.kafka.bootstrap-servers=localhost:9092", "spring.data.mongodb.database=aasregistry",
4747
"spring.data.mongodb.uri=mongodb://mongoAdmin:mongoPassword@localhost:27017/" })
4848
public class KafkaEventsMongoDbStorageIntegrationTest extends BaseIntegrationTest {
4949

‎basyx.aasrepository/basyx.aasrepository-feature-kafka/src/test/java/org/eclipse/digitaltwin/basyx/aasrepository/feature/kafka/AasEventKafkaListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void onPartitionsAssigned(Map<TopicPartition, Long> assignments, Consumer
8181
}
8282

8383
public void awaitTopicAssignment() throws InterruptedException {
84-
if (!latch.await(5, TimeUnit.MINUTES)) {
84+
if (!latch.await(30, TimeUnit.MINUTES)) {
8585
throw new RuntimeException("Timeout occured while waiting for partition assignment. Is kafka running?");
8686
}
8787
}

‎basyx.aasrepository/basyx.aasrepository-feature-kafka/src/test/java/org/eclipse/digitaltwin/basyx/aasrepository/feature/kafka/KafkaEventsInMemoryStorageIntegrationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
@ContextConfiguration(classes = {TestApplication.class})
7171
@RunWith(SpringRunner.class)
7272
@TestPropertySource(properties = { KafkaAasRepositoryFeature.FEATURENAME + ".enabled=true",
73-
"spring.kafka.bootstrap-servers=PLAINTEXT_HOST://localhost:9092",
73+
"spring.kafka.bootstrap-servers=localhost:9092",
7474
KafkaAasRepositoryFeature.FEATURENAME + ".topic.name="+TestApplication.KAFKA_AAS_TOPIC
7575
})
7676
public class KafkaEventsInMemoryStorageIntegrationTest {

‎basyx.submodelrepository/basyx.submodelrepository-feature-kafka/src/test/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/kafka/KafkaEventsInMemoryStorageIntegrationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
@RunWith(SpringRunner.class)
7777
@ActiveProfiles("test-submodel")
7878
@ContextConfiguration(classes = SubmodelServiceTestComponent.class)
79-
@TestPropertySource(properties = { "basyx.backend=InMemory", "spring.kafka.bootstrap-servers=PLAINTEXT_HOST://localhost:9092", KafkaSubmodelRepositoryFeature.FEATURENAME + ".preservationlevel=REMOVE_BLOB_VALUE",
79+
@TestPropertySource(properties = { "basyx.backend=InMemory", "spring.kafka.bootstrap-servers=localhost:9092", KafkaSubmodelRepositoryFeature.FEATURENAME + ".preservationlevel=REMOVE_BLOB_VALUE",
8080
KafkaSubmodelRepositoryFeature.FEATURENAME + ".enabled=true", KafkaSubmodelRepositoryFeature.FEATURENAME + ".topic.name=submodel-events" })
8181
@Import(value = { SubmodelEventKafkaListener.class })
8282
public class KafkaEventsInMemoryStorageIntegrationTest {

‎basyx.submodelservice/basyx.submodelservice-feature-kafka/src/test/java/org/eclipse/digitaltwin/basyx/submodelservice/feature/kafka/KafkaSubmodelServiceIdsOnlySmokeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
@ActiveProfiles("test-submodel")
6666
@ContextConfiguration(classes = SubmodelServiceTestComponent.class)
6767
@RunWith(SpringRunner.class)
68-
@TestPropertySource(properties = { "spring.kafka.bootstrap-servers=PLAINTEXT_HOST://localhost:9092",
68+
@TestPropertySource(properties = { "spring.kafka.bootstrap-servers=localhost:9092",
6969
KafkaSubmodelServiceFeature.FEATURENAME + ".preservationlevel=IDS_ONLY",
7070
KafkaSubmodelServiceFeature.FEATURENAME + ".enabled=true",
7171
KafkaSubmodelServiceFeature.FEATURENAME + ".topic.name=" + SubmodelEventKafkaListener.TOPIC_NAME,

0 commit comments

Comments
 (0)