merge: Integrate v2.1 progress into public repository

This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.

9 files changed, 451 insertions, 0 deletions

diff --git a/opendc-web/opendc-web-ui/src/redux/reducers/construction-mode.js b/opendc-web/opendc-web-ui/src/redux/reducers/construction-mode.js
new file mode 100644
index 00000000..d0aac5ae
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/redux/reducers/construction-mode.js
@@ -0,0 +1,43 @@
+import { combineReducers } from 'redux'
+import { GO_DOWN_ONE_INTERACTION_LEVEL } from '../actions/interaction-level'
+import {
+    CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED,
+    FINISH_NEW_ROOM_CONSTRUCTION,
+    FINISH_ROOM_EDIT,
+    START_NEW_ROOM_CONSTRUCTION_SUCCEEDED,
+    START_ROOM_EDIT,
+} from '../actions/topology/building'
+import { DELETE_ROOM, START_RACK_CONSTRUCTION, STOP_RACK_CONSTRUCTION } from '../actions/topology/room'
+
+export function currentRoomInConstruction(state = '-1', action) {
+    switch (action.type) {
+        case START_NEW_ROOM_CONSTRUCTION_SUCCEEDED:
+            return action.roomId
+        case START_ROOM_EDIT:
+            return action.roomId
+        case CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED:
+        case FINISH_NEW_ROOM_CONSTRUCTION:
+        case FINISH_ROOM_EDIT:
+        case DELETE_ROOM:
+            return '-1'
+        default:
+            return state
+    }
+}
+
+export function inRackConstructionMode(state = false, action) {
+    switch (action.type) {
+        case START_RACK_CONSTRUCTION:
+            return true
+        case STOP_RACK_CONSTRUCTION:
+        case GO_DOWN_ONE_INTERACTION_LEVEL:
+            return false
+        default:
+            return state
+    }
+}
+
+export const construction = combineReducers({
+    currentRoomInConstruction,
+    inRackConstructionMode,
+})
diff --git a/opendc-web/opendc-web-ui/src/redux/reducers/index.js b/opendc-web/opendc-web-ui/src/redux/reducers/index.js
new file mode 100644
index 00000000..7ffb1211
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/redux/reducers/index.js
@@ -0,0 +1,12 @@
+import { combineReducers } from 'redux'
+import { construction } from './construction-mode'
+import { interactionLevel } from './interaction-level'
+import topology from './topology'
+
+const rootReducer = combineReducers({
+    topology,
+    construction,
+    interactionLevel,
+})
+
+export default rootReducer
diff --git a/opendc-web/opendc-web-ui/src/redux/reducers/interaction-level.js b/opendc-web/opendc-web-ui/src/redux/reducers/interaction-level.js
new file mode 100644
index 00000000..b30c68b9
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/redux/reducers/interaction-level.js
@@ -0,0 +1,68 @@
+import {
+    GO_DOWN_ONE_INTERACTION_LEVEL,
+    GO_FROM_BUILDING_TO_ROOM,
+    GO_FROM_RACK_TO_MACHINE,
+    GO_FROM_ROOM_TO_RACK,
+} from '../actions/interaction-level'
+import { DELETE_MACHINE } from '../actions/topology/machine'
+import { DELETE_RACK } from '../actions/topology/rack'
+import { DELETE_ROOM } from '../actions/topology/room'
+
+export function interactionLevel(state = { mode: 'BUILDING' }, action) {
+    switch (action.type) {
+        case GO_FROM_BUILDING_TO_ROOM:
+            return {
+                mode: 'ROOM',
+                roomId: action.roomId,
+            }
+        case GO_FROM_ROOM_TO_RACK:
+            return {
+                mode: 'RACK',
+                roomId: state.roomId,
+                tileId: action.tileId,
+            }
+        case GO_FROM_RACK_TO_MACHINE:
+            return {
+                mode: 'MACHINE',
+                roomId: state.roomId,
+                tileId: state.tileId,
+                position: action.position,
+            }
+        case GO_DOWN_ONE_INTERACTION_LEVEL:
+            if (state.mode === 'ROOM') {
+                return {
+                    mode: 'BUILDING',
+                }
+            } else if (state.mode === 'RACK') {
+                return {
+                    mode: 'ROOM',
+                    roomId: state.roomId,
+                }
+            } else if (state.mode === 'MACHINE') {
+                return {
+                    mode: 'RACK',
+                    roomId: state.roomId,
+                    tileId: state.tileId,
+                }
+            } else {
+                return state
+            }
+        case DELETE_MACHINE:
+            return {
+                mode: 'RACK',
+                roomId: state.roomId,
+                tileId: state.tileId,
+            }
+        case DELETE_RACK:
+            return {
+                mode: 'ROOM',
+                roomId: state.roomId,
+            }
+        case DELETE_ROOM:
+            return {
+                mode: 'BUILDING',
+            }
+        default:
+            return state
+    }
+}
diff --git a/opendc-web/opendc-web-ui/src/redux/reducers/topology/index.js b/opendc-web/opendc-web-ui/src/redux/reducers/topology/index.js
new file mode 100644
index 00000000..b1c7d29e
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/redux/reducers/topology/index.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2021 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.
+ */
+
+import { CPU_UNITS, GPU_UNITS, MEMORY_UNITS, STORAGE_UNITS } from '../../../util/unit-specifications'
+import machine from './machine'
+import rack from './rack'
+import room from './room'
+import tile from './tile'
+import topology from './topology'
+
+function objects(state = {}, action) {
+    return {
+        cpus: CPU_UNITS,
+        gpus: GPU_UNITS,
+        memories: MEMORY_UNITS,
+        storages: STORAGE_UNITS,
+        machines: machine(state.machines, action, state),
+        racks: rack(state.racks, action, state),
+        tiles: tile(state.tiles, action, state),
+        rooms: room(state.rooms, action, state),
+        root: topology(state.root, action, state),
+    }
+}
+
+export default objects
diff --git a/opendc-web/opendc-web-ui/src/redux/reducers/topology/machine.js b/opendc-web/opendc-web-ui/src/redux/reducers/topology/machine.js
new file mode 100644
index 00000000..41773014
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/redux/reducers/topology/machine.js
@@ -0,0 +1,47 @@
+import produce from 'immer'
+import { STORE_TOPOLOGY } from '../../actions/topologies'
+import { DELETE_MACHINE, ADD_UNIT, DELETE_UNIT } from '../../actions/topology/machine'
+import { ADD_MACHINE, DELETE_RACK } from '../../actions/topology/rack'
+
+function machine(state = {}, action, { racks }) {
+    switch (action.type) {
+        case STORE_TOPOLOGY:
+            return action.entities.machines || {}
+        case ADD_MACHINE:
+            return produce(state, (draft) => {
+                const { machine } = action
+                draft[machine._id] = machine
+            })
+        case DELETE_MACHINE:
+            return produce(state, (draft) => {
+                const { machineId } = action
+                delete draft[machineId]
+            })
+        case ADD_UNIT:
+            return produce(state, (draft) => {
+                const { machineId, unitType, unitId } = action
+                draft[machineId][unitType].push(unitId)
+            })
+        case DELETE_UNIT:
+            return produce(state, (draft) => {
+                const { machineId, unitType, unitId } = action
+                const units = draft[machineId][unitType]
+                const index = units.indexOf(unitId)
+                units.splice(index, 1)
+            })
+        case DELETE_RACK:
+            return produce(state, (draft) => {
+                const { rackId } = action
+                const rack = racks[rackId]
+
+                for (const id of rack.machines) {
+                    const machine = draft[id]
+                    machine.rackId = undefined
+                }
+            })
+        default:
+            return state
+    }
+}
+
+export default machine
diff --git a/opendc-web/opendc-web-ui/src/redux/reducers/topology/rack.js b/opendc-web/opendc-web-ui/src/redux/reducers/topology/rack.js
new file mode 100644
index 00000000..9cc37124
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/redux/reducers/topology/rack.js
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2021 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.
+ */
+
+import produce from 'immer'
+import { STORE_TOPOLOGY } from '../../actions/topologies'
+import { DELETE_MACHINE } from '../../actions/topology/machine'
+import { DELETE_RACK, EDIT_RACK_NAME, ADD_MACHINE } from '../../actions/topology/rack'
+import { ADD_RACK_TO_TILE } from '../../actions/topology/room'
+
+function rack(state = {}, action, { machines }) {
+    switch (action.type) {
+        case STORE_TOPOLOGY:
+            return action.entities.racks || {}
+        case ADD_RACK_TO_TILE:
+            return produce(state, (draft) => {
+                const { rack } = action
+                draft[rack._id] = rack
+            })
+        case EDIT_RACK_NAME:
+            return produce(state, (draft) => {
+                const { rackId, name } = action
+                draft[rackId].name = name
+            })
+        case DELETE_RACK:
+            return produce(state, (draft) => {
+                const { rackId } = action
+                delete draft[rackId]
+            })
+        case ADD_MACHINE:
+            return produce(state, (draft) => {
+                const { machine } = action
+                draft[machine.rackId].machines.push(machine._id)
+            })
+        case DELETE_MACHINE:
+            return produce(state, (draft) => {
+                const { machineId } = action
+                const machine = machines[machineId]
+                const rack = draft[machine.rackId]
+                const index = rack.machines.indexOf(machineId)
+                rack.machines.splice(index, 1)
+            })
+        default:
+            return state
+    }
+}
+
+export default rack
diff --git a/opendc-web/opendc-web-ui/src/redux/reducers/topology/room.js b/opendc-web/opendc-web-ui/src/redux/reducers/topology/room.js
new file mode 100644
index 00000000..b61c9d82
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/redux/reducers/topology/room.js
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2021 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.
+ */
+
+import produce from 'immer'
+import { STORE_TOPOLOGY } from '../../actions/topologies'
+import { ADD_TILE, DELETE_TILE } from '../../actions/topology/building'
+import { DELETE_ROOM, EDIT_ROOM_NAME, ADD_ROOM } from '../../actions/topology/room'
+
+function room(state = {}, action, { tiles }) {
+    switch (action.type) {
+        case STORE_TOPOLOGY:
+            return action.entities.rooms || {}
+        case ADD_ROOM:
+            return produce(state, (draft) => {
+                const { room } = action
+                draft[room._id] = room
+            })
+        case DELETE_ROOM:
+            return produce(state, (draft) => {
+                const { roomId } = action
+                delete draft[roomId]
+            })
+        case EDIT_ROOM_NAME:
+            return produce(state, (draft) => {
+                const { roomId, name } = action
+                draft[roomId].name = name
+            })
+        case ADD_TILE:
+            return produce(state, (draft) => {
+                const { tile } = action
+                draft[tile.roomId].tiles.push(tile._id)
+            })
+        case DELETE_TILE:
+            return produce(state, (draft) => {
+                const { tileId } = action
+                const tile = tiles[tileId]
+                const room = draft[tile.roomId]
+                const index = room.tiles.indexOf(tileId)
+                room.tiles.splice(index, 1)
+            })
+        default:
+            return state
+    }
+}
+
+export default room
diff --git a/opendc-web/opendc-web-ui/src/redux/reducers/topology/tile.js b/opendc-web/opendc-web-ui/src/redux/reducers/topology/tile.js
new file mode 100644
index 00000000..e0c5dd33
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/redux/reducers/topology/tile.js
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2021 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.
+ */
+
+import produce from 'immer'
+import { STORE_TOPOLOGY } from '../../actions/topologies'
+import { ADD_TILE, DELETE_TILE } from '../../actions/topology/building'
+import { DELETE_RACK } from '../../actions/topology/rack'
+import { ADD_RACK_TO_TILE } from '../../actions/topology/room'
+
+function tile(state = {}, action, { racks }) {
+    switch (action.type) {
+        case STORE_TOPOLOGY:
+            return action.entities.tiles || {}
+        case ADD_TILE:
+            return produce(state, (draft) => {
+                const { tile } = action
+                draft[tile._id] = tile
+            })
+        case DELETE_TILE:
+            return produce(state, (draft) => {
+                const { tileId } = action
+                delete draft[tileId]
+            })
+        case ADD_RACK_TO_TILE:
+            return produce(state, (draft) => {
+                const { rack } = action
+                draft[rack.tileId].rack = rack._id
+            })
+        case DELETE_RACK:
+            return produce(state, (draft) => {
+                const { rackId } = action
+                const rack = racks[rackId]
+                draft[rack.tileId].rack = undefined
+            })
+        default:
+            return state
+    }
+}
+
+export default tile
diff --git a/opendc-web/opendc-web-ui/src/redux/reducers/topology/topology.js b/opendc-web/opendc-web-ui/src/redux/reducers/topology/topology.js
new file mode 100644
index 00000000..da0e6988
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/redux/reducers/topology/topology.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2021 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.
+ */
+
+import produce from 'immer'
+import { STORE_TOPOLOGY } from '../../actions/topologies'
+import { ADD_ROOM, DELETE_ROOM } from '../../actions/topology/room'
+
+function topology(state = undefined, action) {
+    switch (action.type) {
+        case STORE_TOPOLOGY:
+            return action.topology
+        case ADD_ROOM:
+            return produce(state, (draft) => {
+                const { room } = action
+                draft.rooms.push(room._id)
+            })
+        case DELETE_ROOM:
+            return produce(state, (draft) => {
+                const { roomId } = action
+                const index = draft.rooms.indexOf(roomId)
+                draft.rooms.splice(index, 1)
+            })
+        default:
+            return state
+    }
+}
+
+export default topology