From 551b2161cd4858699d9c8d92c10425f0870bb1b5 Mon Sep 17 00:00:00 2001 From: Taseer Ahmed Date: Fri, 22 Sep 2017 00:41:37 +0500 Subject: Returns job id and status - If the user GETs for job without ID and type status, return all jobs along with status JIRA: STORPERF-213 Change-Id: I5518acae45f259644c961c6dc9f0cb170b86b6e1 Signed-off-by: Taseer Ahmed --- docker/storperf-master/storperf/test_executor.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'docker/storperf-master/storperf') diff --git a/docker/storperf-master/storperf/test_executor.py b/docker/storperf-master/storperf/test_executor.py index 4c2c972..629ae15 100644 --- a/docker/storperf-master/storperf/test_executor.py +++ b/docker/storperf-master/storperf/test_executor.py @@ -219,9 +219,18 @@ class TestExecutor(object): if self.job_db.job_id == job_id and self._terminated is False: status = "Running" - result['Status'] = status - result['Workloads'] = self.workload_status - result['TestResultURL'] = self.result_url + result['Status'] = status + result['Workloads'] = self.workload_status + result['TestResultURL'] = self.result_url + + else: + jobs = self.job_db.fetch_jobs() + self.logger.info("Jobs") + self.logger.info(jobs) + for job in jobs: + if self.job_db.job_id == job_id and self._terminated is False: + status = "Running" + result[job] = status return result -- cgit 1.2.3-korg