Fixed naming issues

oarstats.py

@@ -24,9 +24,9 @@ class Owner:
         self.queues[job.queue].append(job)
         if job.karma > self.karma:
             self.karma = job.karma
-        self.timeleft += job.duration - job.exec_time
+        self.timeleft += job.wall_time - job.elapsed_time
         self.resources[job.queue] += job.resources
-        if job.start_time != 0:
+        if job.elapsed_time != 0:
             self.running[job.queue] += 1
         if job.gpu:
             self.gpu[job.queue] += job.resources
@@ -38,9 +38,9 @@ class Owner:
 
 
 class Job:
-    def __init__(self, job_id, start_time, wall_time, resources, devices, gpu, queue, karma):
+    def __init__(self, job_id, elapsed_time, wall_time, resources, devices, gpu, queue, karma):
         self.job_id = job_id
-        self.start_time = start_time
+        self.elapsed_time = elapsed_time
         self.wall_time = wall_time
         self.resources = resources
         self.devices = devices
@@ -79,7 +79,7 @@ def main():
     for job_id, job_info in stats_yaml.items():
         if job_info["owner"] not in owners:
             owners[job_info["owner"]] = Owner(job_info["owner"])
-            start_time = 0 if job_info["startTime"] == 0 else time.time() - job_info["startTime"]
+            elapsed_time = 0 if job_info["startTime"] == 0 else time.time() - job_info["startTime"]
             tokens = re.search(walltime_pattern, job_info["message"]).group(1).split(':')
             wall_time = int(tokens[0]) * 3600 + int(tokens[1]) * 60 + int(tokens[2])
             resources = int(re.search(resources_pattern, job_info["message"]).group(1))
@@ -87,7 +87,7 @@ def main():
             karma = float(re.search(karma_pattern, job_info["message"]).group(1))
             devices = job_info["assigned_network_address"]
             gpu = re.search(gpu_pattern, job_info["properties"]) is not None
-            job = Job(job_id, start_time, wall_time, resources, devices, gpu, queue, karma)
+            job = Job(job_id, elapsed_time, wall_time, resources, devices, gpu, queue, karma)
             owners[job_info["owner"]].add_job(job)
 
     for owner in owners.values():