Rename simulations to projects and remove experiment view

15 files changed, 0 insertions, 491 deletions

diff --git a/web-server/opendc/api/v2/simulations/__init__.py b/web-server/opendc/api/v2/simulations/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/web-server/opendc/api/v2/simulations/__init__.py
+++ /dev/null
diff --git a/web-server/opendc/api/v2/simulations/endpoint.py b/web-server/opendc/api/v2/simulations/endpoint.py
deleted file mode 100644
index 993e317a..00000000
--- a/web-server/opendc/api/v2/simulations/endpoint.py
+++ /dev/null
@@ -1,32 +0,0 @@
-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.database import Database
-from opendc.util.rest import Response
-
-
-def POST(request):
-    """Create a new simulation, and return that new simulation."""
-
-    request.check_required_parameters(body={'simulation': {'name': 'string'}})
-
-    topology = Topology({'name': 'Default topology', 'rooms': []})
-    topology.insert()
-
-    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.get_id()])
-    simulation.set_property('experimentIds', [])
-    simulation.insert()
-
-    topology.set_property('simulationId', simulation.get_id())
-    topology.update()
-
-    user = User.from_google_id(request.google_id)
-    user.obj['authorizations'].append({'simulationId': simulation.get_id(), 'authorizationLevel': 'OWN'})
-    user.update()
-
-    return Response(200, 'Successfully created simulation.', simulation.obj)
diff --git a/web-server/opendc/api/v2/simulations/simulationId/__init__.py b/web-server/opendc/api/v2/simulations/simulationId/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/web-server/opendc/api/v2/simulations/simulationId/__init__.py
+++ /dev/null
diff --git a/web-server/opendc/api/v2/simulations/simulationId/authorizations/__init__.py b/web-server/opendc/api/v2/simulations/simulationId/authorizations/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/web-server/opendc/api/v2/simulations/simulationId/authorizations/__init__.py
+++ /dev/null
diff --git a/web-server/opendc/api/v2/simulations/simulationId/authorizations/endpoint.py b/web-server/opendc/api/v2/simulations/simulationId/authorizations/endpoint.py
deleted file mode 100644
index 49d0fc20..00000000
--- a/web-server/opendc/api/v2/simulations/simulationId/authorizations/endpoint.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from opendc.models.simulation import Simulation
-from opendc.util.rest import Response
-
-
-def GET(request):
-    """Find all authorizations for a Simulation."""
-
-    request.check_required_parameters(path={'simulationId': 'string'})
-
-    simulation = Simulation.from_id(request.params_path['simulationId'])
-
-    simulation.check_exists()
-    simulation.check_user_access(request.google_id, False)
-
-    authorizations = simulation.get_all_authorizations()
-
-    return Response(200, 'Successfully retrieved simulation authorizations', authorizations)
diff --git a/web-server/opendc/api/v2/simulations/simulationId/authorizations/test_endpoint.py b/web-server/opendc/api/v2/simulations/simulationId/authorizations/test_endpoint.py
deleted file mode 100644
index 4369d807..00000000
--- a/web-server/opendc/api/v2/simulations/simulationId/authorizations/test_endpoint.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from opendc.util.database import DB
-
-
-def test_get_authorizations_non_existing(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value=None)
-    mocker.patch.object(DB, 'fetch_all', return_value=None)
-    assert '404' in client.get('/api/v2/simulations/1/authorizations').status
-
-
-def test_get_authorizations_not_authorized(client, mocker):
-    mocker.patch.object(DB,
-                        'fetch_one',
-                        return_value={
-                            '_id': '1',
-                            'name': 'test trace',
-                            'authorizations': [{
-                                'simulationId': '2',
-                                'authorizationLevel': 'OWN'
-                            }]
-                        })
-    mocker.patch.object(DB, 'fetch_all', return_value=[])
-    res = client.get('/api/v2/simulations/1/authorizations')
-    assert '403' in res.status
-
-
-def test_get_authorizations(client, mocker):
-    mocker.patch.object(DB,
-                        'fetch_one',
-                        return_value={
-                            '_id': '1',
-                            'name': 'test trace',
-                            'authorizations': [{
-                                'simulationId': '1',
-                                'authorizationLevel': 'OWN'
-                            }]
-                        })
-    mocker.patch.object(DB, 'fetch_all', return_value=[])
-    res = client.get('/api/v2/simulations/1/authorizations')
-    assert len(res.json['content']) == 0
-    assert '200' in res.status
diff --git a/web-server/opendc/api/v2/simulations/simulationId/endpoint.py b/web-server/opendc/api/v2/simulations/simulationId/endpoint.py
deleted file mode 100644
index 0cee3e9c..00000000
--- a/web-server/opendc/api/v2/simulations/simulationId/endpoint.py
+++ /dev/null
@@ -1,66 +0,0 @@
-from datetime import datetime
-
-from opendc.models.experiment import Experiment
-from opendc.models.simulation import Simulation
-from opendc.models.topology import Topology
-from opendc.models.user import User
-from opendc.util.database import Database
-from opendc.util.rest import Response
-
-
-def GET(request):
-    """Get this Simulation."""
-
-    request.check_required_parameters(path={'simulationId': 'string'})
-
-    simulation = Simulation.from_id(request.params_path['simulationId'])
-
-    simulation.check_exists()
-    simulation.check_user_access(request.google_id, False)
-
-    return Response(200, 'Successfully retrieved simulation', simulation.obj)
-
-
-def PUT(request):
-    """Update a simulation's name."""
-
-    request.check_required_parameters(body={'simulation': {'name': 'name'}}, path={'simulationId': 'string'})
-
-    simulation = Simulation.from_id(request.params_path['simulationId'])
-
-    simulation.check_exists()
-    simulation.check_user_access(request.google_id, True)
-
-    simulation.set_property('name', request.params_body['simulation']['name'])
-    simulation.set_property('datetime_last_edited', Database.datetime_to_string(datetime.now()))
-    simulation.update()
-
-    return Response(200, 'Successfully updated simulation.', simulation.obj)
-
-
-def DELETE(request):
-    """Delete this Simulation."""
-
-    request.check_required_parameters(path={'simulationId': 'string'})
-
-    simulation = Simulation.from_id(request.params_path['simulationId'])
-
-    simulation.check_exists()
-    simulation.check_user_access(request.google_id, True)
-
-    for topology_id in simulation.obj['topologyIds']:
-        topology = Topology.from_id(topology_id)
-        topology.delete()
-
-    for experiment_id in simulation.obj['experimentIds']:
-        experiment = Experiment.from_id(experiment_id)
-        experiment.delete()
-
-    user = User.from_google_id(request.google_id)
-    user.obj['authorizations'] = list(
-        filter(lambda x: str(x['simulationId']) != request.params_path['simulationId'], user.obj['authorizations']))
-    user.update()
-
-    old_object = simulation.delete()
-
-    return Response(200, 'Successfully deleted simulation.', old_object)
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
diff --git a/web-server/opendc/api/v2/simulations/simulationId/test_endpoint.py b/web-server/opendc/api/v2/simulations/simulationId/test_endpoint.py
deleted file mode 100644
index 3ab0161d..00000000
--- a/web-server/opendc/api/v2/simulations/simulationId/test_endpoint.py
+++ /dev/null
@@ -1,119 +0,0 @@
-from opendc.util.database import DB
-
-
-def test_get_simulation_non_existing(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value=None)
-    assert '404' in client.get('/api/v2/simulations/1').status
-
-
-def test_get_simulation_no_authorizations(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value={'authorizations': []})
-    res = client.get('/api/v2/simulations/1')
-    assert '403' in res.status
-
-
-def test_get_simulation_not_authorized(client, mocker):
-    mocker.patch.object(DB,
-                        'fetch_one',
-                        return_value={
-                            '_id': '1',
-                            'authorizations': [{
-                                'simulationId': '2',
-                                'authorizationLevel': 'OWN'
-                            }]
-                        })
-    res = client.get('/api/v2/simulations/1')
-    assert '403' in res.status
-
-
-def test_get_simulation(client, mocker):
-    mocker.patch.object(DB,
-                        'fetch_one',
-                        return_value={
-                            '_id': '1',
-                            'authorizations': [{
-                                'simulationId': '1',
-                                'authorizationLevel': 'EDIT'
-                            }]
-                        })
-    res = client.get('/api/v2/simulations/1')
-    assert '200' in res.status
-
-
-def test_update_simulation_missing_parameter(client):
-    assert '400' in client.put('/api/v2/simulations/1').status
-
-
-def test_update_simulation_non_existing(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value=None)
-    assert '404' in client.put('/api/v2/simulations/1', json={'simulation': {'name': 'S'}}).status
-
-
-def test_update_simulation_not_authorized(client, mocker):
-    mocker.patch.object(DB,
-                        'fetch_one',
-                        return_value={
-                            '_id': '1',
-                            'authorizations': [{
-                                'simulationId': '1',
-                                'authorizationLevel': 'VIEW'
-                            }]
-                        })
-    mocker.patch.object(DB, 'update', return_value={})
-    assert '403' in client.put('/api/v2/simulations/1', json={'simulation': {'name': 'S'}}).status
-
-
-def test_update_simulation(client, mocker):
-    mocker.patch.object(DB,
-                        'fetch_one',
-                        return_value={
-                            '_id': '1',
-                            'authorizations': [{
-                                'simulationId': '1',
-                                'authorizationLevel': 'OWN'
-                            }]
-                        })
-    mocker.patch.object(DB, 'update', return_value={})
-
-    res = client.put('/api/v2/simulations/1', json={'simulation': {'name': 'S'}})
-    assert '200' in res.status
-
-
-def test_delete_simulation_non_existing(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value=None)
-    assert '404' in client.delete('/api/v2/simulations/1').status
-
-
-def test_delete_simulation_different_user(client, mocker):
-    mocker.patch.object(DB,
-                        'fetch_one',
-                        return_value={
-                            '_id': '1',
-                            'googleId': 'other_test',
-                            'authorizations': [{
-                                'simulationId': '1',
-                                'authorizationLevel': 'VIEW'
-                            }],
-                            'topologyIds': []
-                        })
-    mocker.patch.object(DB, 'delete_one', return_value=None)
-    assert '403' in client.delete('/api/v2/simulations/1').status
-
-
-def test_delete_simulation(client, mocker):
-    mocker.patch.object(DB,
-                        'fetch_one',
-                        return_value={
-                            '_id': '1',
-                            'googleId': 'test',
-                            'authorizations': [{
-                                'simulationId': '1',
-                                'authorizationLevel': 'OWN'
-                            }],
-                            'topologyIds': [],
-                            'experimentIds': [],
-                        })
-    mocker.patch.object(DB, 'update', return_value=None)
-    mocker.patch.object(DB, 'delete_one', return_value={'googleId': 'test'})
-    res = client.delete('/api/v2/simulations/1')
-    assert '200' in res.status
diff --git a/web-server/opendc/api/v2/simulations/simulationId/topologies/__init__.py b/web-server/opendc/api/v2/simulations/simulationId/topologies/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/web-server/opendc/api/v2/simulations/simulationId/topologies/__init__.py
+++ /dev/null
diff --git a/web-server/opendc/api/v2/simulations/simulationId/topologies/endpoint.py b/web-server/opendc/api/v2/simulations/simulationId/topologies/endpoint.py
deleted file mode 100644
index 7c07e63b..00000000
--- a/web-server/opendc/api/v2/simulations/simulationId/topologies/endpoint.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from datetime import datetime
-
-from opendc.models.simulation import Simulation
-from opendc.models.topology import Topology
-from opendc.util.rest import Response
-from opendc.util.database import Database
-
-
-def POST(request):
-    """Add a new Topology to the specified simulation and return it"""
-
-    request.check_required_parameters(path={'simulationId': 'string'}, body={'topology': {'name': 'string'}})
-
-    simulation = Simulation.from_id(request.params_path['simulationId'])
-
-    simulation.check_exists()
-    simulation.check_user_access(request.google_id, True)
-
-    topology = Topology({
-        'simulationId': request.params_path['simulationId'],
-        'name': request.params_body['topology']['name'],
-        'rooms': request.params_body['topology']['rooms'],
-    })
-
-    topology.insert()
-
-    simulation.obj['topologyIds'].append(topology.get_id())
-    simulation.set_property('datetimeLastEdited', Database.datetime_to_string(datetime.now()))
-    simulation.update()
-
-    return Response(200, 'Successfully inserted topology.', topology.obj)
diff --git a/web-server/opendc/api/v2/simulations/simulationId/topologies/test_endpoint.py b/web-server/opendc/api/v2/simulations/simulationId/topologies/test_endpoint.py
deleted file mode 100644
index 1314be13..00000000
--- a/web-server/opendc/api/v2/simulations/simulationId/topologies/test_endpoint.py
+++ /dev/null
@@ -1,50 +0,0 @@
-from opendc.util.database import DB
-
-
-def test_add_topology_missing_parameter(client):
-    assert '400' in client.post('/api/v2/simulations/1/topologies').status
-
-
-def test_add_topology(client, mocker):
-    mocker.patch.object(DB,
-                        'fetch_one',
-                        return_value={
-                            '_id': '1',
-                            'authorizations': [{
-                                'simulationId': '1',
-                                'authorizationLevel': 'OWN'
-                            }],
-                            'topologyIds': []
-                        })
-    mocker.patch.object(DB,
-                        'insert',
-                        return_value={
-                            '_id': '1',
-                            'datetimeCreated': '000',
-                            'datetimeLastEdited': '000',
-                            'topologyIds': []
-                        })
-    mocker.patch.object(DB, 'update', return_value={})
-    res = client.post('/api/v2/simulations/1/topologies', json={'topology': {'name': 'test simulation', 'rooms': []}})
-    assert 'rooms' in res.json['content']
-    assert '200' in res.status
-
-
-def test_add_topology_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/topologies',
-                                json={
-                                    'topology': {
-                                        'name': 'test_topology',
-                                        'rooms': {}
-                                    }
-                                }).status
diff --git a/web-server/opendc/api/v2/simulations/test_endpoint.py b/web-server/opendc/api/v2/simulations/test_endpoint.py
deleted file mode 100644
index ae1b5a7c..00000000
--- a/web-server/opendc/api/v2/simulations/test_endpoint.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from opendc.util.database import DB
-
-
-def test_add_simulation_missing_parameter(client):
-    assert '400' in client.post('/api/v2/simulations').status
-
-
-def test_add_simulation(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value={'_id': '1', 'authorizations': []})
-    mocker.patch.object(DB,
-                        'insert',
-                        return_value={
-                            '_id': '1',
-                            'datetimeCreated': '000',
-                            'datetimeLastEdited': '000',
-                            'topologyIds': []
-                        })
-    mocker.patch.object(DB, 'update', return_value={})
-    res = client.post('/api/v2/simulations', json={'simulation': {'name': 'test simulation'}})
-    assert 'datetimeCreated' in res.json['content']
-    assert 'datetimeLastEdited' in res.json['content']
-    assert 'topologyIds' in res.json['content']
-    assert '200' in res.status