From 960b3d8a13c67ac4b7f479d5764b0b618fc9ea09 Mon Sep 17 00:00:00 2001
From: Dante Niewenhuis <d.niewenhuis@hotmail.com>
Date: Tue, 5 Mar 2024 16:50:35 +0100
Subject: 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
---
 .../kotlin/org/opendc/experiments/greenifier/GreenifierPortfolio.kt   | 4 ++--
 .../main/kotlin/org/opendc/experiments/greenifier/GreenifierRunner.kt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'opendc-experiments/opendc-experiments-greenifier/src/main/kotlin')

diff --git a/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/GreenifierPortfolio.kt b/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/GreenifierPortfolio.kt
index f7fd204f..f7452be2 100644
--- a/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/GreenifierPortfolio.kt
+++ b/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/GreenifierPortfolio.kt
@@ -36,8 +36,8 @@ import org.opendc.experiments.base.portfolio.model.Workload
 public class GreenifierPortfolio : Portfolio {
     private val topologies =
         listOf(
-            Topology("single"),
-            Topology("multi"),
+            Topology("single.json"),
+            Topology("multi.json"),
         )
 
     private val workloads =
diff --git a/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/GreenifierRunner.kt b/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/GreenifierRunner.kt
index 6da35cd1..bd855aac 100644
--- a/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/GreenifierRunner.kt
+++ b/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/GreenifierRunner.kt
@@ -65,7 +65,7 @@ public class GreenifierRunner(
         seed: Long,
     ) = runSimulation {
         val serviceDomain = "compute.opendc.org"
-        val topology = clusterTopology(File(envPath, "${scenario.topology.name}.txt"))
+        val topology = clusterTopology(File(envPath, scenario.topology.name))
 
         Provisioner(dispatcher, seed).use { provisioner ->
             provisioner.runSteps(
-- 
cgit v1.2.3