diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/AbstractIntPatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/AbstractIntPatcher.kt new file mode 100644 index 0000000000000000000000000000000000000000..9cb207f2f3708954dcc9a9a13b33554c5b7878e4 --- /dev/null +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/AbstractIntPatcher.kt @@ -0,0 +1,19 @@ +package rocks.theodolite.kubernetes.patcher + +import io.fabric8.kubernetes.api.model.HasMetadata +import io.fabric8.kubernetes.client.utils.Serialization + +/** + * A Patcher is able to modify values of a Kubernetes resource, see [Patcher]. + */ +abstract class AbstractIntPatcher : Patcher { + + override fun patch(resources: List<HasMetadata>, value: String) : List<HasMetadata> { + return resources + .map { Serialization.clone(it)} + .map { patchSingleResource(it, value.toInt()) } + } + + abstract fun patchSingleResource(resource: HasMetadata, value: Int): HasMetadata + +} diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/AbstractResourcePatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/AbstractResourcePatcher.kt index adb5c1468130069524221de25354787e045c9b9e..6a453a1f07b2e942c4a069d6b59181e6c20b815b 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/AbstractResourcePatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/AbstractResourcePatcher.kt @@ -22,7 +22,7 @@ abstract class AbstractResourcePatcher( protected val requiredResource: String, private val format: String? = null, private val factor: Int? = null -) : AbstractPatcher() { +) : AbstractStringPatcher() { override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { when (resource) { diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/AbstractPatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/AbstractStringPatcher.kt similarity index 62% rename from theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/AbstractPatcher.kt rename to theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/AbstractStringPatcher.kt index 0ed2a5e5a8c96761074f998721489f0ddd2db1ac..e761cfff4dcee8c62bcc5aefadcf1d698f40ed23 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/AbstractPatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/AbstractStringPatcher.kt @@ -5,19 +5,8 @@ import io.fabric8.kubernetes.client.utils.Serialization /** * A Patcher is able to modify values of a Kubernetes resource, see [Patcher]. - * - * An AbstractPatcher is created with up to three parameters. - * - * - * - * **For example** to patch the load dimension of a load generator, the patcher should be created as follow: - * - * k8sResource: `uc-1-workload-generator.yaml` - * container: `workload` - * variableName: `NUM_SENSORS` - * */ -abstract class AbstractPatcher : Patcher { +abstract class AbstractStringPatcher : Patcher { override fun patch(resources: List<HasMetadata>, value: String) : List<HasMetadata> { return resources diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ConfigMapYamlPatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ConfigMapYamlPatcher.kt index 272e3785e274eecbb85e3618113ae5137d5314bc..210fe8c2694dcdc645ac287a9f18ff5828d07322 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ConfigMapYamlPatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ConfigMapYamlPatcher.kt @@ -14,7 +14,7 @@ import org.yaml.snakeyaml.Yaml class ConfigMapYamlPatcher( private val fileName: String, private val variableName: String -) : AbstractPatcher() { +) : AbstractStringPatcher() { override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { if (resource is ConfigMap) { diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/DataVolumeLoadGeneratorReplicaPatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/DataVolumeLoadGeneratorReplicaPatcher.kt index fce3de2b97e7f3fe23d8aae425af9843c650daa0..297045fa11f1cb8ae8c6eb78e6708e412b2e0d62 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/DataVolumeLoadGeneratorReplicaPatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/DataVolumeLoadGeneratorReplicaPatcher.kt @@ -18,7 +18,7 @@ class DataVolumeLoadGeneratorReplicaPatcher( private val maxVolume: Int, val container: String, val variableName: String -) : AbstractPatcher() { +) : AbstractStringPatcher() { private val envVarPatcher = EnvVarPatcher(container, variableName) private val replicaPatcher = ReplicaPatcher() diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/EnvVarPatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/EnvVarPatcher.kt index 33d6c8d9b6f5f82a49e7cd414e4b273708c0e68a..58bb51276acb5f6ebe0edab624d5e45b43c69260 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/EnvVarPatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/EnvVarPatcher.kt @@ -14,7 +14,7 @@ import io.fabric8.kubernetes.api.model.apps.Deployment class EnvVarPatcher( private val container: String, private val variableName: String -) : AbstractPatcher() { +) : AbstractStringPatcher() { override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ImagePatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ImagePatcher.kt index c847f99d26959c06f9828103679395de93f961a5..00909fb741f53e9f2b9f50896bb58ea5dc945677 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ImagePatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ImagePatcher.kt @@ -3,14 +3,13 @@ package rocks.theodolite.kubernetes.patcher import io.fabric8.kubernetes.api.model.HasMetadata import io.fabric8.kubernetes.api.model.apps.Deployment import io.fabric8.kubernetes.api.model.apps.StatefulSet -import io.fabric8.kubernetes.client.utils.Serialization /** * The Image patcher allows to change the image of a container. * * @param container Container to be patched. */ -class ImagePatcher(private val container: String) : AbstractPatcher() { +class ImagePatcher(private val container: String) : AbstractStringPatcher() { override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { if (resource is Deployment) { diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/LabelPatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/LabelPatcher.kt index 9e690ea68b47e99c4cbeb4409c8335f34406ea0a..86d78176c36dcddf56fbeb0301912cfa45f62eb2 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/LabelPatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/LabelPatcher.kt @@ -1,15 +1,10 @@ package rocks.theodolite.kubernetes.patcher -import io.fabric8.kubernetes.api.model.ConfigMap -import io.fabric8.kubernetes.api.model.GenericKubernetesResource import io.fabric8.kubernetes.api.model.HasMetadata -import io.fabric8.kubernetes.api.model.Service -import io.fabric8.kubernetes.api.model.apps.Deployment -import io.fabric8.kubernetes.api.model.apps.StatefulSet class LabelPatcher( val variableName: String) : - AbstractPatcher() { + AbstractStringPatcher() { override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { if (resource.metadata.labels == null) { diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/MatchLabelPatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/MatchLabelPatcher.kt index 0b60514cf53145705baac1f7b69a5cef502a1dfd..2cb70842add05aff5a0238d2b52a642c838c6820 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/MatchLabelPatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/MatchLabelPatcher.kt @@ -9,7 +9,7 @@ import io.fabric8.kubernetes.api.model.apps.StatefulSet * * @property variableName The matchLabel which should be set */ -class MatchLabelPatcher(val variableName: String) : AbstractPatcher() { +class MatchLabelPatcher(val variableName: String) : AbstractStringPatcher() { override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { when (resource) { diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NamePatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NamePatcher.kt index 86c6c6b9700fbed9f36df64cc5ea02d19ae36ef2..9a39a5b285ff69b4dea88f089432f420a6cd5df3 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NamePatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NamePatcher.kt @@ -1,13 +1,8 @@ package rocks.theodolite.kubernetes.patcher -import io.fabric8.kubernetes.api.model.ConfigMap -import io.fabric8.kubernetes.api.model.GenericKubernetesResource import io.fabric8.kubernetes.api.model.HasMetadata -import io.fabric8.kubernetes.api.model.Service -import io.fabric8.kubernetes.api.model.apps.Deployment -import io.fabric8.kubernetes.api.model.apps.StatefulSet -class NamePatcher : AbstractPatcher() { +class NamePatcher : AbstractStringPatcher() { override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { resource.metadata.name = value diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NodeSelectorPatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NodeSelectorPatcher.kt index 0ffda7d55a20fc5f71133af5cbdc27eee7779f9e..a145c26285b3ccefc74b9a83cf80156e049c143f 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NodeSelectorPatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NodeSelectorPatcher.kt @@ -8,7 +8,7 @@ import io.fabric8.kubernetes.api.model.apps.Deployment * * @param variableName The `label-key` of the node for which the `label-value` is to be patched. */ -class NodeSelectorPatcher(private val variableName: String) : AbstractPatcher() { +class NodeSelectorPatcher(private val variableName: String) : AbstractStringPatcher() { override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { if (resource is Deployment) { diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NumNestedGroupsLoadGeneratorReplicaPatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NumNestedGroupsLoadGeneratorReplicaPatcher.kt index e3b0105768ec339758fd89233a09da233145d641..c9301463564777c15590ff6929fb4f3d7f41af59 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NumNestedGroupsLoadGeneratorReplicaPatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NumNestedGroupsLoadGeneratorReplicaPatcher.kt @@ -5,13 +5,13 @@ import io.fabric8.kubernetes.api.model.apps.Deployment import kotlin.math.pow class NumNestedGroupsLoadGeneratorReplicaPatcher( - private val numSensors: String, - private val loadGenMaxRecords: String, -) : AbstractPatcher() { + private val numSensors: Int, + private val loadGenMaxRecords: Int, +) : AbstractIntPatcher() { - override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { + override fun patchSingleResource(resource: HasMetadata, value: Int): HasMetadata { if (resource is Deployment) { - val approxNumSensors = numSensors.toDouble().pow(Integer.parseInt(value).toDouble()) + val approxNumSensors = numSensors.toDouble().pow(value.toDouble()) val loadGenInstances = (approxNumSensors + loadGenMaxRecords.toDouble() - 1) / loadGenMaxRecords.toDouble() resource.spec.replicas = loadGenInstances.toInt() diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NumSensorsLoadGeneratorReplicaPatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NumSensorsLoadGeneratorReplicaPatcher.kt index 6bb2750bb1ca923aa05022884ef7054772a987c6..088f9854b253a9f4c25ab07b49fbabfe38a4f37d 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NumSensorsLoadGeneratorReplicaPatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/NumSensorsLoadGeneratorReplicaPatcher.kt @@ -5,14 +5,12 @@ import io.fabric8.kubernetes.api.model.apps.Deployment class NumSensorsLoadGeneratorReplicaPatcher( - private val loadGenMaxRecords: String, -) : AbstractPatcher() { + private val loadGenMaxRecords: Int +) : AbstractIntPatcher() { - override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { + override fun patchSingleResource(resource: HasMetadata, value: Int): HasMetadata { if (resource is Deployment) { - val loadGenInstances = - (Integer.parseInt(value) + loadGenMaxRecords.toInt() - 1) / loadGenMaxRecords.toInt() - resource.spec.replicas = loadGenInstances + resource.spec.replicas = (value + loadGenMaxRecords - 1) / loadGenMaxRecords } return resource diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/PatcherFactory.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/PatcherFactory.kt index 26e76ccfabbb773e45bf80fd09612473c246c5e4..7bfde3e38defb30cda290c840ebc0525c0300cd0 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/PatcherFactory.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/PatcherFactory.kt @@ -21,11 +21,11 @@ class PatcherFactory { "ReplicaPatcher" -> ReplicaPatcher( ) "NumNestedGroupsLoadGeneratorReplicaPatcher" -> NumNestedGroupsLoadGeneratorReplicaPatcher( - loadGenMaxRecords = patcher.properties["loadGenMaxRecords"] ?: throwInvalid(patcher), - numSensors = patcher.properties["numSensors"] ?: throwInvalid(patcher) + loadGenMaxRecords = (patcher.properties["loadGenMaxRecords"] ?: throwInvalid(patcher)).toInt(), + numSensors = (patcher.properties["numSensors"] ?: throwInvalid(patcher)).toInt() ) "NumSensorsLoadGeneratorReplicaPatcher" -> NumSensorsLoadGeneratorReplicaPatcher( - loadGenMaxRecords = patcher.properties["loadGenMaxRecords"] ?: throwInvalid(patcher) + loadGenMaxRecords = (patcher.properties["loadGenMaxRecords"] ?: throwInvalid(patcher)).toInt() ) "DataVolumeLoadGeneratorReplicaPatcher" -> DataVolumeLoadGeneratorReplicaPatcher( maxVolume = (patcher.properties["maxVolume"] ?: throwInvalid(patcher)).toInt(), diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ReplicaPatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ReplicaPatcher.kt index 8637b1299e878c4424e7fcaf4eac3bc901428541..5c5fe6d1352081ea5ea56c6f4005e7ba05bacd6f 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ReplicaPatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ReplicaPatcher.kt @@ -7,11 +7,11 @@ import io.fabric8.kubernetes.api.model.apps.Deployment * The Replica [Patcher] modifies the number of replicas for the given Kubernetes deployment. * */ -class ReplicaPatcher : AbstractPatcher() { +class ReplicaPatcher : AbstractIntPatcher() { - override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { + override fun patchSingleResource(resource: HasMetadata, value: Int): HasMetadata { if (resource is Deployment) { - resource.spec.replicas = Integer.parseInt(value) + resource.spec.replicas = value } return resource } diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/SchedulerNamePatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/SchedulerNamePatcher.kt index 3c6f4be19b74647602a710589a7aea2f016a3d26..5df0a10c97bd8d16b268ce847c3696c82081b9f2 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/SchedulerNamePatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/SchedulerNamePatcher.kt @@ -7,7 +7,7 @@ import io.fabric8.kubernetes.api.model.apps.Deployment * The Scheduler name [Patcher] make it possible to set the scheduler which should * be used to deploy the given deployment. */ -class SchedulerNamePatcher : AbstractPatcher() { +class SchedulerNamePatcher : AbstractStringPatcher() { override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ServiceSelectorPatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ServiceSelectorPatcher.kt index 58ccdea2480ada723aefdd8f10efb06c3c91db91..70b61b0cea7043f645be522f3dc706509c812b06 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ServiceSelectorPatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/ServiceSelectorPatcher.kt @@ -3,7 +3,7 @@ package rocks.theodolite.kubernetes.patcher import io.fabric8.kubernetes.api.model.HasMetadata import io.fabric8.kubernetes.api.model.Service -class ServiceSelectorPatcher(private var variableName: String) : AbstractPatcher() { +class ServiceSelectorPatcher(private var variableName: String) : AbstractStringPatcher() { override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { if (resource is Service) { diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/TemplateLabelPatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/TemplateLabelPatcher.kt index 04cbb8e2b5177424f91ddd530b8e8b12d49210f9..45dc30530e20950c5a2fb3d15e9203109c4c845d 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/TemplateLabelPatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/TemplateLabelPatcher.kt @@ -9,7 +9,7 @@ import io.fabric8.kubernetes.api.model.apps.StatefulSet * * @property variableName The label which should be set */ -class TemplateLabelPatcher(val variableName: String) : AbstractPatcher() { +class TemplateLabelPatcher(val variableName: String) : AbstractStringPatcher() { override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { when (resource) { diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/VolumesConfigMapPatcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/VolumesConfigMapPatcher.kt index 5dfa2cc176eda9c365a3b83aae8ead310ebd65ef..54ac12be7629da792cbb72b2f1d409ba0f4ba93c 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/VolumesConfigMapPatcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/patcher/VolumesConfigMapPatcher.kt @@ -4,7 +4,7 @@ import io.fabric8.kubernetes.api.model.HasMetadata import io.fabric8.kubernetes.api.model.apps.Deployment import io.fabric8.kubernetes.api.model.apps.StatefulSet -class VolumesConfigMapPatcher(private var volumeName: String) : AbstractPatcher() { +class VolumesConfigMapPatcher(private var volumeName: String) : AbstractStringPatcher() { override fun patchSingleResource(resource: HasMetadata, value: String): HasMetadata { if (resource is Deployment) { diff --git a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/AbstractPatcherTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/AbstractStringPatcherTest.kt similarity index 98% rename from theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/AbstractPatcherTest.kt rename to theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/AbstractStringPatcherTest.kt index cb92423305fd3f724753225d95150d5198f1d306..e8fbb110e3e9db276c704123cd40154d2a03f9a8 100644 --- a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/AbstractPatcherTest.kt +++ b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/AbstractStringPatcherTest.kt @@ -7,7 +7,7 @@ import io.quarkus.test.junit.QuarkusTest import org.junit.jupiter.api.Test @QuarkusTest -abstract class AbstractPatcherTest { +abstract class AbstractStringPatcherTest { lateinit var resource: List<HasMetadata> lateinit var patcher: Patcher diff --git a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/DataVolumeLoadGeneratorReplicaPatcherTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/DataVolumeLoadGeneratorReplicaPatcherTest.kt index 6c9be1b9a59f963c8996e520b55e16caf24cbf6c..4d0d95a9c1b61c2ad0e4f5bb10619ac98aa375ce 100644 --- a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/DataVolumeLoadGeneratorReplicaPatcherTest.kt +++ b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/DataVolumeLoadGeneratorReplicaPatcherTest.kt @@ -4,12 +4,12 @@ import io.fabric8.kubernetes.api.model.apps.Deployment import io.quarkus.test.junit.QuarkusTest import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import rocks.theodolite.kubernetes.patcher.AbstractPatcherTest +import rocks.theodolite.kubernetes.patcher.AbstractStringPatcherTest import rocks.theodolite.kubernetes.patcher.VolumesConfigMapPatcher @QuarkusTest -internal class DataVolumeLoadGeneratorReplicaPatcherTest: AbstractPatcherTest() { +internal class DataVolumeLoadGeneratorReplicaPatcherTest: AbstractStringPatcherTest() { @BeforeEach fun setUp() { diff --git a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/EnvVarPatcherTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/EnvVarPatcherTest.kt index 83cd056ac1b56b13fb8f211a2d926f1272c9fb0e..732bb05d0d83a40c1ec5f172545e834bc2493d60 100644 --- a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/EnvVarPatcherTest.kt +++ b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/EnvVarPatcherTest.kt @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.BeforeEach @QuarkusTest -internal class EnvVarPatcherTest : AbstractPatcherTest() { +internal class EnvVarPatcherTest : AbstractStringPatcherTest() { @BeforeEach fun setUp() { diff --git a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/ImagePatcherTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/ImagePatcherTest.kt index 7b3f803a4e13039b7bb40aec6259f7d9a4fdbb57..c93e4b87f90fd550917b9fa958f379d36d765617 100644 --- a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/ImagePatcherTest.kt +++ b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/ImagePatcherTest.kt @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions.* @QuarkusTest -internal class ImagePatcherTest: AbstractPatcherTest(){ +internal class ImagePatcherTest: AbstractStringPatcherTest(){ @BeforeEach fun setUp() { diff --git a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/LabelPatcherTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/LabelPatcherTest.kt index 652dda47cef34a7a95e54c36cbe9af9c897b84a1..901551bc2e7c2e1dcc77757da2e38edb432731f4 100644 --- a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/LabelPatcherTest.kt +++ b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/LabelPatcherTest.kt @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions.* @QuarkusTest -internal class LabelPatcherTest: AbstractPatcherTest() { +internal class LabelPatcherTest: AbstractStringPatcherTest() { @BeforeEach fun setUp() { diff --git a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/MatchLabelPatcherTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/MatchLabelPatcherTest.kt index a5711a762ab65fc39edf731c21d085d0936a5a93..b536f0594bb2d5eb6dbfc5367695ab6be2bc63a1 100644 --- a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/MatchLabelPatcherTest.kt +++ b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/MatchLabelPatcherTest.kt @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions.* @QuarkusTest -internal class MatchLabelPatcherTest: AbstractPatcherTest() { +internal class MatchLabelPatcherTest: AbstractStringPatcherTest() { @BeforeEach fun setUp() { diff --git a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NamePatcherTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NamePatcherTest.kt index cb1308cb73dc127661b2c2741fdc3e0460fcfde4..5544c68afd05990cab5e40dbb6dc4addc875f9a7 100644 --- a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NamePatcherTest.kt +++ b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NamePatcherTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions.* @QuarkusTest -internal class NamePatcherTest: AbstractPatcherTest() { +internal class NamePatcherTest: AbstractStringPatcherTest() { @BeforeEach fun setUp() { diff --git a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NodeSelectorPatcherTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NodeSelectorPatcherTest.kt index ca8f83518a5bcd96837de96b1879c0de2e9a5773..7e1c11298cb5c82d20f5a208cc45c4a56d0985bb 100644 --- a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NodeSelectorPatcherTest.kt +++ b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NodeSelectorPatcherTest.kt @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions.* @QuarkusTest -internal class NodeSelectorPatcherTest: AbstractPatcherTest() { +internal class NodeSelectorPatcherTest: AbstractStringPatcherTest() { @BeforeEach fun setUp() { diff --git a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NumNestedGroupsLoadGeneratorReplicaPatcherTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NumNestedGroupsLoadGeneratorReplicaPatcherTest.kt index 8940e288fae79f10e5dcd728121a2dbbf0aaa180..7bf532a69c9eee24af9956d8061ab81786e160d1 100644 --- a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NumNestedGroupsLoadGeneratorReplicaPatcherTest.kt +++ b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NumNestedGroupsLoadGeneratorReplicaPatcherTest.kt @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions.* @QuarkusTest -internal class NumNestedGroupsLoadGeneratorReplicaPatcherTest : AbstractPatcherTest(){ +internal class NumNestedGroupsLoadGeneratorReplicaPatcherTest : AbstractStringPatcherTest(){ @BeforeEach fun setUp() { diff --git a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NumSensorsLoadGeneratorReplicaPatcherTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NumSensorsLoadGeneratorReplicaPatcherTest.kt index e3bb6ffff4938bcaeb4a0db6487bd4741da75850..7aae52b21a240b3aa82021c8bff3ab8bd6d332ef 100644 --- a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NumSensorsLoadGeneratorReplicaPatcherTest.kt +++ b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/NumSensorsLoadGeneratorReplicaPatcherTest.kt @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions.* @QuarkusTest -internal class NumSensorsLoadGeneratorReplicaPatcherTest: AbstractPatcherTest() { +internal class NumSensorsLoadGeneratorReplicaPatcherTest: AbstractStringPatcherTest() { @BeforeEach fun setUp() { diff --git a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/ReplicaPatcherTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/ReplicaPatcherTest.kt index 852002a07cfb756086afbc6d0573fc548f945683..3e6da5aaae00ea46139a7781b91aac60106657fa 100644 --- a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/ReplicaPatcherTest.kt +++ b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/ReplicaPatcherTest.kt @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions.* @QuarkusTest -internal class ReplicaPatcherTest: AbstractPatcherTest() { +internal class ReplicaPatcherTest: AbstractStringPatcherTest() { @BeforeEach fun setUp() { diff --git a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/SchedulerNamePatcherTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/SchedulerNamePatcherTest.kt index 2b2021ec5853af4a2ef087a21bde87fb5bdc847e..f057c612d13482d98a5383ab475f1d37edc6fb53 100644 --- a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/SchedulerNamePatcherTest.kt +++ b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/SchedulerNamePatcherTest.kt @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions.* @QuarkusTest -internal class SchedulerNamePatcherTest : AbstractPatcherTest(){ +internal class SchedulerNamePatcherTest : AbstractStringPatcherTest(){ @BeforeEach fun setUp() { diff --git a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/TemplateLabelPatcherTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/TemplateLabelPatcherTest.kt index 94073b9f34d6b76d69d82e4ea40ed047a68655ff..a6daef67efe959abf8d3ef8d46f7ad3efb6142b9 100644 --- a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/TemplateLabelPatcherTest.kt +++ b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/TemplateLabelPatcherTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions.* @QuarkusTest -internal class TemplateLabelPatcherTest: AbstractPatcherTest() { +internal class TemplateLabelPatcherTest: AbstractStringPatcherTest() { @BeforeEach fun setUp() { diff --git a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/VolumesConfigMapPatcherTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/VolumesConfigMapPatcherTest.kt index db3fc812e426c0f74cf68d35a158f32a3ec0bc3f..e765f3aeda9cbbabf1d7a75d34d8d5801540233a 100644 --- a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/VolumesConfigMapPatcherTest.kt +++ b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/patcher/VolumesConfigMapPatcherTest.kt @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions.* @QuarkusTest -internal class VolumesConfigMapPatcherTest: AbstractPatcherTest() { +internal class VolumesConfigMapPatcherTest: AbstractStringPatcherTest() { @BeforeEach fun setUp() {