diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt index 2b3e0f7260d4653020df03ba4c93a608378db7cc..ed5a651593324291bad5b367e59f3f224405e81b 100644 --- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt +++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt @@ -5,10 +5,7 @@ import theodolite.k8s.UC1Benchmark import theodolite.strategies.restriction.LowerBoundRestriction import theodolite.strategies.searchstrategy.CompositeStrategy import theodolite.strategies.searchstrategy.LinearSearch -import theodolite.util.Config -import theodolite.util.LoadDimension -import theodolite.util.Resource -import theodolite.util.Results +import theodolite.util.* import java.nio.file.Paths import java.time.Duration @@ -20,9 +17,9 @@ class TheodoliteExecutor() { private fun loadConfig(): Config { logger.info { resourcesPath } val benchmark: UC1Benchmark = UC1Benchmark( - UC1Benchmark.UC1BenchmarkConfig( + AbstractBenchmark.Config( clusterZookeeperConnectionString = "my-confluent-cp-zookeeper:2181", - clusterKafkaConnectionString = "localhost:9092", + clusterKafkaConnectionString = "my-confluent-cp-kafka:9092", externalZookeeperConnectionString = "localhost:2181", externalKafkaConnectionString = "localhost:9092", schemaRegistryConnectionString = "http://my-confluent-cp-schema-registry:8081", diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/UC1Benchmark.kt b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/UC1Benchmark.kt index 3f605b0bcd540c0041372d8e0a6e3233e8e14cd7..bebd07904c2c1bc3fd8c3d3e4585c1c54ad75832 100644 --- a/theodolite-quarkus/src/main/kotlin/theodolite/k8s/UC1Benchmark.kt +++ b/theodolite-quarkus/src/main/kotlin/theodolite/k8s/UC1Benchmark.kt @@ -12,7 +12,7 @@ import theodolite.util.Resource private val logger = KotlinLogging.logger {} -class UC1Benchmark(config: AbstractBenchmarkConfig) : AbstractBenchmark(config) { +class UC1Benchmark(config: Config) : AbstractBenchmark(config) { private val workloadGeneratorStateCleaner: WorkloadGeneratorStateCleaner private val topicManager: TopicManager diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/util/AbstractBenchmark.kt b/theodolite-quarkus/src/main/kotlin/theodolite/util/AbstractBenchmark.kt index 5dca9126c88ea8db008b038b7376ef40bcfff0d0..2411e1b8bb62bf40ed724737e76280603ab4f97b 100644 --- a/theodolite-quarkus/src/main/kotlin/theodolite/util/AbstractBenchmark.kt +++ b/theodolite-quarkus/src/main/kotlin/theodolite/util/AbstractBenchmark.kt @@ -1,8 +1,6 @@ package theodolite.util -import theodolite.k8s.UC1Benchmark - -abstract class AbstractBenchmark(val config: AbstractBenchmarkConfig): Benchmark { +abstract class AbstractBenchmark(val config: Config): Benchmark { override fun start(load: LoadDimension, resources: Resource) { this.clearClusterEnvironment() this.initializeClusterEnvironment() @@ -10,7 +8,7 @@ abstract class AbstractBenchmark(val config: AbstractBenchmarkConfig): Benchmark this.startWorkloadGenerator(load) } - data class AbstractBenchmarkConfig( + data class Config( val clusterZookeeperConnectionString: String, val clusterKafkaConnectionString: String, val externalZookeeperConnectionString: String,