summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/Graph.kt4
-rw-r--r--opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/Datacenter.kt (renamed from opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/DataCenter.kt)2
-rw-r--r--opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/rack/Rack.kt2
-rw-r--r--opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/room/Room.kt2
-rw-r--r--opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/machine/Machine.kt2
5 files changed, 6 insertions, 6 deletions
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/Graph.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/Graph.kt
index a87957e3..e1e361f9 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/Graph.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/Graph.kt
@@ -25,8 +25,8 @@
package nl.atlarge.opendc.topology
/**
- * A graph data structure which represents the logical topology of a cloud network consisting of one or more data
- * centers.
+ * A graph data structure which represents the logical topology of a cloud network consisting of one or more
+ * datacenters.
*
* @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl)
*/
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/DataCenter.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/Datacenter.kt
index b72b0c2a..5a57c70a 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/DataCenter.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/Datacenter.kt
@@ -32,4 +32,4 @@ import nl.atlarge.opendc.topology.Entity
* @param id The unique identifier of this entity.
* @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl)
*/
-class DataCenter(override val id: Int): Entity
+class Datacenter(override val id: Int): Entity
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/rack/Rack.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/rack/Rack.kt
index d5ac5d99..cf947ebb 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/rack/Rack.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/rack/Rack.kt
@@ -28,7 +28,7 @@ import nl.atlarge.opendc.topology.Entity
/**
* A type of physical steel and electronic framework that is designed to house servers, networking devices, cables and
- * other data center computing equipment.
+ * other datacenter computing equipment.
*
* @param id The unique identifier of this entity.
* @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl)
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/room/Room.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/room/Room.kt
index e8dcfda5..638d59e3 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/room/Room.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/room/Room.kt
@@ -27,7 +27,7 @@ package nl.atlarge.opendc.topology.container.room
import nl.atlarge.opendc.topology.Entity
/**
- * A physical room in a data center which contains [Entity]s.
+ * A physical room in a datacenter which contains [Entity]s.
*
* @param id The unique identifier of this entity.
* @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl)
diff --git a/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/machine/Machine.kt b/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/machine/Machine.kt
index 8944362f..39b5267e 100644
--- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/machine/Machine.kt
+++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/machine/Machine.kt
@@ -27,7 +27,7 @@ package nl.atlarge.opendc.topology.machine
import nl.atlarge.opendc.topology.Entity
/**
- * A Physical Machine (PM) inside a rack of a data center. It has a speed, and can be given a workload on which it will
+ * A Physical Machine (PM) inside a rack of a datacenter. It has a speed, and can be given a workload on which it will
* work until finished or interrupted.
*
* @param id The unique identifier of this entity.