updated logging and added logging for batteries (#301)

* Updated logging

* removed DoubleThresholdBatteryPolicy.java

2 files changed, 7 insertions, 10 deletions

diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt
index 196d6a93..2f23d33b 100644
--- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt
+++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt
@@ -50,7 +50,6 @@ import java.time.Duration
 import java.time.Instant
 import java.time.temporal.ChronoUnit
 import java.util.Random
-import java.util.UUID
 import java.util.concurrent.Executors
 import java.util.concurrent.ForkJoinPool
 import java.util.concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory
@@ -228,7 +227,7 @@ public class OpenDCRunner(
      *
      * @param scenario The scenario to simulate.
      * @param repeat The repeat number used to seed the simulation.
-     * @param topology The topology to simulate.
+     * @param topologyHosts The topology to simulate.
      */
     private inner class SimulationTask(
         private val scenario: Scenario,
@@ -264,7 +263,6 @@ public class OpenDCRunner(
 
                 val powerSourceSpec =
                     PowerSourceSpec(
-                        UUID(0, 0),
                         totalPower = Long.MAX_VALUE,
                     )
                 val topology = listOf(ClusterSpec("cluster", topologyHosts, powerSourceSpec))
@@ -359,9 +357,8 @@ public class OpenDCRunner(
 
             val spec =
                 HostSpec(
-                    UUID(random.nextLong(), random.nextLong()),
                     "node-$clusterId-$position",
-                    mapOf("cluster" to clusterId),
+                    clusterId,
                     MachineModel(processors, memoryUnits[0]),
                     powerModel,
                 )
diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt
index 7e09e9e9..fbb33593 100644
--- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt
+++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt
@@ -23,10 +23,10 @@
 package org.opendc.web.runner.internal
 
 import org.opendc.compute.simulator.telemetry.ComputeMonitor
-import org.opendc.compute.simulator.telemetry.table.HostTableReader
-import org.opendc.compute.simulator.telemetry.table.ServiceData
-import org.opendc.compute.simulator.telemetry.table.ServiceTableReader
-import org.opendc.compute.simulator.telemetry.table.toServiceData
+import org.opendc.compute.simulator.telemetry.table.host.HostTableReader
+import org.opendc.compute.simulator.telemetry.table.service.ServiceData
+import org.opendc.compute.simulator.telemetry.table.service.ServiceTableReader
+import org.opendc.compute.simulator.telemetry.table.service.toServiceData
 import kotlin.math.roundToLong
 
 /**
@@ -47,7 +47,7 @@ internal class WebComputeMonitor : ComputeMonitor {
                 hostAggregateMetrics.totalFailureVmSlices + reader.guestsRunning * slices,
             )
 
-        hostMetrics.compute(reader.host.id) { _, prev ->
+        hostMetrics.compute(reader.hostInfo.name) { _, prev ->
             HostMetrics(
                 reader.cpuUsage + (prev?.cpuUsage ?: 0.0),
                 reader.cpuDemand + (prev?.cpuDemand ?: 0.0),