From f2bdab43efba11c1cc3df966e5def229ff02aea6 Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Tue, 9 Mar 2021 12:26:25 +0100
Subject: [PATCH] minor code improvments
---
...estBenchmarkExecution.yaml => BenchmarkExecution.yaml} | 8 ++++----
.../yaml/{testBenchmarkType.yaml => BenchmarkType.yaml} | 8 ++++----
...ation-deployment.yaml => uc1-kstreams-deployment.yaml} | 0
...dGenerator.yaml => uc1-load-generator-deployment.yaml} | 0
.../test/kotlin/theodolite/ResourceLimitPatcherTest.kt | 8 ++++----
.../test/kotlin/theodolite/ResourceRequestPatcherTest.kt | 8 ++++----
6 files changed, 16 insertions(+), 16 deletions(-)
rename theodolite-quarkus/src/main/resources/yaml/{testBenchmarkExecution.yaml => BenchmarkExecution.yaml} (80%)
rename theodolite-quarkus/src/main/resources/yaml/{testBenchmarkType.yaml => BenchmarkType.yaml} (74%)
rename theodolite-quarkus/src/main/resources/yaml/{aggregation-deployment.yaml => uc1-kstreams-deployment.yaml} (100%)
rename theodolite-quarkus/src/main/resources/yaml/{workloadGenerator.yaml => uc1-load-generator-deployment.yaml} (100%)
diff --git a/theodolite-quarkus/src/main/resources/yaml/testBenchmarkExecution.yaml b/theodolite-quarkus/src/main/resources/yaml/BenchmarkExecution.yaml
similarity index 80%
rename from theodolite-quarkus/src/main/resources/yaml/testBenchmarkExecution.yaml
rename to theodolite-quarkus/src/main/resources/yaml/BenchmarkExecution.yaml
index b1c9af6e4..270daee17 100644
--- a/theodolite-quarkus/src/main/resources/yaml/testBenchmarkExecution.yaml
+++ b/theodolite-quarkus/src/main/resources/yaml/BenchmarkExecution.yaml
@@ -20,23 +20,23 @@ execution:
configOverrides:
- patcher:
type: "NodeSelectorPatcher"
- resource: "workloadGenerator.yaml"
+ resource: "uc1-load-generator-deployment.yaml"
variableName: "env"
value: "prod"
- patcher:
type: "NodeSelectorPatcher"
- resource: "aggregation-deployment.yaml"
+ resource: "uc1-kstreams-deployment.yaml"
variableName: "env"
value: "prod"
- patcher:
type: "ResourceLimitPatcher"
- resource: "aggregation-deployment.yaml"
+ resource: "uc1-kstreams-deployment.yaml"
container: "uc-application"
variableName: "cpu"
value: "50m"
- patcher:
type: "ResourceLimitPatcher"
- resource: "aggregation-deployment.yaml"
+ resource: "uc1-kstreams-deployment.yaml"
container: "uc-application"
variableName: "memory"
value: "2Gi"
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/resources/yaml/testBenchmarkType.yaml b/theodolite-quarkus/src/main/resources/yaml/BenchmarkType.yaml
similarity index 74%
rename from theodolite-quarkus/src/main/resources/yaml/testBenchmarkType.yaml
rename to theodolite-quarkus/src/main/resources/yaml/BenchmarkType.yaml
index c36859c64..4a1671dec 100644
--- a/theodolite-quarkus/src/main/resources/yaml/testBenchmarkType.yaml
+++ b/theodolite-quarkus/src/main/resources/yaml/BenchmarkType.yaml
@@ -1,20 +1,20 @@
name: "theodolite ist cool"
appResource:
- - "aggregation-deployment.yaml"
+ - "uc1-kstreams-deployment.yaml"
- "aggregation-service.yaml"
- "jmx-configmap.yaml"
loadGenResource:
- - "workloadGenerator.yaml"
+ - "uc1-load-generator-deployment.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "aggregation-deployment.yaml"
+ resource: "uc1-kstreams-deployment.yaml"
loadTypes:
- typeName: "NumSensors"
patchers:
- type: "EnvVarPatcher"
- resource: "workloadGenerator.yaml"
+ resource: "uc1-load-generator-deployment.yaml"
container: "workload-generator"
variableName: "NUM_SENSORS"
kafkaConfig:
diff --git a/theodolite-quarkus/src/main/resources/yaml/aggregation-deployment.yaml b/theodolite-quarkus/src/main/resources/yaml/uc1-kstreams-deployment.yaml
similarity index 100%
rename from theodolite-quarkus/src/main/resources/yaml/aggregation-deployment.yaml
rename to theodolite-quarkus/src/main/resources/yaml/uc1-kstreams-deployment.yaml
diff --git a/theodolite-quarkus/src/main/resources/yaml/workloadGenerator.yaml b/theodolite-quarkus/src/main/resources/yaml/uc1-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-quarkus/src/main/resources/yaml/workloadGenerator.yaml
rename to theodolite-quarkus/src/main/resources/yaml/uc1-load-generator-deployment.yaml
diff --git a/theodolite-quarkus/src/test/kotlin/theodolite/ResourceLimitPatcherTest.kt b/theodolite-quarkus/src/test/kotlin/theodolite/ResourceLimitPatcherTest.kt
index 9b0da36dd..2170a6a54 100644
--- a/theodolite-quarkus/src/test/kotlin/theodolite/ResourceLimitPatcherTest.kt
+++ b/theodolite-quarkus/src/test/kotlin/theodolite/ResourceLimitPatcherTest.kt
@@ -62,25 +62,25 @@ class ResourceLimitPatcherTest {
}
@Test
- fun case1() {
+ fun testWithExistingCpuAndMemoryDeclarations() {
// Case 1: In the given YAML declaration memory and cpu are defined
applyTest("cpu-memory-deployment.yaml")
}
@Test
- fun case2() {
+ fun testOnlyWithExistingCpuDeclarations() {
// Case 2: In the given YAML declaration only cpu is defined
applyTest("cpu-deployment.yaml")
}
@Test
- fun case3() {
+ fun testOnlyWithExistingMemoryDeclarations() {
// Case 3: In the given YAML declaration only memory is defined
applyTest("memory-deployment.yaml")
}
@Test
- fun case4() {
+ fun testWithoutResourceDeclarations() {
// Case 4: In the given YAML declaration neither `Resource Request` nor `Request Limit` is defined
applyTest("no-resources-deployment.yaml")
}
diff --git a/theodolite-quarkus/src/test/kotlin/theodolite/ResourceRequestPatcherTest.kt b/theodolite-quarkus/src/test/kotlin/theodolite/ResourceRequestPatcherTest.kt
index 22d19d221..108142843 100644
--- a/theodolite-quarkus/src/test/kotlin/theodolite/ResourceRequestPatcherTest.kt
+++ b/theodolite-quarkus/src/test/kotlin/theodolite/ResourceRequestPatcherTest.kt
@@ -62,25 +62,25 @@ class ResourceRequestPatcherTest {
}
@Test
- fun case1() {
+ fun testWithExistingCpuAndMemoryDeclarations() {
// Case 1: In the given YAML declaration memory and cpu are defined
applyTest("cpu-memory-deployment.yaml")
}
@Test
- fun case2() {
+ fun testOnlyWithExistingCpuDeclarations() {
// Case 2: In the given YAML declaration only cpu is defined
applyTest("cpu-deployment.yaml")
}
@Test
- fun case3() {
+ fun testOnlyWithExistingMemoryDeclarations() {
// Case 3: In the given YAML declaration only memory is defined
applyTest("memory-deployment.yaml")
}
@Test
- fun case4() {
+ fun testWithoutResourceDeclarations() {
// Case 4: In the given YAML declaration neither `Resource Request` nor `Request Limit` is defined
applyTest("no-resources-deployment.yaml")
}
--
GitLab