summaryrefslogtreecommitdiff
path: root/opendc/opendc-compute/src/main
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2020-02-14 12:52:29 +0100
committerFabian Mastenbroek <mail.fabianm@gmail.com>2020-02-14 12:52:29 +0100
commit6ff2e43c55ffec98f444b9cd61b550fadd83633d (patch)
tree7541236d64de2eabfc92b5d1890e606aaea26230 /opendc/opendc-compute/src/main
parentca862ddccec387dc7cb032d6c48206ce0d3cf37f (diff)
refactor: Rename Flavor to ServerFlavor
This change renames Flavor to ServerFlavor to be more indicative of its function. The Flavor name follows the naming of the OpenStack project.
Diffstat (limited to 'opendc/opendc-compute/src/main')
-rw-r--r--opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/Server.kt2
-rw-r--r--opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/ServerFlavor.kt (renamed from opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/Flavor.kt)2
-rw-r--r--opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/metal/driver/FakeBareMetalDriver.kt4
3 files changed, 4 insertions, 4 deletions
diff --git a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/Server.kt b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/Server.kt
index cb14835a..d42b59b6 100644
--- a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/Server.kt
+++ b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/Server.kt
@@ -45,7 +45,7 @@ public data class Server(
/**
* The hardware configuration of the server.
*/
- public val flavor: Flavor,
+ public val flavor: ServerFlavor,
/**
* The image running on the server.
diff --git a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/Flavor.kt b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/ServerFlavor.kt
index 0094704a..d57dadf9 100644
--- a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/Flavor.kt
+++ b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/ServerFlavor.kt
@@ -27,7 +27,7 @@ package com.atlarge.opendc.compute.core
/**
* (Virtual) hardware configuration of a server.
*/
-public data class Flavor(
+public data class ServerFlavor(
/**
* The processing units of this machine.
*/
diff --git a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/metal/driver/FakeBareMetalDriver.kt b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/metal/driver/FakeBareMetalDriver.kt
index 7a6d9123..cc4cc46c 100644
--- a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/metal/driver/FakeBareMetalDriver.kt
+++ b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/metal/driver/FakeBareMetalDriver.kt
@@ -25,7 +25,7 @@
package com.atlarge.opendc.compute.metal.driver
import com.atlarge.odcsim.processContext
-import com.atlarge.opendc.compute.core.Flavor
+import com.atlarge.opendc.compute.core.ServerFlavor
import com.atlarge.opendc.compute.core.Server
import com.atlarge.opendc.compute.core.ServerState
import com.atlarge.opendc.compute.core.execution.ServerManagementContext
@@ -49,7 +49,7 @@ import kotlinx.coroutines.delay
public class FakeBareMetalDriver(
uid: UUID,
name: String,
- private val flavor: Flavor
+ private val flavor: ServerFlavor
) : BareMetalDriver {
/**
* The monitor to use.