Merge changes with upstream

1 files changed, 22 insertions, 84 deletions

diff --git a/web-server/opendc/api/v2/simulations/simulationId/experiments/endpoint.py b/web-server/opendc/api/v2/simulations/simulationId/experiments/endpoint.py
index 9df84838..0d7c208d 100644
--- a/web-server/opendc/api/v2/simulations/simulationId/experiments/endpoint.py
+++ b/web-server/opendc/api/v2/simulations/simulationId/experiments/endpoint.py
@@ -1,97 +1,35 @@
-from opendc.models_old.experiment import Experiment
-from opendc.models_old.simulation import Simulation
-from opendc.util import exceptions
+from opendc.models.experiment import Experiment
+from opendc.models.simulation import Simulation
 from opendc.util.rest import Response
 
 
-def GET(request):
-    """Get this Simulation's Experiments."""
-
-    # Make sure required parameters are there
-
-    try:
-        request.check_required_parameters(path={'simulationId': 'string'})
-
-    except exceptions.ParameterError as e:
-        return Response(400, str(e))
-
-    # Instantiate a Simulation from the database
-
-    simulation = Simulation.from_primary_key((request.params_path['simulationId'], ))
-
-    # Make sure this Simulation exists
-
-    if not simulation.exists():
-        return Response(404, '{} not found.'.format(simulation))
-
-    # Make sure this user is authorized to view this Simulation's Experiments
-
-    if not simulation.google_id_has_at_least(request.google_id, 'VIEW'):
-        return Reponse(403, 'Forbidden from viewing Experiments for {}.'.format(simulation))
-
-    # Get and return the Experiments
-
-    experiments = Experiment.query('simulation_id', request.params_path['simulationId'])
-
-    return Response(200, 'Successfully retrieved Experiments for {}.'.format(simulation),
-                    [x.to_JSON() for x in experiments])
-
-
 def POST(request):
     """Add a new Experiment for this Simulation."""
 
-    # Make sure required parameters are there
-
-    try:
-        request.check_required_parameters(path={'simulationId': 'string'},
-                                          body={
-                                              'experiment': {
-                                                  'simulationId': 'string',
-                                                  'pathId': 'int',
-                                                  'traceId': 'int',
-                                                  'schedulerName': 'string',
-                                                  'name': 'string'
-                                              }
-                                          })
-
-    except exceptions.ParameterError as e:
-        return Response(400, str(e))
-
-    # Make sure the passed object's simulation id matches the path simulation id
-
-    if request.params_path['simulationId'] != request.params_body['experiment']['simulationId']:
-        return Response(403, 'ID mismatch.')
-
-    # Instantiate a Simulation from the database
-
-    simulation = Simulation.from_primary_key((request.params_path['simulationId'], ))
-
-    # Make sure this Simulation exists
-
-    if not simulation.exists():
-        return Response(404, '{} not found.'.format(simulation))
-
-    # Make sure this user is authorized to edit this Simulation's Experiments
-
-    if not simulation.google_id_has_at_least(request.google_id, 'EDIT'):
-        return Response(403, 'Forbidden from adding an experiment to {}.'.format(simulation))
-
-    # Instantiate an Experiment
+    request.check_required_parameters(path={'simulationId': 'string'},
+                                      body={
+                                          'experiment': {
+                                              'topologyId': 'string',
+                                              'traceId': 'string',
+                                              'schedulerName': 'string',
+                                              'name': 'string',
+                                          }
+                                      })
 
-    experiment = Experiment.from_JSON(request.params_body['experiment'])
-    experiment.state = 'QUEUED'
-    experiment.last_simulated_tick = 0
+    simulation = Simulation.from_id(request.params_path['simulationId'])
 
-    # Try to insert this Experiment
+    simulation.check_exists()
+    simulation.check_user_access(request.google_id, True)
 
-    try:
-        experiment.insert()
+    experiment = Experiment(request.params_body['experiment'])
 
-    except exceptions.ForeignKeyError as e:
-        return Response(400, 'Foreign key constraint not met.' + e)
+    experiment.set_property('simulationId', request.params_path['simulationId'])
+    experiment.set_property('state', 'QUEUED')
+    experiment.set_property('lastSimulatedTick', 0)
 
-    # Return this Experiment
+    experiment.insert()
 
-    experiment.read()
+    simulation.obj['experimentIds'].append(experiment.get_id())
+    simulation.update()
 
-    return Response(200, 'Successfully added {}.'.format(experiment), experiment.to_JSON())
+    return Response(200, 'Successfully added Experiment.', experiment.obj)