From f589682b0840aab0624122052eb863cf8dc3a0b9 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Sun, 13 Aug 2017 23:12:16 +0300 Subject: Convert API codebase to flat model --- opendc/api/v1/traces/endpoint.py | 2 +- .../api/v1/traces/traceId/jobs/jobId/__init__.py | 0 .../api/v1/traces/traceId/jobs/jobId/endpoint.py | 34 -------------------- .../v1/traces/traceId/jobs/jobId/tasks/__init__.py | 0 .../v1/traces/traceId/jobs/jobId/tasks/endpoint.py | 37 ---------------------- 5 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 opendc/api/v1/traces/traceId/jobs/jobId/__init__.py delete mode 100644 opendc/api/v1/traces/traceId/jobs/jobId/endpoint.py delete mode 100644 opendc/api/v1/traces/traceId/jobs/jobId/tasks/__init__.py delete mode 100644 opendc/api/v1/traces/traceId/jobs/jobId/tasks/endpoint.py (limited to 'opendc/api/v1/traces') diff --git a/opendc/api/v1/traces/endpoint.py b/opendc/api/v1/traces/endpoint.py index d383b335..05d6fd48 100644 --- a/opendc/api/v1/traces/endpoint.py +++ b/opendc/api/v1/traces/endpoint.py @@ -2,7 +2,7 @@ from opendc.models.trace import Trace from opendc.util.rest import Response def GET(request): - """Get all avaialble Traces.""" + """Get all available Traces.""" # Get the Traces diff --git a/opendc/api/v1/traces/traceId/jobs/jobId/__init__.py b/opendc/api/v1/traces/traceId/jobs/jobId/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/opendc/api/v1/traces/traceId/jobs/jobId/endpoint.py b/opendc/api/v1/traces/traceId/jobs/jobId/endpoint.py deleted file mode 100644 index 8bf26ab5..00000000 --- a/opendc/api/v1/traces/traceId/jobs/jobId/endpoint.py +++ /dev/null @@ -1,34 +0,0 @@ -from opendc.models.job import Job -from opendc.util import exceptions -from opendc.util.rest import Response - -def GET(request): - """Get this Job.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters( - path = { - 'traceId': 'int', - 'jobId': 'int' - } - ) - - except exceptions.ParameterError as e: - return Response(400, e.message) - - # Instantiate a Trace and make sure it exists - - job = Job.from_primary_key((request.params_path['jobId'],)) - - if not job.exists(): - return Response(404, '{} not found.'.format(job)) - - # Return this Job - - return Response( - 200, - 'Successfully retrieved {}.'.format(job), - job.to_JSON() - ) diff --git a/opendc/api/v1/traces/traceId/jobs/jobId/tasks/__init__.py b/opendc/api/v1/traces/traceId/jobs/jobId/tasks/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/opendc/api/v1/traces/traceId/jobs/jobId/tasks/endpoint.py b/opendc/api/v1/traces/traceId/jobs/jobId/tasks/endpoint.py deleted file mode 100644 index ecd38758..00000000 --- a/opendc/api/v1/traces/traceId/jobs/jobId/tasks/endpoint.py +++ /dev/null @@ -1,37 +0,0 @@ -from opendc.models.job import Job -from opendc.models.task import Task -from opendc.util import database, exceptions -from opendc.util.rest import Response - -def GET(request): - """Get this Job's Tasks.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters( - path = { - 'traceId': 'int', - 'jobId': 'int' - } - ) - - except exceptions.ParameterError as e: - return Response(400, e.message) - - # Instantiate a Job and make sure it exists - - job = Job.from_primary_key((request.params_path['jobId'],)) - - if not job.exists(): - return Response(404, '{} not found.'.format(job)) - - # Get and return the Tasks - - tasks = Task.query('job_id', request.params_path['jobId']) - - return Response( - 200, - 'Successfully retrieved Tasks for {}.'.format(job), - [x.to_JSON() for x in tasks] - ) -- cgit v1.2.3