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/04/28 17:33:03 UTC
git commit: fixing AIRAVATA-1161
Repository: airavata
Updated Branches:
refs/heads/master 3a4dfd047 -> 61a312a99
fixing AIRAVATA-1161
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/61a312a9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/61a312a9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/61a312a9
Branch: refs/heads/master
Commit: 61a312a99e47881efe8c641acad9849530e579bd
Parents: 3a4dfd0
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Mon Apr 28 11:33:08 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Mon Apr 28 11:33:08 2014 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 3 +-
.../client/samples/CreateLaunchExperiment.java | 33 ++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/61a312a9/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 464e93f..609cf12 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -459,8 +459,9 @@ public class AiravataServerHandler implements Airavata.Iface {
public String cloneExperiment(String airavataExperimentIdToBeCloned, Experiment updatedExperiment) throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException, AiravataSystemException, TException {
try {
registry = RegistryFactory.getDefaultRegistry();
- UserConfigurationData previousConfiguration = (UserConfigurationData)registry.get(DataType.EXPERIMENT_CONFIGURATION_DATA, airavataExperimentIdToBeCloned);
+ UserConfigurationData previousConfiguration = (UserConfigurationData)registry.get(DataType.EXPERIMENT_CONFIGURATION_DATA, updatedExperiment.getExperimentID());
updatedExperiment.setUserConfigurationData(previousConfiguration);
+ updatedExperiment.setName(airavataExperimentIdToBeCloned);
return (String)registry.add(ParentDataType.EXPERIMENT, updatedExperiment);
} catch (Exception e) {
logger.error("Error while cloning the experiment with existing configuration...", e);
http://git-wip-us.apache.org/repos/asf/airavata/blob/61a312a9/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 1a00acb..89bab76 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -24,6 +24,7 @@ package org.apache.airavata.client.samples;
import org.apache.airavata.api.error.ExperimentNotFoundException;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ClientSettings;
+import org.apache.airavata.model.workspace.Project;
import org.apache.airavata.model.workspace.experiment.*;
import org.apache.airavata.schemas.gfac.DataType;
import org.apache.airavata.api.Airavata;
@@ -66,14 +67,21 @@ public class CreateLaunchExperiment {
final String expId = createExperimentForTrestles(airavata);
// final String expId = createExperimentForStampede(airavata);
System.out.println("Experiment ID : " + expId);
+ String clonedExpId = cloneExperiment(airavata, expId);
+ System.out.println("Cloned Experiment ID : " + clonedExpId);
launchExperiment(airavata, expId);
System.out.println("Launched successfully");
List<Experiment> experiments = getExperimentsForUser(airavata, "admin");
+ List<Project> projects = getAllUserProject(airavata, "admin");
for (Experiment exp : experiments){
System.out.println(" exp id : " + exp.getExperimentID());
System.out.println(" exp status : " + exp.getExperimentStatus().getExperimentState().toString());
}
+ for (Project pr : projects){
+ System.out.println(" project name : " + pr.getName());
+ }
+
// try {
// Thread.sleep(20000);
// } catch (InterruptedException e) {
@@ -198,6 +206,16 @@ public class CreateLaunchExperiment {
}
}
+ public static String cloneExperiment(Airavata.Client client, String expId) throws TException {
+ try{
+ Experiment experiment = client.getExperiment(expId);
+ return client.cloneExperiment("cloneExperiment1", experiment);
+ }catch (TException e) {
+ logger.error("Error occured while creating the experiment...", e.getMessage());
+ throw new TException(e);
+ }
+ }
+
public static String createExperimentForLocalHost(Airavata.Client client) throws TException {
try{
@@ -406,4 +424,19 @@ public class CreateLaunchExperiment {
}
return null;
}
+
+ public static List<Project> getAllUserProject (Airavata.Client client, String user){
+ try {
+ return client.getAllUserProjects(user);
+ } catch (AiravataSystemException e) {
+ e.printStackTrace();
+ } catch (InvalidRequestException e) {
+ e.printStackTrace();
+ } catch (AiravataClientException e) {
+ e.printStackTrace();
+ }catch (TException e){
+ e.printStackTrace();
+ }
+ return null;
+ }
}