diff options
Diffstat (limited to 'web-server/opendc/api/v2')
6 files changed, 31 insertions, 103 deletions
diff --git a/web-server/opendc/api/v2/schedulers/endpoint.py b/web-server/opendc/api/v2/schedulers/endpoint.py index 0bbc3322..a96fdd88 100644 --- a/web-server/opendc/api/v2/schedulers/endpoint.py +++ b/web-server/opendc/api/v2/schedulers/endpoint.py @@ -1,6 +1,5 @@ from opendc.util.rest import Response - SCHEDULERS = ['DEFAULT'] diff --git a/web-server/opendc/api/v2/simulations/simulationId/test_endpoint.py b/web-server/opendc/api/v2/simulations/simulationId/test_endpoint.py index a0586aab..7038f1b0 100644 --- a/web-server/opendc/api/v2/simulations/simulationId/test_endpoint.py +++ b/web-server/opendc/api/v2/simulations/simulationId/test_endpoint.py @@ -85,13 +85,33 @@ def test_delete_simulation_non_existing(client, mocker): 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, + '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': []}) + mocker.patch.object(DB, + 'fetch_one', + return_value={ + '_id': '1', + 'googleId': 'test', + 'authorizations': [{ + 'simulationId': '1', + 'authorizationLevel': 'OWN' + }], + 'topologyIds': [] + }) 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/topologies/topologyId/rooms/__init__.py b/web-server/opendc/api/v2/topologies/topologyId/rooms/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/web-server/opendc/api/v2/topologies/topologyId/rooms/__init__.py +++ /dev/null diff --git a/web-server/opendc/api/v2/topologies/topologyId/rooms/endpoint.py b/web-server/opendc/api/v2/topologies/topologyId/rooms/endpoint.py deleted file mode 100644 index 96ee7028..00000000 --- a/web-server/opendc/api/v2/topologies/topologyId/rooms/endpoint.py +++ /dev/null @@ -1,93 +0,0 @@ -from opendc.models_old.datacenter import Datacenter -from opendc.models_old.room import Room -from opendc.util import exceptions -from opendc.util.rest import Response - - -def GET(request): - """Get this Datacenter's Rooms.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(path={'datacenterId': 'int'}) - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Datacenter from the database - - datacenter = Datacenter.from_primary_key((request.params_path['datacenterId'], )) - - # Make sure this Datacenter exists - - if not datacenter.exists(): - return Response(404, '{} not found.'.format(datacenter)) - - # Make sure this user is authorized to view this Datacenter's Rooms - - if not datacenter.google_id_has_at_least(request.google_id, 'VIEW'): - return Response(403, 'Forbidden from viewing Rooms for {}.'.format(datacenter)) - - # Get and return the Rooms - - rooms = Room.query('datacenter_id', datacenter.id) - - return Response(200, 'Successfully retrieved Rooms for {}.'.format(datacenter), [x.to_JSON() for x in rooms]) - - -def POST(request): - """Add a Room.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(path={'datacenterId': 'int'}, - body={'room': { - 'id': 'int', - 'datacenterId': 'int', - 'roomType': 'string' - }}) - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Make sure the passed object's datacenter id matches the path datacenter id - - if request.params_path['datacenterId'] != request.params_body['room']['datacenterId']: - return Response(400, 'ID mismatch.') - - # Instantiate a Datacenter from the database - - datacenter = Datacenter.from_primary_key((request.params_path['datacenterId'], )) - - # Make sure this Datacenter exists - - if not datacenter.exists(): - return Response(404, '{} not found.'.format(datacenter)) - - # Make sure this user is authorized to edit this Datacenter's Rooms - - if not datacenter.google_id_has_at_least(request.google_id, 'EDIT'): - return Response(403, 'Forbidden from adding a Room to {}.'.format(datacenter)) - - # Add a name if not provided - - if 'name' not in request.params_body['room']: - room_count = len(Room.query('datacenter_id', datacenter.id)) - request.params_body['room']['name'] = 'Room {}'.format(room_count) - - # Instantiate a Room - - room = Room.from_JSON(request.params_body['room']) - - # Try to insert this Room - - try: - room.insert() - except: - return Response(400, 'Invalid `roomType` or existing `name`.') - - # Return this Room - - room.read() - - return Response(200, 'Successfully added {}.'.format(room), room.to_JSON()) diff --git a/web-server/opendc/api/v2/traces/endpoint.py b/web-server/opendc/api/v2/traces/endpoint.py index 58cc6153..720c6a1e 100644 --- a/web-server/opendc/api/v2/traces/endpoint.py +++ b/web-server/opendc/api/v2/traces/endpoint.py @@ -1,14 +1,10 @@ -from opendc.models_old.trace import Trace +from opendc.models.trace import Trace from opendc.util.rest import Response def GET(request): """Get all available Traces.""" - # Get the Traces + traces = Trace.get_all() - traces = Trace.query() - - # Return the Traces - - return Response(200, 'Successfully retrieved Traces', [x.to_JSON() for x in traces]) + return Response(200, 'Successfully retrieved Traces', traces.obj) diff --git a/web-server/opendc/api/v2/traces/test_endpoint.py b/web-server/opendc/api/v2/traces/test_endpoint.py new file mode 100644 index 00000000..9f806085 --- /dev/null +++ b/web-server/opendc/api/v2/traces/test_endpoint.py @@ -0,0 +1,6 @@ +from opendc.util.database import DB + + +def test_get_traces(client, mocker): + mocker.patch.object(DB, 'fetch_all', return_value=[]) + assert '200' in client.get('/api/v2/traces').status |