Merge changes with upstream

1 files changed, 36 insertions, 84 deletions

diff --git a/web-server/opendc/api/v2/experiments/experimentId/endpoint.py b/web-server/opendc/api/v2/experiments/experimentId/endpoint.py
index bc2b139e..103c24ac 100644
--- a/web-server/opendc/api/v2/experiments/experimentId/endpoint.py
+++ b/web-server/opendc/api/v2/experiments/experimentId/endpoint.py
@@ -1,113 +1,65 @@
-from opendc.models_old.experiment import Experiment
-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 Experiment."""
 
-    try:
-        request.check_required_parameters(path={'experimentId': 'int'})
+    request.check_required_parameters(path={'experimentId': 'string'})
 
-    except exceptions.ParameterError as e:
-        return Response(400, str(e))
+    experiment = Experiment.from_id(request.params_path['experimentId'])
 
-    # Instantiate an Experiment from the database
+    experiment.check_exists()
+    experiment.check_user_access(request.google_id, False)
 
-    experiment = Experiment.from_primary_key((request.params_path['experimentId'], ))
-
-    # Make sure this Experiment exists
-
-    if not experiment.exists():
-        return Response(404, '{} not found.'.format(experiment))
-
-    # Make sure this user is authorized to view this Experiment
-
-    if not experiment.google_id_has_at_least(request.google_id, 'VIEW'):
-        return Response(403, 'Forbidden from retrieving {}.'.format(experiment))
-
-    # Return this Experiment
-
-    experiment.read()
-
-    return Response(200, 'Successfully retrieved {}.'.format(experiment), experiment.to_JSON())
+    return Response(200, 'Successfully retrieved Experiment.', experiment.obj)
 
 
 def PUT(request):
-    """Update this Experiment's Path, Trace, Scheduler, and/or name."""
-
-    # Make sure required parameters are there
-
-    try:
-        request.check_required_parameters(
-            path={'experimentId': 'int'},
-            body={'experiment': {
-                'pathId': 'int',
-                'traceId': 'int',
-                'schedulerName': 'string',
-                'name': 'string'
-            }})
-
-    except exceptions.ParameterError as e:
-        return Response(400, str(e))
-
-    # Instantiate an Experiment from the database
+    """Update this Experiment."""
 
-    experiment = Experiment.from_primary_key((request.params_path['experimentId'], ))
+    request.check_required_parameters(path={'experimentId': 'string'},
+                                      body={
+                                          'experiment': {
+                                              'topologyId': 'string',
+                                              'traceId': 'string',
+                                              'schedulerName': 'string',
+                                              'name': 'string',
+                                          }
+                                      })
 
-    # Make sure this Experiment exists
+    experiment = Experiment.from_id(request.params_path['experimentId'])
 
-    if not experiment.exists():
-        return Response(404, '{} not found.'.format(experiment))
+    experiment.check_exists()
+    experiment.check_user_access(request.google_id, True)
 
-    # Make sure this user is authorized to edit this Experiment
+    experiment.set_property('topologyId', request.params_body['experiment']['topologyId'])
+    experiment.set_property('traceId', request.params_body['experiment']['traceId'])
+    experiment.set_property('schedulerName', request.params_body['experiment']['schedulerName'])
+    experiment.set_property('name', request.params_body['experiment']['name'])
 
-    if not experiment.google_id_has_at_least(request.google_id, 'EDIT'):
-        return Response(403, 'Forbidden from updating {}.'.format(experiment))
+    experiment.update()
 
-    # Update this Experiment
-
-    experiment.path_id = request.params_body['experiment']['pathId']
-    experiment.trace_id = request.params_body['experiment']['traceId']
-    experiment.scheduler_name = request.params_body['experiment']['schedulerName']
-    experiment.name = request.params_body['experiment']['name']
-
-    try:
-        experiment.update()
-
-    except exceptions.ForeignKeyError:
-        return Response(400, 'Foreign key error.')
-
-    # Return this Experiment
-
-    return Response(200, 'Successfully updated {}.'.format(experiment), experiment.to_JSON())
+    return Response(200, 'Successfully updated experiment', experiment.obj)
 
 
 def DELETE(request):
     """Delete this Experiment."""
 
-    # Make sure required parameters are there
-
-    try:
-        request.check_required_parameters(path={'experimentId': 'int'})
-
-    except exceptions.ParameterError as e:
-        return Response(400, str(e))
-
-    # Instantiate an Experiment and make sure it exists
-
-    experiment = Experiment.from_primary_key((request.params_path['experimentId'], ))
-
-    if not experiment.exists():
-        return Response(404, '{} not found.'.format(experiment))
+    request.check_required_parameters(path={'experimentId': 'string'})
 
-    # Make sure this user is authorized to delete this Experiment
+    experiment = Experiment.from_id(request.params_path['experimentId'])
 
-    if not experiment.google_id_has_at_least(request.google_id, 'EDIT'):
-        return Response(403, 'Forbidden from deleting {}.'.format(experiment))
+    experiment.check_exists()
+    experiment.check_user_access(request.google_id, True)
 
-    # Delete and return this Experiment
+    simulation = Simulation.from_id(experiment.obj['simulationId'])
+    simulation.check_exists()
+    if request.params_path['experimentId'] in simulation.obj['experimentIds']:
+        simulation.obj['experimentIds'].remove(request.params_path['experimentId'])
+    simulation.update()
 
     experiment.delete()
 
-    return Response(200, 'Successfully deleted {}.'.format(experiment), experiment.to_JSON())
+    return Response(200, 'Successfully deleted experiment.', experiment.obj)