diff options
Diffstat (limited to 'opendc-experiments/opendc-experiments-greenifier/src/main')
3 files changed, 8 insertions, 8 deletions
diff --git a/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/GreenifierCli.kt b/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/GreenifierCli.kt index 1f5a40f1..e3f1de2a 100644 --- a/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/GreenifierCli.kt +++ b/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/GreenifierCli.kt @@ -105,9 +105,9 @@ internal class GreenifierCommand : CliktCommand(name = "greenifier") { */ private val portfolio by argument(help = "portfolio to replay") .choice( - "greenifier" to { GreenifierPortfolio() }, + "greenifier" to { GreenifierPortfolio() } ) - .default({GreenifierPortfolio()}) + .default({ GreenifierPortfolio() }) /** * The base partitions to use for the invocation 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 4811cb61..70e23ef4 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 @@ -23,8 +23,6 @@ package org.opendc.experiments.greenifier import org.opendc.compute.service.ComputeService -import org.opendc.experiments.greenifier.model.Scenario -import org.opendc.experiments.greenifier.topology.clusterTopology import org.opendc.experiments.compute.ComputeWorkloadLoader import org.opendc.experiments.compute.createComputeScheduler import org.opendc.experiments.compute.export.parquet.ParquetComputeMonitor @@ -33,6 +31,8 @@ import org.opendc.experiments.compute.registerComputeMonitor import org.opendc.experiments.compute.replay import org.opendc.experiments.compute.setupComputeService import org.opendc.experiments.compute.setupHosts +import org.opendc.experiments.greenifier.model.Scenario +import org.opendc.experiments.greenifier.topology.clusterTopology import org.opendc.experiments.provisioner.Provisioner import org.opendc.simulator.kotlin.runSimulation import java.io.File diff --git a/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/portfolio/GreenifierPortfolio.kt b/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/portfolio/GreenifierPortfolio.kt index 44fd359a..237b0222 100644 --- a/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/portfolio/GreenifierPortfolio.kt +++ b/opendc-experiments/opendc-experiments-greenifier/src/main/kotlin/org/opendc/experiments/greenifier/portfolio/GreenifierPortfolio.kt @@ -22,12 +22,12 @@ package org.opendc.experiments.greenifier.portfolio +import org.opendc.experiments.compute.sampleByLoad +import org.opendc.experiments.compute.trace import org.opendc.experiments.greenifier.model.OperationalPhenomena import org.opendc.experiments.greenifier.model.Scenario import org.opendc.experiments.greenifier.model.Topology import org.opendc.experiments.greenifier.model.Workload -import org.opendc.experiments.compute.sampleByLoad -import org.opendc.experiments.compute.trace /** * A [Portfolio] that explores the difference between horizontal and vertical scaling. @@ -35,11 +35,11 @@ import org.opendc.experiments.compute.trace public class GreenifierPortfolio : Portfolio { private val topologies = listOf( Topology("single"), - Topology("multi"), + Topology("multi") ) private val workloads = listOf( - Workload("bitbrains-small", trace("trace").sampleByLoad(1.0)), + Workload("bitbrains-small", trace("trace").sampleByLoad(1.0)) ) private val operationalPhenomena = OperationalPhenomena(0.0, false) private val allocationPolicy = "active-servers" |