Adding task implmentation related yaml configuration
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/bdb8b974 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bdb8b974 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bdb8b974 Branch: refs/heads/feature-workload-mgmt Commit: bdb8b974b8131e42ff2b88cb1d3ebc06d467f8cb Parents: 50793de Author: Ajinkya Dhamnaskar <[email protected]> Authored: Tue May 9 12:40:44 2017 -0400 Committer: Ajinkya Dhamnaskar <[email protected]> Committed: Tue May 9 12:40:44 2017 -0400 ---------------------------------------------------------------------- .../core/config/WorkerYamlConfigruation.java | 22 ++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/bdb8b974/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/WorkerYamlConfigruation.java ---------------------------------------------------------------------- diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/WorkerYamlConfigruation.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/WorkerYamlConfigruation.java index b026de9..b745b81 100644 --- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/WorkerYamlConfigruation.java +++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/WorkerYamlConfigruation.java @@ -46,6 +46,10 @@ public class WorkerYamlConfigruation { private static final String EMAIL_PARSER = "emailParser"; private static final String RESOURCE_EMAIL_ADDRESS = "resourceEmailAddresses"; private static final String PROPERTIES = "properties"; + public static final String TASK_IMPLEMENTATIONS = "taskImplementations"; + private static final String TASK = "task"; + private List<TaskImplementationConfig> taskImplementations = new ArrayList<>(); + private List<JobSubmitterTaskConfig> jobSubmitters = new ArrayList<>(); private List<DataTransferTaskConfig> fileTransferTasks = new ArrayList<>(); @@ -54,7 +58,7 @@ public class WorkerYamlConfigruation { public WorkerYamlConfigruation() throws WorkerException { InputStream resourceAsStream = WorkerYamlConfigruation.class.getClassLoader(). - getResourceAsStream("gfac-config.yaml"); + getResourceAsStream("worker-config.yaml"); parse(resourceAsStream); } @@ -130,6 +134,18 @@ public class WorkerYamlConfigruation { resources.add(resourceConfig); } } + + List<Map<String,Object >> taskImplementationYaml = (List<Map<String, Object>>) loadMap.get(TASK_IMPLEMENTATIONS); + TaskImplementationConfig taskImplementationConfig; + if (taskImplementationYaml != null) { + for (Map<String, Object> taskImplementations : taskImplementationYaml) { + taskImplementationConfig = new TaskImplementationConfig(); + identifier = ((String) taskImplementations.get(TASK)); + taskImplementationConfig.setTaskType(identifier); + taskImplementationConfig.setImplementationClass(((String) taskImplementations.get(TASK_CLASS))); + this.taskImplementations.add(taskImplementationConfig); + } + } } } @@ -145,6 +161,8 @@ public class WorkerYamlConfigruation { return resources; } - + public List<TaskImplementationConfig> getTaskImplementations() { + return taskImplementations; + } }
