diff options
| author | Dante Niewenhuis <d.niewenhuis@hotmail.com> | 2025-02-06 10:49:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-06 10:49:12 +0100 |
| commit | 8a3f26bfa51753c8b602985fc1965105629e5f37 (patch) | |
| tree | b9227e6d7d92103ee44812aea5fb70a749debbbd /opendc-experiments/opendc-experiments-base/src/test/kotlin | |
| parent | df1028c71cb6d50db886c8076c7139ec24feb6d7 (diff) | |
updated logging and added logging for batteries (#301)
* Updated logging
* removed DoubleThresholdBatteryPolicy.java
Diffstat (limited to 'opendc-experiments/opendc-experiments-base/src/test/kotlin')
2 files changed, 7 insertions, 5 deletions
diff --git a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/BatteryTest.kt b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/BatteryTest.kt index 3161a9a1..a85c84f3 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/BatteryTest.kt +++ b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/BatteryTest.kt @@ -271,6 +271,8 @@ class BatteryTest { val topology = createTopology("batteries/experiment1.json") val monitor = runTest(topology, workload, failureModelSpec = failureModelSpec) + println(monitor.hostEnergyUsages["H01"]) + assertAll( { assertEquals((960 * 1000) + 5000, monitor.maxTimestamp) { "Total runtime incorrect" } }, { diff --git a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/TestingUtils.kt b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/TestingUtils.kt index df45f374..408e1496 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/TestingUtils.kt +++ b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/TestingUtils.kt @@ -34,10 +34,10 @@ import org.opendc.compute.simulator.scheduler.filters.VCpuFilter import org.opendc.compute.simulator.scheduler.weights.CoreRamWeigher import org.opendc.compute.simulator.service.ComputeService import org.opendc.compute.simulator.telemetry.ComputeMonitor -import org.opendc.compute.simulator.telemetry.table.HostTableReader -import org.opendc.compute.simulator.telemetry.table.PowerSourceTableReader -import org.opendc.compute.simulator.telemetry.table.ServiceTableReader -import org.opendc.compute.simulator.telemetry.table.TaskTableReader +import org.opendc.compute.simulator.telemetry.table.host.HostTableReader +import org.opendc.compute.simulator.telemetry.table.powerSource.PowerSourceTableReader +import org.opendc.compute.simulator.telemetry.table.service.ServiceTableReader +import org.opendc.compute.simulator.telemetry.table.task.TaskTableReader import org.opendc.compute.topology.clusterTopology import org.opendc.compute.topology.specs.ClusterSpec import org.opendc.compute.workload.Task @@ -182,7 +182,7 @@ class TestComputeMonitor : ComputeMonitor { var hostEnergyUsages = mutableMapOf<String, ArrayList<Double>>() override fun record(reader: HostTableReader) { - val hostName: String = reader.host.name + val hostName: String = reader.hostInfo.name if (!(hostName in hostCpuDemands)) { hostIdleTimes[hostName] = ArrayList() |