From 02997b2522b9c66072b16f1425c02e81e0085e3c Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Tue, 14 Jul 2020 21:10:56 +0200 Subject: Rename web-server to API This change renames the web-server component to API in order to be more descriptive of its role. The OpenDC API bridges between the frontend on one side and the database and simulator on the other side. --- web-server/opendc/api/v2/traces/__init__.py | 0 web-server/opendc/api/v2/traces/endpoint.py | 10 ---------- web-server/opendc/api/v2/traces/test_endpoint.py | 6 ------ web-server/opendc/api/v2/traces/traceId/__init__.py | 0 web-server/opendc/api/v2/traces/traceId/endpoint.py | 14 -------------- web-server/opendc/api/v2/traces/traceId/test_endpoint.py | 13 ------------- 6 files changed, 43 deletions(-) delete mode 100644 web-server/opendc/api/v2/traces/__init__.py delete mode 100644 web-server/opendc/api/v2/traces/endpoint.py delete mode 100644 web-server/opendc/api/v2/traces/test_endpoint.py delete mode 100644 web-server/opendc/api/v2/traces/traceId/__init__.py delete mode 100644 web-server/opendc/api/v2/traces/traceId/endpoint.py delete mode 100644 web-server/opendc/api/v2/traces/traceId/test_endpoint.py (limited to 'web-server/opendc/api/v2/traces') diff --git a/web-server/opendc/api/v2/traces/__init__.py b/web-server/opendc/api/v2/traces/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/web-server/opendc/api/v2/traces/endpoint.py b/web-server/opendc/api/v2/traces/endpoint.py deleted file mode 100644 index ee699e02..00000000 --- a/web-server/opendc/api/v2/traces/endpoint.py +++ /dev/null @@ -1,10 +0,0 @@ -from opendc.models.trace import Trace -from opendc.util.rest import Response - - -def GET(_): - """Get all available Traces.""" - - traces = Trace.get_all() - - 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 deleted file mode 100644 index 9f806085..00000000 --- a/web-server/opendc/api/v2/traces/test_endpoint.py +++ /dev/null @@ -1,6 +0,0 @@ -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 diff --git a/web-server/opendc/api/v2/traces/traceId/__init__.py b/web-server/opendc/api/v2/traces/traceId/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/web-server/opendc/api/v2/traces/traceId/endpoint.py b/web-server/opendc/api/v2/traces/traceId/endpoint.py deleted file mode 100644 index 670f88d1..00000000 --- a/web-server/opendc/api/v2/traces/traceId/endpoint.py +++ /dev/null @@ -1,14 +0,0 @@ -from opendc.models.trace import Trace -from opendc.util.rest import Response - - -def GET(request): - """Get this Trace.""" - - request.check_required_parameters(path={'traceId': 'string'}) - - trace = Trace.from_id(request.params_path['traceId']) - - trace.check_exists() - - return Response(200, 'Successfully retrieved trace.', trace.obj) diff --git a/web-server/opendc/api/v2/traces/traceId/test_endpoint.py b/web-server/opendc/api/v2/traces/traceId/test_endpoint.py deleted file mode 100644 index 56792ca9..00000000 --- a/web-server/opendc/api/v2/traces/traceId/test_endpoint.py +++ /dev/null @@ -1,13 +0,0 @@ -from opendc.util.database import DB - - -def test_get_trace_non_existing(client, mocker): - mocker.patch.object(DB, 'fetch_one', return_value=None) - assert '404' in client.get('/api/v2/traces/1').status - - -def test_get_trace(client, mocker): - mocker.patch.object(DB, 'fetch_one', return_value={'name': 'test trace'}) - res = client.get('/api/v2/traces/1') - assert 'name' in res.json['content'] - assert '200' in res.status -- cgit v1.2.3