diff --git a/theodolite/src/main/kotlin/theodolite/execution/operator/BenchmarkStateChecker.kt b/theodolite/src/main/kotlin/theodolite/execution/operator/BenchmarkStateChecker.kt index 959b04a8e5c94806aea1753af56b2518436aed12..40f5b7ddbbfc9da4514b8a88946d97149b94b390 100644 --- a/theodolite/src/main/kotlin/theodolite/execution/operator/BenchmarkStateChecker.kt +++ b/theodolite/src/main/kotlin/theodolite/execution/operator/BenchmarkStateChecker.kt @@ -10,7 +10,7 @@ import theodolite.benchmark.ActionSelector import theodolite.benchmark.KubernetesBenchmark import theodolite.benchmark.ResourceSets import theodolite.model.crd.BenchmarkCRD -import theodolite.model.crd.BenchmarkStates +import theodolite.model.crd.BenchmarkState import theodolite.model.crd.KubernetesBenchmarkList class BenchmarkStateChecker( @@ -42,7 +42,7 @@ class BenchmarkStateChecker( .forEach { setState(it.first, it.second) } } - private fun setState(resource: BenchmarkCRD, state: BenchmarkStates) { + private fun setState(resource: BenchmarkCRD, state: BenchmarkState) { benchmarkStateHandler.setResourceSetState(resource.spec.name, state) } @@ -52,13 +52,13 @@ class BenchmarkStateChecker( * @param benchmark The benchmark to check * @return [BenchmarkStates.READY] iff all resource could be loaded and all actions could be executed, [BenchmarkStates.PENDING] else */ - private fun checkState(benchmark: KubernetesBenchmark): BenchmarkStates { - return if (checkActionCommands(benchmark) == BenchmarkStates.READY - && checkResources(benchmark) == BenchmarkStates.READY + private fun checkState(benchmark: KubernetesBenchmark): BenchmarkState { + return if (checkActionCommands(benchmark) == BenchmarkState.READY + && checkResources(benchmark) == BenchmarkState.READY ) { - BenchmarkStates.READY + BenchmarkState.READY } else { - BenchmarkStates.PENDING + BenchmarkState.PENDING } } @@ -68,15 +68,15 @@ class BenchmarkStateChecker( * @param benchmark The benchmark to check * @return The state of this benchmark. [BenchmarkStates.READY] if all actions could be executed, else [BenchmarkStates.PENDING] */ - private fun checkActionCommands(benchmark: KubernetesBenchmark): BenchmarkStates { + private fun checkActionCommands(benchmark: KubernetesBenchmark): BenchmarkState { return if (checkIfActionPossible(benchmark.infrastructure.resources, benchmark.sut.beforeActions) && checkIfActionPossible(benchmark.infrastructure.resources, benchmark.sut.afterActions) && checkIfActionPossible(benchmark.infrastructure.resources, benchmark.loadGenerator.beforeActions) && checkIfActionPossible(benchmark.infrastructure.resources, benchmark.loadGenerator.beforeActions) ) { - BenchmarkStates.READY + BenchmarkState.READY } else { - BenchmarkStates.PENDING + BenchmarkState.PENDING } } @@ -171,21 +171,21 @@ class BenchmarkStateChecker( * Checks if it is possible to load all specified Kubernetes manifests. * * @param benchmark The benchmark to check - * @return The state of this benchmark. [BenchmarkStates.READY] if all resources could be loaded, else [BenchmarkStates.PENDING] + * @return The state of this benchmark. [BenchmarkState.READY] if all resources could be loaded, else [BenchmarkState.PENDING] */ - fun checkResources(benchmark: KubernetesBenchmark): BenchmarkStates { + fun checkResources(benchmark: KubernetesBenchmark): BenchmarkState { return try { val appResources = benchmark.loadKubernetesResources(resourceSet = benchmark.sut.resources) val loadGenResources = benchmark.loadKubernetesResources(resourceSet = benchmark.loadGenerator.resources) if (appResources.isNotEmpty() && loadGenResources.isNotEmpty()) { - BenchmarkStates.READY + BenchmarkState.READY } else { - BenchmarkStates.PENDING + BenchmarkState.PENDING } } catch (e: Exception) { - BenchmarkStates.PENDING + BenchmarkState.PENDING } } } diff --git a/theodolite/src/test/kotlin/theodolite/execution/operator/BenchmarkStateCheckerTest.kt b/theodolite/src/test/kotlin/theodolite/execution/operator/BenchmarkStateCheckerTest.kt index f3af42548d3bfc0d12e9f664d11cce1ae424e748..528cfac8066c28bf6382fb97cddf280b3c1de622 100644 --- a/theodolite/src/test/kotlin/theodolite/execution/operator/BenchmarkStateCheckerTest.kt +++ b/theodolite/src/test/kotlin/theodolite/execution/operator/BenchmarkStateCheckerTest.kt @@ -14,7 +14,7 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions.* import theodolite.benchmark.* -import theodolite.model.crd.BenchmarkStates +import theodolite.model.crd.BenchmarkState internal class BenchmarkStateCheckerTest { private val server = KubernetesServer(false, false) @@ -172,6 +172,6 @@ internal class BenchmarkStateCheckerTest { benchmark.getCR().spec.loadGenerator = resourceSet benchmark.getCR().spec.sut = resourceSet - assertEquals(BenchmarkStates.READY,checkerCrud.checkResources(benchmark.getCR().spec)) + assertEquals(BenchmarkState.READY,checkerCrud.checkResources(benchmark.getCR().spec)) } } \ No newline at end of file