Repository: airavata Updated Branches: refs/heads/master 525e9e4b9 -> 20db90fc2
orchestrator changes Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/20db90fc Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/20db90fc Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/20db90fc Branch: refs/heads/master Commit: 20db90fc293dc56eb36c808d77a8f31bdbf7fff4 Parents: 525e9e4 Author: Chathuri Wimalasena <[email protected]> Authored: Fri Jun 26 12:43:42 2015 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Fri Jun 26 12:43:42 2015 -0400 ---------------------------------------------------------------------- .../airavata/orchestrator/cpi/Orchestrator.java | 11 ----- .../cpi/impl/SimpleOrchestratorImpl.java | 42 -------------------- 2 files changed, 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/20db90fc/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/Orchestrator.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/Orchestrator.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/Orchestrator.java index 3671ad9..d155a5e 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/Orchestrator.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/Orchestrator.java @@ -26,8 +26,6 @@ import org.apache.airavata.model.experiment.ExperimentModel; import org.apache.airavata.model.process.ProcessModel; import org.apache.airavata.orchestrator.core.exception.OrchestratorException; -import java.util.List; - /* This is the interface for orchestrator functionality exposed to the out side of the module @@ -56,15 +54,6 @@ public interface Orchestrator { /** - * This method will parseSingleJob the ExperimentConfiguration and based on the configuration - * we create a single or multiple tasks for the experiment. - * @param experimentId - * @return - * @throws OrchestratorException - */ - public List<ProcessModel> createProcesses(String experimentId) throws OrchestratorException; - - /** * After creating the experiment Data user have the * experimentID as the handler to the experiment, during the launchExperiment * We just have to give the experimentID http://git-wip-us.apache.org/repos/asf/airavata/blob/20db90fc/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java index ec942a1..a5e74e4 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java @@ -34,7 +34,6 @@ import org.apache.airavata.registry.cpi.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.Calendar; import java.util.List; import java.util.concurrent.ExecutorService; @@ -66,11 +65,8 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{ } public boolean launchExperiment(ExperimentModel experiment, ProcessModel processModel, String tokenId) throws OrchestratorException { - // we give higher priority to userExperimentID String experimentId = experiment.getExperimentId(); String processId = processModel.getProcessId(); - // creating monitorID to register with monitoring queue - // this is a special case because amqp has to be in place before submitting the job try { return jobSubmitter.submit(experimentId, processId, tokenId); } catch (Exception e) { @@ -78,44 +74,6 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{ } } - /** - * This method will parse the ExperimentConfiguration and based on the configuration - * we create a single or multiple tasks for the experiment. - * - * @param experimentId - * @return - * @throws OrchestratorException - */ - public List<ProcessModel> createProcesses(String experimentId) throws OrchestratorException { - ExperimentModel experiment = null; - List<ProcessModel> processModels = new ArrayList<ProcessModel>(); - // FIXME : should change as create processes -// try { -// Registry newRegistry = orchestratorContext.getNewRegistry(); -// experiment = (ExperimentModel) newRegistry.getExperimentCatalog().get(ExperimentCatalogModelType.EXPERIMENT, experimentId); -// List<ProcessModel> workflowNodeDetailsList = experiment.getWorkflowNodeDetailsList(); -// if (workflowNodeDetailsList != null && !workflowNodeDetailsList.isEmpty()){ -// for (WorkflowNodeDetails wfn : workflowNodeDetailsList){ -// List<TaskDetails> taskDetailsList = wfn.getTaskDetailsList(); -// if (taskDetailsList != null && !taskDetailsList.isEmpty()){ -// return taskDetailsList; -// } -// } -// }else { -// WorkflowNodeDetails iDontNeedaNode = ExperimentModelUtil.createWorkflowNode("tempNode", null); -// String nodeID = (String) newRegistry.getExperimentCatalog().add(ExpCatChildDataType.WORKFLOW_NODE_DETAIL, iDontNeedaNode, experimentId); -// -// TaskDetails taskDetails = ExperimentModelUtil.cloneTaskFromExperiment(experiment); -// taskDetails.setTaskID((String) newRegistry.getExperimentCatalog().add(ExpCatChildDataType.TASK_DETAIL, taskDetails, nodeID)); -// processModels.add(taskDetails); -// } - -// } catch (Exception e) { -// throw new OrchestratorException("Error during creating a task"); -// } - return processModels; - } - public ValidationResults validateExperiment(ExperimentModel experiment, ProcessModel processModel) throws OrchestratorException,LaunchValidationException { org.apache.airavata.model.error.ValidationResults validationResults = new org.apache.airavata.model.error.ValidationResults(); validationResults.setValidationState(true); // initially making it to success, if atleast one failed them simply mark it failed.
