From 6a1aea440c3066edc2ea6b79a65adb5313f4dd48 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Tue, 12 Oct 2021 13:25:41 +0200
Subject: feat(compute): Support filtering hosts based on CPU capacity

This change allows users to create servers with a smaller CPU capacity
than the host, by specifying the CPU capacity via metadata. This also
allows filtering hosts based on their available CPU capacity.
---
 .../org/opendc/compute/workload/ComputeWorkloadLoader.kt    | 13 ++++++++-----
 .../org/opendc/compute/workload/ComputeWorkloadRunner.kt    |  3 ++-
 .../kotlin/org/opendc/compute/workload/VirtualMachine.kt    |  4 +++-
 3 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'opendc-compute/opendc-compute-workload/src')

diff --git a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt
index 1a6624f7..f23becda 100644
--- a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt
+++ b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt
@@ -92,7 +92,8 @@ public class ComputeWorkloadLoader(private val baseDir: File) {
         val idCol = reader.resolve(RESOURCE_ID)
         val startTimeCol = reader.resolve(RESOURCE_START_TIME)
         val stopTimeCol = reader.resolve(RESOURCE_STOP_TIME)
-        val coresCol = reader.resolve(RESOURCE_CPU_COUNT)
+        val cpuCountCol = reader.resolve(RESOURCE_CPU_COUNT)
+        val cpuCapacityCol = reader.resolve(RESOURCE_CPU_CAPACITY)
         val memCol = reader.resolve(RESOURCE_MEM_CAPACITY)
 
         var counter = 0
@@ -108,8 +109,9 @@ public class ComputeWorkloadLoader(private val baseDir: File) {
 
                 val submissionTime = reader.get(startTimeCol) as Instant
                 val endTime = reader.get(stopTimeCol) as Instant
-                val maxCores = reader.getInt(coresCol)
-                val requiredMemory = reader.getDouble(memCol) / 1000.0 // Convert from KB to MB
+                val cpuCount = reader.getInt(cpuCountCol)
+                val cpuCapacity = reader.getDouble(cpuCapacityCol)
+                val memCapacity = reader.getDouble(memCol) / 1000.0 // Convert from KB to MB
                 val uid = UUID.nameUUIDFromBytes("$id-${counter++}".toByteArray())
 
                 val builder = fragments.getValue(id)
@@ -119,8 +121,9 @@ public class ComputeWorkloadLoader(private val baseDir: File) {
                     VirtualMachine(
                         uid,
                         id,
-                        maxCores,
-                        requiredMemory.roundToLong(),
+                        cpuCount,
+                        cpuCapacity,
+                        memCapacity.roundToLong(),
                         totalLoad,
                         submissionTime,
                         endTime,
diff --git a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadRunner.kt b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadRunner.kt
index 283f82fe..90ee56cb 100644
--- a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadRunner.kt
+++ b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadRunner.kt
@@ -128,7 +128,8 @@ public class ComputeWorkloadRunner(
                             client.newFlavor(
                                 entry.name,
                                 entry.cpuCount,
-                                entry.memCapacity
+                                entry.memCapacity,
+                                meta = if (entry.cpuCapacity > 0.0) mapOf("cpu-capacity" to entry.cpuCapacity) else emptyMap()
                             ),
                             meta = mapOf("workload" to workload)
                         )
diff --git a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/VirtualMachine.kt b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/VirtualMachine.kt
index 5dd239f6..88e80719 100644
--- a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/VirtualMachine.kt
+++ b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/VirtualMachine.kt
@@ -31,8 +31,9 @@ import java.util.*
  *
  * @param uid The unique identifier of the virtual machine.
  * @param name The name of the virtual machine.
+ * @param cpuCapacity The required CPU capacity for the VM in MHz.
  * @param cpuCount The number of vCPUs in the VM.
- * @param memCapacity The provisioned memory for the VM.
+ * @param memCapacity The provisioned memory for the VM in MB.
  * @param startTime The start time of the VM.
  * @param stopTime The stop time of the VM.
  * @param trace The trace that belong to this VM.
@@ -41,6 +42,7 @@ public data class VirtualMachine(
     val uid: UUID,
     val name: String,
     val cpuCount: Int,
+    val cpuCapacity: Double,
     val memCapacity: Long,
     val totalLoad: Double,
     val startTime: Instant,
-- 
cgit v1.2.3