From 8ab2604d6ea2aa1efb9582f919d59dcdd0b8ea78 Mon Sep 17 00:00:00 2001 From: jc0b Date: Fri, 26 Jun 2020 11:50:05 +0200 Subject: Moved topologies POST to simulations --- opendc/api/v2/paths.json | 2 +- .../simulationId/topologies/__init__.py | 0 .../simulationId/topologies/endpoint.py | 33 ++++++++++++++++++++++ .../simulationId/topologies/test_endpoint.py | 23 +++++++++++++++ opendc/api/v2/topologies/endpoint.py | 33 ---------------------- opendc/api/v2/topologies/test_endpoint.py | 23 --------------- 6 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 opendc/api/v2/simulations/simulationId/topologies/__init__.py create mode 100644 opendc/api/v2/simulations/simulationId/topologies/endpoint.py create mode 100644 opendc/api/v2/simulations/simulationId/topologies/test_endpoint.py delete mode 100644 opendc/api/v2/topologies/endpoint.py delete mode 100644 opendc/api/v2/topologies/test_endpoint.py (limited to 'opendc/api') diff --git a/opendc/api/v2/paths.json b/opendc/api/v2/paths.json index 3348c7cd..ce054a8c 100644 --- a/opendc/api/v2/paths.json +++ b/opendc/api/v2/paths.json @@ -4,12 +4,12 @@ "/simulations", "/simulations/{simulationId}", "/simulations/{simulationId}/authorizations", + "/simulations/{simulationId}/topologies", "/experiments/{experimentId}/last-simulated-tick", "/experiments/{experimentId}/machine-states", "/experiments/{experimentId}/rack-states", "/experiments/{experimentId}/room-states", "/experiments/{experimentId}/task-states", - "/topologies", "/topologies/{topologyId}", "/simulations/{simulationId}/experiments", "/experiments/{experimentId}", diff --git a/opendc/api/v2/simulations/simulationId/topologies/__init__.py b/opendc/api/v2/simulations/simulationId/topologies/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/opendc/api/v2/simulations/simulationId/topologies/endpoint.py b/opendc/api/v2/simulations/simulationId/topologies/endpoint.py new file mode 100644 index 00000000..4104c4dd --- /dev/null +++ b/opendc/api/v2/simulations/simulationId/topologies/endpoint.py @@ -0,0 +1,33 @@ +from datetime import datetime + +from opendc.models.topology import Topology +from opendc.util import exceptions +from opendc.util.rest import Response +from opendc.models.user import User +from opendc.util.database import Database + + +def POST(request): + """Add a new Topology and return it""" + + # Make sure required parameters are there + + try: + request.check_required_parameters(body={'topology': {'name': 'string'}}) + except exceptions.ParameterError as e: + return Response(400, str(e)) + + # Instantiate a Topology object from our request, and add some metadata + + topology = Topology({'name': request.params_body['topology']['name']}) + topology.set_property('datetimeCreated', Database.datetime_to_string(datetime.now())) + topology.set_property('datetimeLastEdited', Database.datetime_to_string(datetime.now())) + topology.insert() + + # Instantiate the user from the request, and add this topology object to their authorizations + + user = User.from_google_id(request.google_id) + user.obj['authorizations'].append({'topologyId': topology.obj['_id'], 'authorizationLevel': 'OWN'}) + user.update() + + return Response(200, 'Successfully inserted topology.', topology.obj) diff --git a/opendc/api/v2/simulations/simulationId/topologies/test_endpoint.py b/opendc/api/v2/simulations/simulationId/topologies/test_endpoint.py new file mode 100644 index 00000000..67973268 --- /dev/null +++ b/opendc/api/v2/simulations/simulationId/topologies/test_endpoint.py @@ -0,0 +1,23 @@ +from opendc.util.database import DB + + +def test_add_simulation_missing_parameter(client): + assert '400' in client.post('/api/v2/simulations/1/topologies/').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', + 'datetimeEdit': '000', + 'topologyIds': [] + }) + mocker.patch.object(DB, 'update', return_value={}) + res = client.post('/api/v2/simulations/1/topologies/', json={'simulation': {'name': 'test simulation'}}) + assert 'datetimeCreated' in res.json['content'] + assert 'datetimeEdit' in res.json['content'] + assert 'topologyIds' in res.json['content'] + assert '200' in res.status diff --git a/opendc/api/v2/topologies/endpoint.py b/opendc/api/v2/topologies/endpoint.py deleted file mode 100644 index be4c5382..00000000 --- a/opendc/api/v2/topologies/endpoint.py +++ /dev/null @@ -1,33 +0,0 @@ -from datetime import datetime - -from opendc.models.topology import Topology -from opendc.util import exceptions -from opendc.util.rest import Response -from opendc.models.user import User -from opendc.util.database import Database - - -def POST(request): - """Add a new Topology and return it""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(body={'topology': {'name': 'string'}}) - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Topology object from our request, and add some metadata - - topology = Topology({'topology': request.params_body['topology']}) - topology.set_property('datetimeCreated', Database.datetime_to_string(datetime.now())) - topology.set_property('datetimeLastEdited', Database.datetime_to_string(datetime.now())) - topology.insert() - - # Instantiate the user from the request, and add this topology object to their authorizations - - user = User.from_google_id(request.google_id) - user.obj['authorizations'].append({'topologyId': topology.obj['_id'], 'authorizationLevel': 'OWN'}) - user.update() - - return Response(200, 'Successfully inserted topology.', topology.obj) diff --git a/opendc/api/v2/topologies/test_endpoint.py b/opendc/api/v2/topologies/test_endpoint.py deleted file mode 100644 index 283aac67..00000000 --- a/opendc/api/v2/topologies/test_endpoint.py +++ /dev/null @@ -1,23 +0,0 @@ -from opendc.util.database import DB - -''' -POST /topologies -''' - -def test_add_topology_missing_parameter(client): - assert '400' in client.post('/api/v2/topologies').status - -def test_add_topology(client, mocker): - mocker.patch.object(DB, 'fetch_one', return_value={'_id': '1', 'authorizations': []}) - mocker.patch.object(DB, - 'insert', - return_value={ - '_id': '1', - 'datetimeCreated': '000', - 'datetimeEdit': '000' - }) - mocker.patch.object(DB, 'update', return_value={}) - res = client.post('/api/v2/topologies', json={'topology': {'name': 'test topology'}}) - assert 'datetimeCreated' in res.json['content'] - assert 'datetimeEdit' in res.json['content'] - assert '200' in res.status -- cgit v1.2.3