airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject airavata git commit: handling error cases from test framework - AIRAVATA-1656
Date Thu, 16 Apr 2015 20:41:52 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 49deda555 -> 395c7901c


handling error cases from test framework - AIRAVATA-1656


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/395c7901
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/395c7901
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/395c7901

Branch: refs/heads/master
Commit: 395c7901c1be05de09e7325783dd0454f051dc10
Parents: 49deda5
Author: Chathuri Wimalasena <kamalasini@gmail.com>
Authored: Thu Apr 16 16:41:46 2015 -0400
Committer: Chathuri Wimalasena <kamalasini@gmail.com>
Committed: Thu Apr 16 16:41:46 2015 -0400

----------------------------------------------------------------------
 .../ExperimentExecution.java                    | 67 ++++++++++----------
 .../src/main/resources/test-framework.json      |  4 +-
 2 files changed, 36 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/395c7901/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 770b2f3..4e7a183 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
@@ -29,7 +29,6 @@ import org.apache.airavata.messaging.core.MessagingConstants;
 import org.apache.airavata.messaging.core.impl.RabbitMQStatusConsumer;
 import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
 import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
-import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 import org.apache.airavata.model.error.AiravataClientException;
 import org.apache.airavata.model.error.AiravataSystemException;
 import org.apache.airavata.model.error.InvalidRequestException;
@@ -353,8 +352,8 @@ public class ExperimentExecution {
     public void createAmberWithErrorUserConfig (String gatewayId,
                                             String token,
                                             String projectId,
-                                            String appId,
-                                            String hostId) throws Exception {
+                                            String hostId,
+                                            String appId) throws Exception {
         try {
 
             TestFrameworkProps.Error[] errors = properties.getErrors();
@@ -397,7 +396,7 @@ public class ExperimentExecution {
                         }
 
                         Experiment simpleExperiment =
-                                ExperimentModelUtil.createSimpleExperiment(projectId, testUser,
"AmberErrorInputs", "Amber Experiment run", appId, applicationInputs);
+                                ExperimentModelUtil.createSimpleExperiment(projectId, testUser,
"AmberErrorConfigs", "Amber Experiment run", appId, applicationInputs);
                         simpleExperiment.setExperimentOutputs(appOutputs);
                         ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(hostId,
4, 1, 1, queueName, walltime, 0, 1, allocationProject);
                         UserConfigurationData userConfigurationData = new UserConfigurationData();
@@ -434,10 +433,10 @@ public class ExperimentExecution {
                 String token = csTokens.get(gatewayId);
                 Map<String, String> appsWithNames = appInterfaceMap.get(gatewayId);
                 for (String appId : appsWithNames.keySet()){
-                    List<InputDataObjectType> applicationInputs = airavata.getApplicationInputs(appId);
-                    List<OutputDataObjectType> appOutputs = airavata.getApplicationOutputs(appId);
                     String appName = appsWithNames.get(appId);
                     if (appName.equals(TestFrameworkConstants.AppcatalogConstants.AMBER_APP_NAME)){
+                        List<InputDataObjectType> applicationInputs = airavata.getApplicationInputs(appId);
+                        List<OutputDataObjectType> appOutputs = airavata.getApplicationOutputs(appId);
                         for (String inputName : userGivenAmberInputs.keySet()){
                             for (InputDataObjectType inputDataObjectType : applicationInputs)
{
                                 if (inputDataObjectType.getName().equalsIgnoreCase(inputName))
{
@@ -459,36 +458,38 @@ public class ExperimentExecution {
                             for (String id : computeResources.keySet()) {
                                 String resourceName = computeResources.get(id);
                                 if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.TRESTLES_RESOURCE_NAME))
{
-//                                    ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(id,
4, 1, 1, "normal", 20, 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);
+                                    ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(id,
4, 1, 1, "normal", 20, 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.STAMPEDE_RESOURCE_NAME))
{
-//                                    ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(id,
4, 1, 1, "normal", 20, 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);
+                                    ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(id,
4, 1, 1, "normal", 20, 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);
+                                    createAmberWithErrorInputs(gatewayId, token, projectID,
id, appId);
+                                    createAmberWithErrorUserConfig(gatewayId, token, projectID,
id, appId);
                                     createAmberWithErrorInputs(gatewayId, token, projectID,
id, appId);
                                 } else if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.BR2_RESOURCE_NAME))
{
-//                                    ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(id,
4, 1, 1, "normal", 20, 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);
+                                    ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(id,
4, 1, 1, "normal", 20, 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);
                                 }
                             }
                         }

http://git-wip-us.apache.org/repos/asf/airavata/blob/395c7901/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.json
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.json
b/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.json
index b160666..8b147cc 100644
--- a/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.json
+++ b/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.json
@@ -55,9 +55,9 @@
             "application": "amber_sander",
             "resoureName": "stampede.tacc.xsede.org",
             "errorFeeds": {
-                "projectId": "sds128",
+                "projectId": "TG-STA110014S",
                 "queueName": "normal",
-                "walltime": 10,
+                "walltime": 1,
                 "hostName": "trestles.sdsc.xsede.org"
             }
 


Mime
View raw message