From dd0777c659871fafc4633b9d37c75524af1964b2 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Tue, 8 Aug 2017 21:28:44 +0200 Subject: Rename data center to datacenter --- .../kotlin/nl/atlarge/opendc/topology/Graph.kt | 4 +-- .../opendc/topology/container/DataCenter.kt | 35 ---------------------- .../opendc/topology/container/Datacenter.kt | 35 ++++++++++++++++++++++ .../atlarge/opendc/topology/container/rack/Rack.kt | 2 +- .../atlarge/opendc/topology/container/room/Room.kt | 2 +- .../nl/atlarge/opendc/topology/machine/Machine.kt | 2 +- 6 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/DataCenter.kt create mode 100644 opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/Datacenter.kt (limited to 'opendc-core/src/main') 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 deleted file mode 100644 index b72b0c2a..00000000 --- a/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/DataCenter.kt +++ /dev/null @@ -1,35 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017 atlarge-research - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package nl.atlarge.opendc.topology.container - -import nl.atlarge.opendc.topology.Entity - -/** - * A representation of a facility used to house computer systems and associated components. - * - * @param id The unique identifier of this entity. - * @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl) - */ -class DataCenter(override val id: Int): Entity 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 new file mode 100644 index 00000000..5a57c70a --- /dev/null +++ b/opendc-core/src/main/kotlin/nl/atlarge/opendc/topology/container/Datacenter.kt @@ -0,0 +1,35 @@ +/* + * MIT License + * + * Copyright (c) 2017 atlarge-research + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package nl.atlarge.opendc.topology.container + +import nl.atlarge.opendc.topology.Entity + +/** + * A representation of a facility used to house computer systems and associated components. + * + * @param id The unique identifier of this entity. + * @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl) + */ +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. -- cgit v1.2.3