You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/07/09 03:19:50 UTC
[2/3] git commit: fixing thrift conversions issues and
gatewayresourceprofile selecting issue
fixing thrift conversions issues and gatewayresourceprofile selecting issue
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fe2fec56
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fe2fec56
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fe2fec56
Branch: refs/heads/master
Commit: fe2fec56bb742a493a34425589607a06b137f847
Parents: d0a8c44
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Tue Jul 8 21:19:16 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Tue Jul 8 21:19:16 2014 -0400
----------------------------------------------------------------------
.../apache/airavata/client/samples/CreateLaunchExperiment.java | 6 +++---
.../catalog/data/util/AppCatalogThriftConversion.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/fe2fec56/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 e3c9afc..c18103b 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
@@ -72,9 +72,9 @@ public class CreateLaunchExperiment {
addDescriptors();
// final String expId = createExperimentForSSHHost(airavata);
-// final String expId = createExperimentForTrestles(airavata);
+ final String expId = createExperimentForTrestles(client);
// final String expId = createExperimentForStampede(airavata);
- final String expId = createExperimentForLocalHost(client);
+// final String expId = createExperimentForLocalHost(client);
// final String expId = createExperimentForLonestar(airavata);
// final String expId = createExperimentWRFTrestles(airavata);
System.out.println("Experiment ID : " + expId);
@@ -228,7 +228,7 @@ public class CreateLaunchExperiment {
exOut.add(output);
Experiment simpleExperiment =
- ExperimentModelUtil.createSimpleExperiment("default", "admin", "echoExperiment", "SimpleEcho2", "SimpleEcho2", exInputs);
+ ExperimentModelUtil.createSimpleExperiment("default", "admin", "echoExperiment", "SimpleEcho2", pbsEchoAppId, exInputs);
simpleExperiment.setExperimentOutputs(exOut);
ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 1, 1, 1, "normal", 0, 0, 1, "sds128");
http://git-wip-us.apache.org/repos/asf/airavata/blob/fe2fec56/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
index 0903ebe..6c1cc9c 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
@@ -101,13 +101,13 @@ public class AppCatalogThriftConversion {
JobSubmissionInterfaceResource jsiResource = new JobSubmissionInterfaceResource();
List<Resource> hsiList = jsiResource.get(AbstractResource.JobSubmissionInterfaceConstants.COMPUTE_RESOURCE_ID, resource.getResourceId());
if (hsiList != null && !hsiList.isEmpty()){
- description.setJobSubmissionInterfaces(getJobSubmissionInterfaces(batchQueues));
+ description.setJobSubmissionInterfaces(getJobSubmissionInterfaces(hsiList));
}
DataMovementInterfaceResource dmiResource = new DataMovementInterfaceResource();
List<Resource> dmiList = dmiResource.get(AbstractResource.DataMovementInterfaceConstants.COMPUTE_RESOURCE_ID, resource.getResourceId());
if (dmiList != null && !dmiList.isEmpty()){
- description.setDataMovementInterfaces(getDataMovementInterfaces(batchQueues));
+ description.setDataMovementInterfaces(getDataMovementInterfaces(dmiList));
}
return description;
}