You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/02/28 18:05:09 UTC
git commit: fixing test case
Repository: airavata
Updated Branches:
refs/heads/master 48b0c5ebe -> d29a148f6
fixing test case
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d29a148f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d29a148f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d29a148f
Branch: refs/heads/master
Commit: d29a148f610b0d92bfa9d1005f6cb712cf6ec182
Parents: 48b0c5e
Author: chathuri <ch...@apache.org>
Authored: Fri Feb 28 12:05:03 2014 -0500
Committer: chathuri <ch...@apache.org>
Committed: Fri Feb 28 12:05:03 2014 -0500
----------------------------------------------------------------------
.../client/OrchestratorClientFactoryTest.java | 12 ++++---
.../registry/jpa/impl/ExperimentRegistry.java | 34 ++++++++++++--------
2 files changed, 28 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d29a148f/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java b/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
index e5d4b44..4b5aef1 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
+++ b/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
@@ -25,6 +25,7 @@ import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.model.util.ExperimentModelUtil;
import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling;
@@ -34,6 +35,7 @@ import org.apache.airavata.orchestrator.core.DocumentCreator;
import org.apache.airavata.orchestrator.cpi.OrchestratorService;
import org.apache.airavata.persistance.registry.jpa.impl.RegistryFactory;
import org.apache.airavata.registry.cpi.ChildDataType;
+import org.apache.airavata.registry.cpi.CompositeIdentifier;
import org.apache.airavata.registry.cpi.ParentDataType;
import org.apache.airavata.registry.cpi.Registry;
import org.apache.airavata.schemas.gfac.DataType;
@@ -45,14 +47,14 @@ import java.util.List;
public class OrchestratorClientFactoryTest {
private DocumentCreator documentCreator;
- private OrchestratorService.Client orchestratorClient;
+// private OrchestratorService.Client orchestratorClient;
private Registry registry;
@Before
public void setUp(){
- OrchestratorClientFactory orchestratorClientFactory = new OrchestratorClientFactory();
- orchestratorClient = orchestratorClientFactory.createOrchestratorClient("localhost", 8940);
+// orchestratorClient = OrchestratorClientFactory.createOrchestratorClient("localhost", 8940);
registry = RegistryFactory.getDefaultRegistry();
+ AiravataUtils.setExecutionAsServer();
documentCreator = new DocumentCreator(getAiravataAPI());
documentCreator.createLocalHostDocs();
documentCreator.createGramDocs();
@@ -90,9 +92,9 @@ public class OrchestratorClientFactoryTest {
exInputs.add(input);
Experiment simpleExperiment = ExperimentModelUtil.createSimpleExperiment("project1", "admin", "echoExperiment", "EchoLocal", "EchoLocal", exInputs);
ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 1, 1, 1, "development", 0, 0, 1, "sds128");
-
String expId = (String)registry.add(ParentDataType.EXPERIMENT, simpleExperiment);
- registry.add(ChildDataType.COMPUTATIONAL_RESOURCE_SCHEDULING, scheduling, expId);
+ CompositeIdentifier compositeIdentifier = new CompositeIdentifier(expId, null);
+ registry.add(ChildDataType.COMPUTATIONAL_RESOURCE_SCHEDULING, scheduling, compositeIdentifier);
} catch (Exception e) {
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/d29a148f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
index afe757b..46c9c15 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
@@ -799,17 +799,19 @@ public class ExperimentRegistry {
/**
*
* @param scheduling computational resource object
- * @param ids contains expId and taskId
+ * @param ids contains expId and taskId, if it is an experiment, task id can be null
* @return scheduling id
*/
public String addComputationalResourceScheduling (ComputationalResourceScheduling scheduling, CompositeIdentifier ids){
try {
ExperimentResource experiment = gatewayResource.getExperiment((String) ids.getTopLevelIdentifier());
- WorkflowNodeDetailResource nodeDetailResource = (WorkflowNodeDetailResource)experiment.create(ResourceType.WORKFLOW_NODE_DETAIL);
- TaskDetailResource taskDetail = nodeDetailResource.getTaskDetail((String) ids.getSecondLevelIdentifier());
ComputationSchedulingResource schedulingResource = (ComputationSchedulingResource)experiment.create(ResourceType.COMPUTATIONAL_RESOURCE_SCHEDULING);
+ if (ids.getSecondLevelIdentifier() != null){
+ WorkflowNodeDetailResource nodeDetailResource = (WorkflowNodeDetailResource)experiment.create(ResourceType.WORKFLOW_NODE_DETAIL);
+ TaskDetailResource taskDetail = nodeDetailResource.getTaskDetail((String) ids.getSecondLevelIdentifier());
+ schedulingResource.setTaskDetailResource(taskDetail);
+ }
schedulingResource.setExperimentResource(experiment);
- schedulingResource.setTaskDetailResource(taskDetail);
schedulingResource.setResourceHostId(scheduling.getResourceHostId());
schedulingResource.setCpuCount(scheduling.getTotalCPUCount());
schedulingResource.setNodeCount(scheduling.getNodeCount());
@@ -836,11 +838,13 @@ public class ExperimentRegistry {
public String addInputDataHandling (AdvancedInputDataHandling dataHandling, CompositeIdentifier ids){
try {
ExperimentResource experiment = gatewayResource.getExperiment((String) ids.getTopLevelIdentifier());
- WorkflowNodeDetailResource nodeDetailResource = (WorkflowNodeDetailResource)experiment.create(ResourceType.WORKFLOW_NODE_DETAIL);
- TaskDetailResource taskDetail = nodeDetailResource.getTaskDetail((String) ids.getSecondLevelIdentifier());
AdvanceInputDataHandlingResource dataHandlingResource = (AdvanceInputDataHandlingResource)experiment.create(ResourceType.ADVANCE_INPUT_DATA_HANDLING);
+ if (ids.getSecondLevelIdentifier() != null){
+ WorkflowNodeDetailResource nodeDetailResource = (WorkflowNodeDetailResource)experiment.create(ResourceType.WORKFLOW_NODE_DETAIL);
+ TaskDetailResource taskDetail = nodeDetailResource.getTaskDetail((String) ids.getSecondLevelIdentifier());
+ dataHandlingResource.setTaskDetailResource(taskDetail);
+ }
dataHandlingResource.setExperimentResource(experiment);
- dataHandlingResource.setTaskDetailResource(taskDetail);
dataHandlingResource.setWorkingDir(dataHandling.getUniqueWorkingDirectory());
dataHandlingResource.setWorkingDirParent(dataHandling.getParentWorkingDirectory());
dataHandlingResource.setStageInputFiles(dataHandling.isStageInputFilesToWorkingDir());
@@ -862,11 +866,13 @@ public class ExperimentRegistry {
public String addOutputDataHandling (AdvancedOutputDataHandling dataHandling, CompositeIdentifier ids){
try {
ExperimentResource experiment = gatewayResource.getExperiment((String) ids.getTopLevelIdentifier());
- WorkflowNodeDetailResource nodeDetailResource = (WorkflowNodeDetailResource)experiment.create(ResourceType.WORKFLOW_NODE_DETAIL);
- TaskDetailResource taskDetail = nodeDetailResource.getTaskDetail((String) ids.getSecondLevelIdentifier());
AdvancedOutputDataHandlingResource dataHandlingResource = (AdvancedOutputDataHandlingResource)experiment.create(ResourceType.ADVANCE_OUTPUT_DATA_HANDLING);
+ if (ids.getSecondLevelIdentifier() != null){
+ WorkflowNodeDetailResource nodeDetailResource = (WorkflowNodeDetailResource)experiment.create(ResourceType.WORKFLOW_NODE_DETAIL);
+ TaskDetailResource taskDetail = nodeDetailResource.getTaskDetail((String) ids.getSecondLevelIdentifier());
+ dataHandlingResource.setTaskDetailResource(taskDetail);
+ }
dataHandlingResource.setExperimentResource(experiment);
- dataHandlingResource.setTaskDetailResource(taskDetail);
dataHandlingResource.setOutputDataDir(dataHandling.getOutputDataDir());
dataHandlingResource.setDataRegUrl(dataHandling.getDataRegistryURL());
dataHandlingResource.setPersistOutputData(dataHandling.isPersistOutputData());
@@ -881,11 +887,13 @@ public class ExperimentRegistry {
public String addQosParams (QualityOfServiceParams qosParams, CompositeIdentifier ids){
try {
ExperimentResource experiment = gatewayResource.getExperiment((String) ids.getTopLevelIdentifier());
- WorkflowNodeDetailResource nodeDetailResource = (WorkflowNodeDetailResource)experiment.create(ResourceType.WORKFLOW_NODE_DETAIL);
- TaskDetailResource taskDetail = nodeDetailResource.getTaskDetail((String) ids.getSecondLevelIdentifier());
QosParamResource qosParamResource = (QosParamResource)experiment.create(ResourceType.QOS_PARAM);
+ if (ids.getSecondLevelIdentifier() != null){
+ WorkflowNodeDetailResource nodeDetailResource = (WorkflowNodeDetailResource)experiment.create(ResourceType.WORKFLOW_NODE_DETAIL);
+ TaskDetailResource taskDetail = nodeDetailResource.getTaskDetail((String) ids.getSecondLevelIdentifier());
+ qosParamResource.setTaskDetailResource(taskDetail);
+ }
qosParamResource.setExperimentResource(experiment);
- qosParamResource.setTaskDetailResource(taskDetail);
qosParamResource.setStartExecutionAt(qosParams.getStartExecutionAt());
qosParamResource.setExecuteBefore(qosParams.getExecuteBefore());
qosParamResource.setNoOfRetries(qosParams.getNumberofRetries());