From db460a0e734f9f1cf60088f63a3c05eaed255074 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Fri, 11 Aug 2017 15:56:27 +0300 Subject: Add job routes to API codebase --- opendc/api/v1/traces/traceId/jobs/__init__.py | 0 opendc/api/v1/traces/traceId/jobs/endpoint.py | 36 +++++++++++++++++++++ .../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 ++++++++++++++++++++++ opendc/api/v1/traces/traceId/tasks/__init__.py | 0 opendc/api/v1/traces/traceId/tasks/endpoint.py | 36 --------------------- 8 files changed, 107 insertions(+), 36 deletions(-) create mode 100644 opendc/api/v1/traces/traceId/jobs/__init__.py create mode 100644 opendc/api/v1/traces/traceId/jobs/endpoint.py create mode 100644 opendc/api/v1/traces/traceId/jobs/jobId/__init__.py create mode 100644 opendc/api/v1/traces/traceId/jobs/jobId/endpoint.py create mode 100644 opendc/api/v1/traces/traceId/jobs/jobId/tasks/__init__.py create mode 100644 opendc/api/v1/traces/traceId/jobs/jobId/tasks/endpoint.py delete mode 100644 opendc/api/v1/traces/traceId/tasks/__init__.py delete mode 100644 opendc/api/v1/traces/traceId/tasks/endpoint.py (limited to 'opendc') diff --git a/opendc/api/v1/traces/traceId/jobs/__init__.py b/opendc/api/v1/traces/traceId/jobs/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/opendc/api/v1/traces/traceId/jobs/endpoint.py b/opendc/api/v1/traces/traceId/jobs/endpoint.py new file mode 100644 index 00000000..2f271c9e --- /dev/null +++ b/opendc/api/v1/traces/traceId/jobs/endpoint.py @@ -0,0 +1,36 @@ +from opendc.models.trace import Trace +from opendc.models.job import Job +from opendc.util import database, exceptions +from opendc.util.rest import Response + +def GET(request): + """Get this Trace's Jobs.""" + + # Make sure required parameters are there + + try: + request.check_required_parameters( + path = { + 'traceId': 'int' + } + ) + + except exceptions.ParameterError as e: + return Response(400, e.message) + + # Instantiate a Trace and make sure it exists + + trace = Trace.from_primary_key((request.params_path['traceId'],)) + + if not trace.exists(): + return Response(404, '{} not found.'.format(trace)) + + # Get and return the Jobs + + jobs = Job.query('trace_id', request.params_path['traceId']) + + return Response( + 200, + 'Successfully retrieved Jobs for {}.'.format(trace), + [x.to_JSON() for x in jobs] + ) diff --git a/opendc/api/v1/traces/traceId/jobs/jobId/__init__.py b/opendc/api/v1/traces/traceId/jobs/jobId/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/opendc/api/v1/traces/traceId/jobs/jobId/endpoint.py b/opendc/api/v1/traces/traceId/jobs/jobId/endpoint.py new file mode 100644 index 00000000..8bf26ab5 --- /dev/null +++ b/opendc/api/v1/traces/traceId/jobs/jobId/endpoint.py @@ -0,0 +1,34 @@ +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 new file mode 100644 index 00000000..e69de29b diff --git a/opendc/api/v1/traces/traceId/jobs/jobId/tasks/endpoint.py b/opendc/api/v1/traces/traceId/jobs/jobId/tasks/endpoint.py new file mode 100644 index 00000000..ecd38758 --- /dev/null +++ b/opendc/api/v1/traces/traceId/jobs/jobId/tasks/endpoint.py @@ -0,0 +1,37 @@ +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] + ) diff --git a/opendc/api/v1/traces/traceId/tasks/__init__.py b/opendc/api/v1/traces/traceId/tasks/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/opendc/api/v1/traces/traceId/tasks/endpoint.py b/opendc/api/v1/traces/traceId/tasks/endpoint.py deleted file mode 100644 index 6acf790c..00000000 --- a/opendc/api/v1/traces/traceId/tasks/endpoint.py +++ /dev/null @@ -1,36 +0,0 @@ -from opendc.models.trace import Trace -from opendc.models.task import Task -from opendc.util import database, exceptions -from opendc.util.rest import Response - -def GET(request): - """Get this Trace's Tasks.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters( - path = { - 'traceId': 'int' - } - ) - - except exceptions.ParameterError as e: - return Response(400, e.message) - - # Instantiate a Trace and make sure it exists - - trace = Trace.from_primary_key((request.params_path['traceId'],)) - - if not trace.exists(): - return Response(404, '{} not found.'.format(trace)) - - # Get and return the Tasks - - tasks = Task.query('trace_id', request.params_path['traceId']) - - return Response( - 200, - 'Successfully retrieved Tasks for {}.'.format(trace), - [x.to_JSON() for x in tasks] - ) -- cgit v1.2.3