Skip to content
Snippets Groups Projects
Commit e542ff07 authored by Sören Henning's avatar Sören Henning
Browse files

Add tests for parsing SLO thresholds as doubles

parent 8a28757c
Branches
Tags
1 merge request!286Support floating point values in SLO evaluation
Pipeline #8644 passed
Stage: build
Stage: test
Stage: check
Stage: smoketest
Show whitespace changes
Inline Side-by-side
theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/ExternalSloChecker.kt
+ 2
− 2
View file @ e542ff07
...@@ -11,8 +11,8 @@ import java.net.ConnectException ...@@ -11,8 +11,8 @@ import java.net.ConnectException
* @param metadata metadata passed to the external SLO checker. * @param metadata metadata passed to the external SLO checker.
*/ */
class ExternalSloChecker( class ExternalSloChecker(
private val externalSlopeURL: String, val externalSlopeURL: String,
private val metadata: Map<String, Any> val metadata: Map<String, Any>
) : SloChecker { ) : SloChecker {
private val RETRIES = 2 private val RETRIES = 2
......
theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/SloCheckerFactory.kt
+ 5
− 5
View file @ e542ff07
...@@ -41,7 +41,7 @@ class SloCheckerFactory { ...@@ -41,7 +41,7 @@ class SloCheckerFactory {
*/ */
fun create( fun create(
sloType: String, sloType: String,
properties: MutableMap<String, String>, properties: Map<String, String>,
load: Int, load: Int,
resource: Int, resource: Int,
metric: Metric metric: Metric
...@@ -58,7 +58,7 @@ class SloCheckerFactory { ...@@ -58,7 +58,7 @@ class SloCheckerFactory {
"repetitionAggregation" to (properties["repetitionAggregation"] "repetitionAggregation" to (properties["repetitionAggregation"]
?: throw IllegalArgumentException("repetitionAggregation expected")), ?: throw IllegalArgumentException("repetitionAggregation expected")),
"operator" to (properties["operator"] ?: throw IllegalArgumentException("operator expected")), "operator" to (properties["operator"] ?: throw IllegalArgumentException("operator expected")),
"threshold" to (properties["threshold"]?.toInt() "threshold" to (properties["threshold"]?.toDouble()
?: throw IllegalArgumentException("threshold expected")) ?: throw IllegalArgumentException("threshold expected"))
) )
) )
...@@ -67,7 +67,7 @@ class SloCheckerFactory { ...@@ -67,7 +67,7 @@ class SloCheckerFactory {
?: throw IllegalArgumentException("externalSloUrl expected"), ?: throw IllegalArgumentException("externalSloUrl expected"),
metadata = mapOf( metadata = mapOf(
"warmup" to (properties["warmup"]?.toInt() ?: throw IllegalArgumentException("warmup expected")), "warmup" to (properties["warmup"]?.toInt() ?: throw IllegalArgumentException("warmup expected")),
"threshold" to (properties["threshold"]?.toInt() "threshold" to (properties["threshold"]?.toDouble()
?: throw IllegalArgumentException("threshold expected")) ?: throw IllegalArgumentException("threshold expected"))
) )
) )
...@@ -78,8 +78,8 @@ class SloCheckerFactory { ...@@ -78,8 +78,8 @@ class SloCheckerFactory {
if (thresholdRatio < 0.0) { if (thresholdRatio < 0.0) {
throw IllegalArgumentException("Threshold ratio needs to be an Double greater or equal 0.0") throw IllegalArgumentException("Threshold ratio needs to be an Double greater or equal 0.0")
} }
// cast to int, as rounding is not really necessary
val threshold = (load * thresholdRatio).toInt() val threshold = (load * thresholdRatio)
ExternalSloChecker( ExternalSloChecker(
externalSlopeURL = properties["externalSloUrl"] externalSlopeURL = properties["externalSloUrl"]
......
theodolite/src/test/kotlin/rocks/theodolite/kubernetes/slo/ExternalSloCheckerTest.kt
+ 5
− 9
View file @ e542ff07
...@@ -23,18 +23,15 @@ internal class ExternalSloCheckerTest { ...@@ -23,18 +23,15 @@ internal class ExternalSloCheckerTest {
@AfterEach @AfterEach
fun stop() { fun stop() {
wireMockServer?.let { wireMockServer?.stop()
it.stop()
}
} }
@Test @Test
fun testExternalTrueResult() { fun testExternalTrueResult() {
stubFor( this.wireMockServer!!.stubFor(
post(urlEqualTo("/")) post(urlEqualTo("/"))
.willReturn( .willReturn(
aResponse() aResponse().withJsonBody(BooleanNode.getTrue())
.withJsonBody(BooleanNode.getTrue())
) )
) )
...@@ -48,11 +45,10 @@ internal class ExternalSloCheckerTest { ...@@ -48,11 +45,10 @@ internal class ExternalSloCheckerTest {
@Test @Test
fun testExternalFalseResult() { fun testExternalFalseResult() {
stubFor( this.wireMockServer!!.stubFor(
post(urlEqualTo("/")) post(urlEqualTo("/"))
.willReturn( .willReturn(
aResponse() aResponse().withJsonBody(BooleanNode.getFalse())
.withJsonBody(BooleanNode.getFalse())
) )
) )
......
theodolite/src/test/kotlin/rocks/theodolite/kubernetes/slo/SloCheckerFactoryTest.kt 0 → 100644
+ 298
− 0
View file @ e542ff07
package rocks.theodolite.kubernetes.slo
import io.quarkus.test.junit.QuarkusTest
import org.junit.jupiter.api.Assertions.*
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertThrows
import rocks.theodolite.core.strategies.Metric
@QuarkusTest
internal class SloCheckerFactoryTest {
@Test
fun testCreateGenericSloWithoutUrl() {
val factory = SloCheckerFactory()
assertThrows<IllegalArgumentException> {
factory.create(
SloTypes.GENERIC.value,
mapOf(
"warmup" to "60",
"queryAggregation" to "median",
"repetitionAggregation" to "median",
"operator" to "lte",
"threshold" to "1234"
),
100,
5,
Metric.DEMAND
)
}
}
@Test
fun testCreateGenericSloWithoutWarmup() {
val factory = SloCheckerFactory()
assertThrows<IllegalArgumentException> {
factory.create(
SloTypes.GENERIC.value,
mapOf(
"externalSloUrl" to "http://localhost:1234",
"queryAggregation" to "median",
"repetitionAggregation" to "median",
"operator" to "lte",
"threshold" to "1234"
),
100,
5,
Metric.DEMAND
)
}
}
@Test
fun testCreateGenericSloWithoutQueryAggregation() {
val factory = SloCheckerFactory()
assertThrows<IllegalArgumentException> {
factory.create(
SloTypes.GENERIC.value,
mapOf(
"externalSloUrl" to "http://localhost:1234",
"warmup" to "60",
"repetitionAggregation" to "median",
"operator" to "lte",
"threshold" to "1234"
),
100,
5,
Metric.DEMAND
)
}
}
@Test
fun testCreateGenericSloWithoutRepetitionAggregation() {
val factory = SloCheckerFactory()
assertThrows<IllegalArgumentException> {
factory.create(
SloTypes.GENERIC.value,
mapOf(
"externalSloUrl" to "http://localhost:1234",
"warmup" to "60",
"queryAggregation" to "median",
"operator" to "lte",
"threshold" to "1234"
),
100,
5,
Metric.DEMAND
)
}
}
@Test
fun testCreateGenericSloWithoutOperator() {
val factory = SloCheckerFactory()
assertThrows<IllegalArgumentException> {
factory.create(
SloTypes.GENERIC.value,
mapOf(
"externalSloUrl" to "http://localhost:1234",
"warmup" to "60",
"queryAggregation" to "median",
"repetitionAggregation" to "median",
"threshold" to "1234"
),
100,
5,
Metric.DEMAND
)
}
}
@Test
fun testCreateGenericSloWithoutThreshold() {
val factory = SloCheckerFactory()
assertThrows<IllegalArgumentException> {
factory.create(
SloTypes.GENERIC.value,
mapOf(
"externalSloUrl" to "http://localhost:1234",
"warmup" to "60",
"queryAggregation" to "median",
"repetitionAggregation" to "median",
"operator" to "lte",
),
100,
5,
Metric.DEMAND
)
}
}
@Test
fun testCreateGenericSloFloatThreshold() {
val factory = SloCheckerFactory()
val sloChecker = factory.create(
SloTypes.GENERIC.value,
mapOf(
"externalSloUrl" to "http://localhost:1234",
"warmup" to "60",
"queryAggregation" to "median",
"repetitionAggregation" to "median",
"operator" to "lte",
"threshold" to "12.34"
),
100,
5,
Metric.DEMAND
)
assertInstanceOf(ExternalSloChecker::class.java, sloChecker)
val threshold = (sloChecker as ExternalSloChecker).metadata["threshold"]
assertTrue(threshold is Double, "Expected threshold to be Double.")
assertEquals(12.34, threshold as Double, 0.01)
}
@Test
fun testCreateLagTrendSloWithoutUrl() {
val factory = SloCheckerFactory()
assertThrows<IllegalArgumentException> {
factory.create(
SloTypes.LAG_TREND.value,
mapOf(
"warmup" to "60",
"threshold" to "1234"
),
100,
5,
Metric.DEMAND
)
}
}
@Test
fun testCreateLagTrendSloWithoutWarmup() {
val factory = SloCheckerFactory()
assertThrows<IllegalArgumentException> {
factory.create(
SloTypes.LAG_TREND.value,
mapOf(
"externalSloUrl" to "http://localhost:1234",
"threshold" to "1234"
),
100,
5,
Metric.DEMAND
)
}
}
@Test
fun testCreateLagTrendSloWithoutThreshold() {
val factory = SloCheckerFactory()
assertThrows<IllegalArgumentException> {
factory.create(
SloTypes.LAG_TREND.value,
mapOf(
"externalSloUrl" to "http://localhost:1234",
"warmup" to "60",
),
100,
5,
Metric.DEMAND
)
}
}
@Test
fun testCreateLagTrendSloFloatThreshold() {
val factory = SloCheckerFactory()
val sloChecker = factory.create(
SloTypes.LAG_TREND.value,
mapOf(
"externalSloUrl" to "http://localhost:1234",
"warmup" to "60",
"threshold" to "12.34"
),
100,
5,
Metric.DEMAND
)
assertInstanceOf(ExternalSloChecker::class.java, sloChecker)
val threshold = (sloChecker as ExternalSloChecker).metadata["threshold"]
assertTrue(threshold is Double, "Expected threshold to be Double.")
assertEquals(12.34, threshold as Double, 0.01)
}
@Test
fun testCreateLagTrendRatioSloWithoutUrl() {
val factory = SloCheckerFactory()
assertThrows<IllegalArgumentException> {
factory.create(
SloTypes.LAG_TREND_RATIO.value,
mapOf(
"warmup" to "60",
"ratio" to "0.123"
),
100,
5,
Metric.DEMAND
)
}
}
@Test
fun testCreateLagTrendRatioSloWithoutWarmup() {
val factory = SloCheckerFactory()
assertThrows<IllegalArgumentException> {
factory.create(
SloTypes.LAG_TREND_RATIO.value,
mapOf(
"externalSloUrl" to "http://localhost:1234",
"ratio" to "0.123"
),
100,
5,
Metric.DEMAND
)
}
}
@Test
fun testCreateLagTrendRatioSloWithoutRatioThreshold() {
val factory = SloCheckerFactory()
assertThrows<IllegalArgumentException> {
factory.create(
SloTypes.LAG_TREND_RATIO.value,
mapOf(
"externalSloUrl" to "http://localhost:1234",
"warmup" to "60",
),
100,
5,
Metric.DEMAND
)
}
}
@Test
fun testCreateLagTrendRatioSloFloatThreshold() {
val factory = SloCheckerFactory()
val sloChecker = factory.create(
SloTypes.LAG_TREND_RATIO.value,
mapOf(
"externalSloUrl" to "http://localhost:1234",
"warmup" to "60",
"ratio" to "0.123"
),
100,
5,
Metric.DEMAND
)
assertInstanceOf(ExternalSloChecker::class.java, sloChecker)
val threshold = (sloChecker as ExternalSloChecker).metadata["threshold"]
assertTrue(threshold is Double, "Expected threshold to be Double.")
assertEquals(12.3, threshold as Double, 0.01)
}
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment