Cpu fix (#208)

* Updated the topology format to JSON. Updated TopologyReader.kt to handle JSON filed. Added documentation for the new format.

* applied spotless kotlin

* small update

* Updated for spotless apply

* Updated for spotless apply

2 files changed, 13 insertions, 11 deletions

diff --git a/opendc-experiments/opendc-experiments-greenifier/src/test/kotlin/org/opendc/experiments/greenifier/GreenifierIntegrationTest.kt b/opendc-experiments/opendc-experiments-greenifier/src/test/kotlin/org/opendc/experiments/greenifier/GreenifierIntegrationTest.kt
index 36b15ee0..15f6cdf6 100644
--- a/opendc-experiments/opendc-experiments-greenifier/src/test/kotlin/org/opendc/experiments/greenifier/GreenifierIntegrationTest.kt
+++ b/opendc-experiments/opendc-experiments-greenifier/src/test/kotlin/org/opendc/experiments/greenifier/GreenifierIntegrationTest.kt
@@ -40,8 +40,8 @@ import org.opendc.compute.simulator.provisioner.setupHosts
 import org.opendc.compute.telemetry.ComputeMonitor
 import org.opendc.compute.telemetry.table.HostTableReader
 import org.opendc.compute.telemetry.table.ServiceTableReader
-import org.opendc.compute.topology.HostSpec
 import org.opendc.compute.topology.clusterTopology
+import org.opendc.compute.topology.specs.HostSpec
 import org.opendc.compute.workload.ComputeWorkloadLoader
 import org.opendc.compute.workload.VirtualMachine
 import org.opendc.compute.workload.sampleByLoad
@@ -126,7 +126,7 @@ class GreenifierIntegrationTest {
                 { assertEquals(66977091124, monitor.activeTime) { "Incorrect active time" } },
                 { assertEquals(3160267873, monitor.stealTime) { "Incorrect steal time" } },
                 { assertEquals(0, monitor.lostTime) { "Incorrect lost time" } },
-                { assertEquals(5.8407E9, monitor.energyUsage, 1E4) { "Incorrect power draw" } },
+                { assertEquals(7.767237E9, monitor.energyUsage, 1E4) { "Incorrect power draw" } },
             )
         }
 
@@ -138,7 +138,7 @@ class GreenifierIntegrationTest {
         runSimulation {
             val seed = 1L
             val workload = createTestWorkload(0.25, seed)
-            val topology = createTopology("single")
+            val topology = createTopology("single.json")
             val monitor = monitor
 
             Provisioner(dispatcher, seed).use { provisioner ->
@@ -167,7 +167,7 @@ class GreenifierIntegrationTest {
                 { assertEquals(9741285381, monitor.activeTime) { "Active time incorrect" } },
                 { assertEquals(152, monitor.stealTime) { "Steal time incorrect" } },
                 { assertEquals(0, monitor.lostTime) { "Lost time incorrect" } },
-                { assertEquals(7.0109E8, monitor.energyUsage, 1E4) { "Incorrect power draw" } },
+                { assertEquals(7.933686E8, monitor.energyUsage, 1E4) { "Incorrect power draw" } },
             )
         }
 
@@ -179,7 +179,7 @@ class GreenifierIntegrationTest {
         runSimulation {
             val seed = 0L
             val workload = createTestWorkload(1.0, seed)
-            val topology = createTopology("single")
+            val topology = createTopology("single.json")
 
             Provisioner(dispatcher, seed).use { provisioner ->
                 provisioner.runSteps(
@@ -217,7 +217,7 @@ class GreenifierIntegrationTest {
     fun testFailures() =
         runSimulation {
             val seed = 0L
-            val topology = createTopology("single")
+            val topology = createTopology("single.json")
             val workload = createTestWorkload(0.25, seed)
             val monitor = monitor
 
@@ -256,8 +256,8 @@ class GreenifierIntegrationTest {
     /**
      * Obtain the topology factory for the test.
      */
-    private fun createTopology(name: String = "topology"): List<HostSpec> {
-        val stream = checkNotNull(object {}.javaClass.getResourceAsStream("/env/$name.txt"))
+    private fun createTopology(name: String = "topology.json"): List<HostSpec> {
+        val stream = checkNotNull(object {}.javaClass.getResourceAsStream("/env/$name"))
         return stream.use { clusterTopology(stream) }
     }
 
diff --git a/opendc-experiments/opendc-experiments-greenifier/src/test/kotlin/org/opendc/experiments/greenifier/GreenifierRunnerTest.kt b/opendc-experiments/opendc-experiments-greenifier/src/test/kotlin/org/opendc/experiments/greenifier/GreenifierRunnerTest.kt
index b6d6a6e9..b73317be 100644
--- a/opendc-experiments/opendc-experiments-greenifier/src/test/kotlin/org/opendc/experiments/greenifier/GreenifierRunnerTest.kt
+++ b/opendc-experiments/opendc-experiments-greenifier/src/test/kotlin/org/opendc/experiments/greenifier/GreenifierRunnerTest.kt
@@ -46,7 +46,8 @@ class GreenifierRunnerTest {
     private val tracePath = File("src/test/resources/trace")
 
     /**
-     * Smoke test with output. fixme: Fix failures and enable Test
+     * Smoke test with output.
+     * fixme: Fix failures and enable
      */
     fun testSmoke() {
         val outputPath = Files.createTempDirectory("output").toFile()
@@ -55,7 +56,7 @@ class GreenifierRunnerTest {
             val runner = GreenifierRunner(envPath, tracePath, outputPath)
             val scenario =
                 Scenario(
-                    Topology("topology"),
+                    Topology("topology.json"),
                     Workload("bitbrains-small", trace("bitbrains-small")),
                     OperationalPhenomena(failureFrequency = 24.0 * 7, hasInterference = true),
                     "active-servers",
@@ -68,7 +69,8 @@ class GreenifierRunnerTest {
     }
 
     /**
-     * Smoke test without output. fixme: Fix failures and enable Test
+     * Smoke test without output.
+     * fixme: Fix failures and enable
      */
     fun testSmokeNoOutput() {
         val runner = GreenifierRunner(envPath, tracePath, null)