Minor code enhancements and clean up

theodolite-quarkus/src/main/kotlin/theodolite/Main.kt

@@ -3,6 +3,7 @@ package theodolite
 import io.quarkus.runtime.annotations.QuarkusMain
 import mu.KotlinLogging
 import theodolite.execution.TheodoliteYamlExecutor
+import kotlin.system.exitProcess
 
 private val logger = KotlinLogging.logger {}
 
@@ -10,9 +11,9 @@ private val logger = KotlinLogging.logger {}
 object Main {
     @JvmStatic
     fun main(args: Array<String>) {
-        //val theodolite = TheodoliteExecutor()
-        val theodolite = TheodoliteYamlExecutor()
-        theodolite.run()
-        logger.info("Application started")
+        logger.info { "Theodolite started" }
+        TheodoliteYamlExecutor().run()
+        logger.info { "Theodolite finished" }
+        exitProcess(0)
     }
 }

theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt

@@ -30,8 +30,6 @@ class TheodoliteExecutor(
                restrictionStrategies = strategyFactory.createRestrictionStrategy(results, config.execution.restrictions)))
     }
 
-
-
     fun run() {
         val config = buildConfig()
 

theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt

@@ -6,7 +6,7 @@ import theodolite.benchmark.KubernetesBenchmark
 
 class TheodoliteYamlExecutor {
     fun run() {
-        // load the Benchmark context and the benchmark type
+        // load the BenchmarkExecution and the BenchmarkType
         var parser = YamlParser()
         val benchmarkExecution = parser.parse("./../../../resources/main/yaml/testBenchmarkExecution.yaml", BenchmarkExecution::class.java) !!
         val benchmark = parser.parse("./../../../resources/main/yaml/testBenchmarkType.yaml", KubernetesBenchmark::class.java) !!

theodolite-quarkus/src/main/kotlin/theodolite/k8s/K8sResourceLoader.kt

@@ -5,7 +5,6 @@ import io.fabric8.kubernetes.api.model.KubernetesResource
 import io.fabric8.kubernetes.api.model.Service
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition
 import io.fabric8.kubernetes.api.model.apps.Deployment
-import io.fabric8.kubernetes.api.model.apps.StatefulSet
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient
 import mu.KotlinLogging
 
@@ -14,21 +13,21 @@ private val logger = KotlinLogging.logger {}
 class K8sResourceLoader(private val client: NamespacedKubernetesClient) {
 
     /**
-     * Parses a Service from a servive yaml
+     * Parses a Service from a service yaml
      * @param path of the yaml file
      * @return service from fabric8
      */
     private fun loadService(path: String): Service {
-        return loadGenericRessource(path) { x: String -> client.services().load(x).get() }
+        return loadGenericResource(path) { x: String -> client.services().load(x).get() }
     }
 
     /**
-     * Parses a Service from a servive yaml
+     * Parses a Service from a service yaml
      * @param path of the yaml file
      * @return service from fabric8
      */
     private fun loadServiceMonitor(path: String): CustomResourceDefinition {
-        return loadGenericRessource(path) { x: String -> client.customResourceDefinitions().load(x).get() }
+        return loadGenericResource(path) { x: String -> client.customResourceDefinitions().load(x).get() }
     }
 
     /**
@@ -37,7 +36,7 @@ class K8sResourceLoader(private val client: NamespacedKubernetesClient) {
      * @return Deployment from fabric8
      */
     private fun loadDeployment(path: String): Deployment {
-        return loadGenericRessource(path) { x: String -> client.apps().deployments().load(x).get() }
+        return loadGenericResource(path) { x: String -> client.apps().deployments().load(x).get() }
     }
 
     /**
@@ -46,38 +45,37 @@ class K8sResourceLoader(private val client: NamespacedKubernetesClient) {
      * @return ConfigMap from fabric8
      */
     private fun loadConfigmap(path: String): ConfigMap {
-        return loadGenericRessource(path) { x: String -> client.configMaps().load(x).get() }
+        return loadGenericResource(path) { x: String -> client.configMaps().load(x).get() }
     }
 
     /**
      * Generic helper function to load a resource.
      * @param path of the resource
-     * @param f fuction that shall be applied to the resource.
+     * @param f function that shall be applied to the resource.
      */
-    private fun <T> loadGenericRessource(path: String, f: (String) -> T): T {
+    private fun <T> loadGenericResource(path: String, f: (String) -> T): T {
         var resource: T? = null
 
         try {
             resource = f(path)
         } catch (e: Exception) {
-            logger.info("You potentially  misspelled the path: $path")
-            logger.info("$e")
+            logger.warn {"You potentially  misspelled the path: $path"}
+            logger.warn { e }
         }
 
         if (resource == null) {
             throw IllegalArgumentException("The Resource at path: $path could not be loaded")
         }
-
         return resource
     }
 
-    public fun loadK8sResource(kind: String, path: String): KubernetesResource {
+    fun loadK8sResource(kind: String, path: String): KubernetesResource {
         return when (kind){
             "Deployment" -> loadDeployment(path)
             "Service" -> loadService(path)
             "ServiceMonitor" -> loadServiceMonitor(path)
             "ConfigMap" -> loadConfigmap(path)
-            else -> return loadConfigmap(path) // throw java.lang.IllegalArgumentException("Resource typ $kind not known")
+            else -> throw IllegalArgumentException("Unknown resource with type $kind located in $path")
         }
     }
 }

theodolite-quarkus/src/main/kotlin/theodolite/util/Results.kt

 package theodolite.util
 
-import theodolite.util.LoadDimension
-import theodolite.util.Resource
-import kotlin.math.exp
-
 class Results {
     private val results: MutableMap<Pair<LoadDimension, Resource>, Boolean> = mutableMapOf()
 

theodolite-quarkus/src/main/resources/yaml/testBenchmarkExecution.yaml

@@ -13,7 +13,7 @@ slos:
     threshold: 1000
 execution:
   strategy: "LinearSearch"
-  duration: 120
+  duration: 300
   repititions: 1
   restrictions:
     - "LowerBound"

theodolite-quarkus/src/main/resources/yaml/testBenchmarkType.yaml

@@ -21,7 +21,7 @@ kafkaConfig:
   bootstrapServer: "localhost:31290"
   topics:
     - name: "input"
-      numPartitions: 1
+      numPartitions: 40
       replicationFactor: 1
 zookeeperConfig:
   server: "localhost:31953"
\ No newline at end of file

theodolite-quarkus/src/test/kotlin/theodolite/CompositeStrategyTest.kt

@@ -3,12 +3,10 @@ package theodolite
 import io.quarkus.test.junit.QuarkusTest
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
-import theodolite.benchmark.TestBenchmark
 import theodolite.strategies.searchstrategy.LinearSearch
 import theodolite.strategies.searchstrategy.BinarySearch
 import theodolite.strategies.restriction.LowerBoundRestriction
 import theodolite.strategies.searchstrategy.CompositeStrategy
-import theodolite.execution.TestBenchmarkExecutorImpl
 import theodolite.util.*
 import java.util.*
 

theodolite-quarkus/src/main/kotlin/theodolite/benchmark/TestBenchmark.kt → theodolite-quarkus/src/test/kotlin/theodolite/TestBenchmark.kt

-package theodolite.benchmark
+package theodolite
 
+import theodolite.benchmark.Benchmark
+import theodolite.benchmark.BenchmarkDeployment
 import theodolite.util.LoadDimension
 import theodolite.util.ConfigurationOverride
 import theodolite.util.Resource

theodolite-quarkus/src/main/kotlin/theodolite/benchmark/TestBenchmarkDeployment.kt → theodolite-quarkus/src/test/kotlin/theodolite/TestBenchmarkDeployment.kt

-package theodolite.benchmark
+package theodolite
+
+import theodolite.benchmark.BenchmarkDeployment
 
 class TestBenchmarkDeployment: BenchmarkDeployment {
     override fun setup() {

theodolite-quarkus/src/main/kotlin/theodolite/execution/TestBenchmarkExecutorImpl.kt → theodolite-quarkus/src/test/kotlin/theodolite/TestBenchmarkExecutorImpl.kt

-package theodolite.execution
+package theodolite
 
 import theodolite.benchmark.Benchmark
+import theodolite.execution.BenchmarkExecutor
 import theodolite.util.LoadDimension
 import theodolite.util.Resource
 import theodolite.util.Results