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 2015/05/19 15:57:57 UTC
airavata git commit: adding lonestar and comet
Repository: airavata
Updated Branches:
refs/heads/master c11b6628c -> ad41af738
adding lonestar and comet
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ad41af73
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ad41af73
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ad41af73
Branch: refs/heads/master
Commit: ad41af738402a0a6f0b8f7eae9758da3b1a81284
Parents: c11b662
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Tue May 19 09:57:47 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Tue May 19 09:57:47 2015 -0400
----------------------------------------------------------------------
.../ExperimentExecution.java | 18 ++++++++++++++----
.../multitenantedairavata/FrameworkSetup.java | 3 +++
.../utils/TestFrameworkConstants.java | 3 ++-
3 files changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ad41af73/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ExperimentExecution.java
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ExperimentExecution.java b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ExperimentExecution.java
index f13056a..f0cf564 100644
--- a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ExperimentExecution.java
+++ b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ExperimentExecution.java
@@ -548,7 +548,17 @@ public class ExperimentExecution {
experimentId = airavata.createExperiment(gatewayId, simpleExperiment);
experimentsWithTokens.put(experimentId, token);
experimentsWithGateway.put(experimentId, gatewayId);
- } else if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.TRESTLES_RESOURCE_NAME)) {
+ }else if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.ALAMO_RESOURCE_NAME)) {
+ ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(id, 4, 1, 1, "batch", 30, 0, 1, null);
+ UserConfigurationData userConfigurationData = new UserConfigurationData();
+ userConfigurationData.setAiravataAutoSchedule(false);
+ userConfigurationData.setOverrideManualScheduledParams(false);
+ userConfigurationData.setComputationalResourceScheduling(scheduling);
+ simpleExperiment.setUserConfigurationData(userConfigurationData);
+ experimentId = airavata.createExperiment(gatewayId, simpleExperiment);
+ experimentsWithTokens.put(experimentId, token);
+ experimentsWithGateway.put(experimentId, gatewayId);
+ }else if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.GORDEN_RESOURCE_NAME)) {
ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(id, 4, 1, 1, "normal", 30, 0, 1, null);
UserConfigurationData userConfigurationData = new UserConfigurationData();
userConfigurationData.setAiravataAutoSchedule(false);
@@ -558,8 +568,8 @@ public class ExperimentExecution {
experimentId = airavata.createExperiment(gatewayId, simpleExperiment);
experimentsWithTokens.put(experimentId, token);
experimentsWithGateway.put(experimentId, gatewayId);
- }else if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.ALAMO_RESOURCE_NAME)) {
- ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(id, 4, 1, 1, "batch", 30, 0, 1, null);
+ }else if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.COMET_RESOURCE_NAME)) {
+ ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(id, 4, 1, 1, "compute", 30, 0, 1, null);
UserConfigurationData userConfigurationData = new UserConfigurationData();
userConfigurationData.setAiravataAutoSchedule(false);
userConfigurationData.setOverrideManualScheduledParams(false);
@@ -568,7 +578,7 @@ public class ExperimentExecution {
experimentId = airavata.createExperiment(gatewayId, simpleExperiment);
experimentsWithTokens.put(experimentId, token);
experimentsWithGateway.put(experimentId, gatewayId);
- }else if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.GORDEN_RESOURCE_NAME)) {
+ }else if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.LONESTAR_RESOURCE_NAME)) {
ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(id, 4, 1, 1, "normal", 30, 0, 1, null);
UserConfigurationData userConfigurationData = new UserConfigurationData();
userConfigurationData.setAiravataAutoSchedule(false);
http://git-wip-us.apache.org/repos/asf/airavata/blob/ad41af73/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/FrameworkSetup.java
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/FrameworkSetup.java b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/FrameworkSetup.java
index edad95e..6de88bf 100644
--- a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/FrameworkSetup.java
+++ b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/FrameworkSetup.java
@@ -64,6 +64,9 @@ public class FrameworkSetup {
private String getTestFrameworkJSON () throws IOException {
InputStream inputStream = FrameworkSetup.class.getClassLoader().getResourceAsStream(TestFrameworkConstants.TEST_FREAMEWORK_JSON);
+ if (inputStream == null){
+ throw new IOException("Input stream is null");
+ }
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
String line;
String content = "";
http://git-wip-us.apache.org/repos/asf/airavata/blob/ad41af73/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/utils/TestFrameworkConstants.java
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/utils/TestFrameworkConstants.java b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/utils/TestFrameworkConstants.java
index 04d3250..f3cd66f 100644
--- a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/utils/TestFrameworkConstants.java
+++ b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/utils/TestFrameworkConstants.java
@@ -23,7 +23,6 @@ package org.apache.airavata.testsuite.multitenantedairavata.utils;
public class TestFrameworkConstants {
public static final String AIRAVATA_CLIENT_PROPERTIES = "airavata-client.properties";
- public static final String TEST_FREAMEWORK_PROPERTIES = "test-framework.properties";
public static final String TEST_FREAMEWORK_JSON = "test-framework.json";
public static final class AiravataClientConstants {
@@ -103,6 +102,8 @@ public class TestFrameworkConstants {
public static final String BR2_RESOURCE_NAME = "bigred2.uits.iu.edu";
public static final String GORDEN_RESOURCE_NAME = "gordon.sdsc.edu";
public static final String ALAMO_RESOURCE_NAME = "alamo.uthscsa.edu";
+ public static final String COMET_RESOURCE_NAME = "comet.sdsc.edu";
+ public static final String LONESTAR_RESOURCE_NAME = "lonestar.tacc.utexas.edu";
public static final String AMBER_HEAT_RST_LOCATION = "02_Heat.rst_location";