summaryrefslogtreecommitdiff
path: root/opendc-web/opendc-web-api
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2021-07-10 12:41:00 +0200
committerFabian Mastenbroek <mail.fabianm@gmail.com>2021-07-15 15:45:28 +0200
commite200dbfdc076ac6263c9ac6f9dabdcc475f01d6e (patch)
tree18bbe61cbf14f5b57e5effe04feda0da4b6d572a /opendc-web/opendc-web-api
parent1ab168fb80fbf3958fbadda00d1c6714cad66c86 (diff)
fix(ui): Relax topology schema requirements
This change fixes an issue where the topology generated by the frontend was not accepted by the API server.
Diffstat (limited to 'opendc-web/opendc-web-api')
-rw-r--r--opendc-web/opendc-web-api/opendc/models/topology.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/opendc-web/opendc-web-api/opendc/models/topology.py b/opendc-web/opendc-web-api/opendc/models/topology.py
index 592f82c5..44994818 100644
--- a/opendc-web/opendc-web-api/opendc/models/topology.py
+++ b/opendc-web/opendc-web-api/opendc/models/topology.py
@@ -38,6 +38,7 @@ class MachineSchema(Schema):
gpus = fields.List(fields.Nested(PuSchema))
memories = fields.List(fields.Nested(MemorySchema))
storages = fields.List(fields.Nested(MemorySchema))
+ rackId = fields.String()
class ObjectSchema(Schema):
@@ -49,6 +50,7 @@ class ObjectSchema(Schema):
capacity = fields.Integer()
powerCapacityW = fields.Integer()
machines = fields.List(fields.Nested(MachineSchema))
+ tileId = fields.String()
class TileSchema(Schema):
@@ -56,9 +58,11 @@ class TileSchema(Schema):
Schema representing a room tile.
"""
_id = fields.String()
+ topologyId = fields.String()
positionX = fields.Integer()
positionY = fields.Integer()
rack = fields.Nested(ObjectSchema)
+ roomId = fields.String()
class RoomSchema(Schema):
@@ -67,6 +71,7 @@ class RoomSchema(Schema):
"""
_id = fields.String()
name = fields.String(required=True)
+ topologyId = fields.String()
tiles = fields.List(fields.Nested(TileSchema), required=True)
@@ -78,6 +83,7 @@ class TopologySchema(Schema):
projectId = fields.String()
name = fields.String(required=True)
rooms = fields.List(fields.Nested(RoomSchema), required=True)
+ datetimeLastEdited = fields.DateTime()
class Topology(Model):