Merge branch 'feature/mongodb-migration' of github.com:atlarge-research/opendc-dev into feature/mongodb-migration

3 files changed, 0 insertions, 113 deletions

diff --git a/web-server/opendc/api/v2/simulations/simulationId/experiments/__init__.py b/web-server/opendc/api/v2/simulations/simulationId/experiments/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/web-server/opendc/api/v2/simulations/simulationId/experiments/__init__.py
+++ /dev/null
diff --git a/web-server/opendc/api/v2/simulations/simulationId/experiments/endpoint.py b/web-server/opendc/api/v2/simulations/simulationId/experiments/endpoint.py
deleted file mode 100644
index 0d7c208d..00000000
--- a/web-server/opendc/api/v2/simulations/simulationId/experiments/endpoint.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from opendc.models.experiment import Experiment
-from opendc.models.simulation import Simulation
-from opendc.util.rest import Response
-
-
-def POST(request):
-    """Add a new Experiment for this Simulation."""
-
-    request.check_required_parameters(path={'simulationId': 'string'},
-                                      body={
-                                          'experiment': {
-                                              'topologyId': 'string',
-                                              'traceId': 'string',
-                                              'schedulerName': 'string',
-                                              'name': 'string',
-                                          }
-                                      })
-
-    simulation = Simulation.from_id(request.params_path['simulationId'])
-
-    simulation.check_exists()
-    simulation.check_user_access(request.google_id, True)
-
-    experiment = Experiment(request.params_body['experiment'])
-
-    experiment.set_property('simulationId', request.params_path['simulationId'])
-    experiment.set_property('state', 'QUEUED')
-    experiment.set_property('lastSimulatedTick', 0)
-
-    experiment.insert()
-
-    simulation.obj['experimentIds'].append(experiment.get_id())
-    simulation.update()
-
-    return Response(200, 'Successfully added Experiment.', experiment.obj)
diff --git a/web-server/opendc/api/v2/simulations/simulationId/experiments/test_endpoint.py b/web-server/opendc/api/v2/simulations/simulationId/experiments/test_endpoint.py
deleted file mode 100644
index 1fe09b10..00000000
--- a/web-server/opendc/api/v2/simulations/simulationId/experiments/test_endpoint.py
+++ /dev/null
@@ -1,78 +0,0 @@
-from opendc.util.database import DB
-
-
-def test_add_experiment_missing_parameter(client):
-    assert '400' in client.post('/api/v2/simulations/1/experiments').status
-
-
-def test_add_experiment_non_existing_simulation(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value=None)
-    assert '404' in client.post('/api/v2/simulations/1/experiments',
-                                json={
-                                    'experiment': {
-                                        'topologyId': '1',
-                                        'traceId': '1',
-                                        'schedulerName': 'default',
-                                        'name': 'test',
-                                    }
-                                }).status
-
-
-def test_add_experiment_not_authorized(client, mocker):
-    mocker.patch.object(DB,
-                        'fetch_one',
-                        return_value={
-                            '_id': '1',
-                            'simulationId': '1',
-                            'authorizations': [{
-                                'simulationId': '1',
-                                'authorizationLevel': 'VIEW'
-                            }]
-                        })
-    assert '403' in client.post('/api/v2/simulations/1/experiments',
-                                json={
-                                    'experiment': {
-                                        'topologyId': '1',
-                                        'traceId': '1',
-                                        'schedulerName': 'default',
-                                        'name': 'test',
-                                    }
-                                }).status
-
-
-def test_add_experiment(client, mocker):
-    mocker.patch.object(DB,
-                        'fetch_one',
-                        return_value={
-                            '_id': '1',
-                            'simulationId': '1',
-                            'experimentIds': ['1'],
-                            'authorizations': [{
-                                'simulationId': '1',
-                                'authorizationLevel': 'EDIT'
-                            }]
-                        })
-    mocker.patch.object(DB,
-                        'insert',
-                        return_value={
-                            '_id': '1',
-                            'topologyId': '1',
-                            'traceId': '1',
-                            'schedulerName': 'default',
-                            'name': 'test',
-                            'state': 'QUEUED',
-                            'lastSimulatedTick': 0,
-                        })
-    mocker.patch.object(DB, 'update', return_value=None)
-    res = client.post(
-        '/api/v2/simulations/1/experiments',
-        json={'experiment': {
-            'topologyId': '1',
-            'traceId': '1',
-            'schedulerName': 'default',
-            'name': 'test',
-        }})
-    assert 'topologyId' in res.json['content']
-    assert 'state' in res.json['content']
-    assert 'lastSimulatedTick' in res.json['content']
-    assert '200' in res.status