Commit 8aa59fbf authored by Daniele Venzano's avatar Daniele Venzano

Fix lint errors

parent 3c64fb4d
...@@ -126,7 +126,7 @@ class ExecutionCollectionAPI(RequestHandler): ...@@ -126,7 +126,7 @@ class ExecutionCollectionAPI(RequestHandler):
def get(self): def get(self):
""" """
Returns a list of all active executions. Returns a list of all active executions.
The list can be filtered by passing a non-empty JSON dictionary. Any combination of the following filters is supported: The list can be filtered by passing a non-empty JSON dictionary. Any combination of the following filters is supported:
* status: one of submitted, scheduled, starting, error, running, cleaning up, terminated * status: one of submitted, scheduled, starting, error, running, cleaning up, terminated
...@@ -139,7 +139,7 @@ class ExecutionCollectionAPI(RequestHandler): ...@@ -139,7 +139,7 @@ class ExecutionCollectionAPI(RequestHandler):
* later_than_submit: all execution that where submitted later than this timestamp * later_than_submit: all execution that where submitted later than this timestamp
* later_than_start: all execution that started later than this timestamp * later_than_start: all execution that started later than this timestamp
* later_than_end: all execution that started later than this timestamp * later_than_end: all execution that started later than this timestamp
All timestamps should be passed as number of seconds since the epoch (UTC timezone). All timestamps should be passed as number of seconds since the epoch (UTC timezone).
example: curl -u 'username:password' -X GET -H "Content-Type: application/json" -d '{"status":"terminated"}' http://bf5:8080/api/0.6/execution example: curl -u 'username:password' -X GET -H "Content-Type: application/json" -d '{"status":"terminated"}' http://bf5:8080/api/0.6/execution
...@@ -162,12 +162,12 @@ class ExecutionCollectionAPI(RequestHandler): ...@@ -162,12 +162,12 @@ class ExecutionCollectionAPI(RequestHandler):
('later_than_start', int), ('later_than_start', int),
('later_than_end', int) ('later_than_end', int)
] ]
for f in filters: for filter in filters:
if f[0] in self.request.arguments: if filter[0] in self.request.arguments:
if f[1] == str: if filter[1] == str:
filt_dict[f[0]] = self.request.arguments[f[0]][0].decode('utf-8') filt_dict[filter[0]] = self.request.arguments[filter[0]][0].decode('utf-8')
else: else:
filt_dict[f[0]] = f[1](self.request.arguments[f[0]][0]) filt_dict[filter[0]] = filter[1](self.request.arguments[filter[0]][0])
execs = self.api_endpoint.execution_list(uid, role, **filt_dict) execs = self.api_endpoint.execution_list(uid, role, **filt_dict)
......
...@@ -82,9 +82,9 @@ def exec_list_cmd(args): ...@@ -82,9 +82,9 @@ def exec_list_cmd(args):
'later_than_end' 'later_than_end'
] ]
filters = {} filters = {}
for k, v in vars(args).items(): for key, value in vars(args).items():
if k in filter_names: if key in filter_names:
filters[k] = v filters[key] = value
data = exec_api.list(**filters) data = exec_api.list(**filters)
for e in sorted(data.values(), key=lambda x: x['id']): for e in sorted(data.values(), key=lambda x: x['id']):
print('Execution {} (User: {}, ID: {}): {}'.format(e['name'], e['user_id'], e['id'], e['status'])) print('Execution {} (User: {}, ID: {}): {}'.format(e['name'], e['user_id'], e['id'], e['status']))
......
...@@ -64,7 +64,7 @@ class ZoeExecutionsAPI(ZoeAPIBase): ...@@ -64,7 +64,7 @@ class ZoeExecutionsAPI(ZoeAPIBase):
def list(self, **kwargs): def list(self, **kwargs):
""" """
Returns a list of all executions for the calling user, all of them if the user is admin. Returns a list of all executions for the calling user, all of them if the user is admin.
The list can be filtered by passing arguments. Any combination of the following filters is supported: The list can be filtered by passing arguments. Any combination of the following filters is supported:
* status: one of submitted, scheduled, starting, error, running, cleaning up, terminated * status: one of submitted, scheduled, starting, error, running, cleaning up, terminated
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment