Merge changes with upstream

1 files changed, 3 insertions, 4 deletions

diff --git a/web-server/opendc/api/v2/simulations/endpoint.py b/web-server/opendc/api/v2/simulations/endpoint.py
index 232df2ff..c978fad7 100644
--- a/web-server/opendc/api/v2/simulations/endpoint.py
+++ b/web-server/opendc/api/v2/simulations/endpoint.py
@@ -3,7 +3,6 @@ from datetime import datetime
 from opendc.models.simulation import Simulation
 from opendc.models.topology import Topology
 from opendc.models.user import User
-from opendc.util import exceptions
 from opendc.util.database import Database
 from opendc.util.rest import Response
 
@@ -13,18 +12,18 @@ def POST(request):
 
     request.check_required_parameters(body={'simulation': {'name': 'string'}})
 
-    topology = Topology({'name': 'Default topology'})
+    topology = Topology({'name': 'Default topology', 'rooms': []})
     topology.insert()
 
     simulation = Simulation({'simulation': request.params_body['simulation']})
     simulation.set_property('datetimeCreated', Database.datetime_to_string(datetime.now()))
     simulation.set_property('datetimeLastEdited', Database.datetime_to_string(datetime.now()))
-    simulation.set_property('topologyIds', [topology.obj['_id']])
+    simulation.set_property('topologyIds', [topology.get_id()])
     simulation.set_property('experimentIds', [])
     simulation.insert()
 
     user = User.from_google_id(request.google_id)
-    user.obj['authorizations'].append({'simulationId': simulation.obj['_id'], 'authorizationLevel': 'OWN'})
+    user.obj['authorizations'].append({'simulationId': simulation.get_id(), 'authorizationLevel': 'OWN'})
     user.update()
 
     return Response(200, 'Successfully created simulation.', simulation.obj)