Removed more REST API calls

Author: henricasanova

examples/json_workflow_simulator/simulator.py

@@ -176,6 +176,7 @@ def main():
         for f in files:
             ss.create_file_copy(f)
 
+
         # We are now ready to schedule the workflow
         print(f"Starting my main loop!")
         while not workflow.is_done():

wrench/simulation.py

@@ -517,22 +517,29 @@ def create_workflow_from_json(self, json_object: json, reference_flop_rate: str,
         # Create the workflow
         workflow = Workflow(self, response["workflow_name"])
 
+
+        # Create the files (caching parameter values)
+        for file_spec in response["files"]:
+            file_name = file_spec["name"]
+            file_size = file_spec["size"]
+            self.files[file_name] = File(self, file_name, file_size)
+
         # Create the tasks (caching parameter values)
         for task_spec in response["tasks"]:
             task_name = task_spec["name"]
             task_flops = task_spec["flops"]
             task_min_num_cores = task_spec["min_num_cores"]
             task_max_num_cores = task_spec["max_num_cores"]
             task_memory = task_spec["memory"]
-            workflow.tasks[task_name] = Task(self, workflow, task_name, task_flops, task_min_num_cores, task_max_num_cores, task_memory)
+            input_file_list = []
+            for file_name in task_spec["input_files"]:
+                input_file_list.append(self.files[file_name])
+            output_file_list = []
+            for file_name in task_spec["output_files"]:
+                output_file_list.append(self.files[file_name])
 
+            workflow.tasks[task_name] = Task(self, workflow, task_name, task_flops, task_min_num_cores, task_max_num_cores, task_memory, input_file_list, output_file_list)
 
-        # Create the files (caching parameter values)
-        print(response["files"])
-        for file_spec in response["files"]:
-            file_name = file_spec["name"]
-            file_size = file_spec["size"]
-            self.files[file_name] = File(self, file_name, file_size)
 
         return workflow
 

wrench/task.py

@@ -32,7 +32,9 @@ def __init__(self, simulation: Simulation, workflow: Workflow, name: str,
                  flops: flops = None,
                  min_num_cores:  number = None,
                  max_num_cores: number = None,
-                 memory: number = None) -> None:
+                 memory: number = None,
+                 input_files: List[File] = None,
+                 output_files: List[File] = None) -> None:
         """
         Constructor
         :param simulation: simulation object
@@ -48,8 +50,8 @@ def __init__(self, simulation: Simulation, workflow: Workflow, name: str,
         self.min_num_cores = min_num_cores
         self.max_num_cores = max_num_cores
         self.memory = memory
-        self.input_files = None
-        self.output_files = None
+        self.input_files = input_files
+        self.output_files = output_files
 
     class TaskState(Enum):
         NOT_READY = 0