airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject airavata git commit: test framework result file formating - AIRAVATA-1656
Date Fri, 17 Apr 2015 15:52:49 GMT
Repository: airavata
Updated Branches:
  refs/heads/master c8a17de16 -> cf82465a0


test framework result file formating - AIRAVATA-1656


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

Branch: refs/heads/master
Commit: cf82465a0d813ed9cb188e689eb99a999ea37f6a
Parents: c8a17de
Author: Chathuri Wimalasena <kamalasini@gmail.com>
Authored: Fri Apr 17 11:52:43 2015 -0400
Committer: Chathuri Wimalasena <kamalasini@gmail.com>
Committed: Fri Apr 17 11:52:43 2015 -0400

----------------------------------------------------------------------
 .../multitenantedairavata/ApplicationRegister.java  |  1 +
 .../multitenantedairavata/ExperimentExecution.java  | 16 ++++++----------
 .../FrameworkBootstrapping.java                     |  8 +++++++-
 .../src/main/resources/test-framework.json          |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/cf82465a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ApplicationRegister.java
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ApplicationRegister.java
b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ApplicationRegister.java
index 7f0a3d3..5c82a65 100644
--- a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ApplicationRegister.java
+++ b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ApplicationRegister.java
@@ -72,6 +72,7 @@ public class ApplicationRegister {
 
     public void addApplications () throws Exception{
         Map<String, String> allComputeResourceNames = airavata.getAllComputeResourceNames();
+        System.out.println("All compute resources :" + allComputeResourceNames.size());
         for (String resourceId : allComputeResourceNames.keySet()){
             String resourceName = allComputeResourceNames.get(resourceId);
             if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.STAMPEDE_RESOURCE_NAME)){

http://git-wip-us.apache.org/repos/asf/airavata/blob/cf82465a/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 4e7a183..50c83bf 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
@@ -211,7 +211,6 @@ public class ExperimentExecution {
                         String expId = event.getExperimentId();
                         String gatewayId = event.getGatewayId();
 
-                        resultWriter.println();
                         if (expState.equals(ExperimentState.COMPLETED)) {
                             resultWriter.println("Results for experiment : " + expId + "
of gateway Id : " + gatewayId);
                             resultWriter.println("=====================================================================");
@@ -227,7 +226,6 @@ public class ExperimentExecution {
                             }
                             resultWriter.println("End of Results for Experiment : " + expId
);
                             resultWriter.println("=====================================================================");
-                            resultWriter.println();
                         } else if (expState.equals(ExperimentState.FAILED)) {
                             resultWriter.println("Results for experiment : " + expId + "
of gateway Id : " + gatewayId);
                             resultWriter.println("=====================================================================");
@@ -247,7 +245,6 @@ public class ExperimentExecution {
 
                             resultWriter.println("End of Results for Experiment : " + expId
);
                             resultWriter.println("=====================================================================");
-                            resultWriter.println();
                         }
                         System.out.println(" Experiment Id : '" + expId
                                 + "' with state : '" + event.getState().toString() +
@@ -479,7 +476,6 @@ public class ExperimentExecution {
                                     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();
@@ -487,9 +483,9 @@ public class ExperimentExecution {
                                     userConfigurationData.setOverrideManualScheduledParams(false);
                                     userConfigurationData.setComputationalResourceScheduling(scheduling);
                                     simpleExperiment.setUserConfigurationData(userConfigurationData);
-                                    experimentId = airavata.createExperiment(gatewayId, simpleExperiment);
-                                    experimentsWithTokens.put(experimentId, token);
-                                    experimentsWithGateway.put(experimentId, gatewayId);
+//                                    experimentId = airavata.createExperiment(gatewayId,
simpleExperiment);
+//                                    experimentsWithTokens.put(experimentId, token);
+//                                    experimentsWithGateway.put(experimentId, gatewayId);
                                 }
                             }
                         }
@@ -566,9 +562,9 @@ public class ExperimentExecution {
                                             userConfigurationData.setOverrideManualScheduledParams(false);
                                             userConfigurationData.setComputationalResourceScheduling(scheduling);
                                             simpleExperiment.setUserConfigurationData(userConfigurationData);
-                                            experimentId = airavata.createExperiment(gatewayId,
simpleExperiment);
-                                            experimentsWithTokens.put(experimentId, token);
-                                            experimentsWithGateway.put(experimentId, gatewayId);
+//                                            experimentId = airavata.createExperiment(gatewayId,
simpleExperiment);
+//                                            experimentsWithTokens.put(experimentId, token);
+//                                            experimentsWithGateway.put(experimentId, gatewayId);
                                         }
                                     }
                                 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/cf82465a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/FrameworkBootstrapping.java
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/FrameworkBootstrapping.java
b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/FrameworkBootstrapping.java
index 6691e48..d689428 100644
--- a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/FrameworkBootstrapping.java
+++ b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/FrameworkBootstrapping.java
@@ -65,17 +65,23 @@ public class FrameworkBootstrapping {
             }else if (regApps){
                 setup.getGatewayRegister().createGateways();
                 logger.info("Gateways created...");
+                System.out.println("Gateways created...");
                 setup.getGatewayRegister().registerSSHKeys();
                 logger.info("Registered SSH keys to each gateway...");
+                System.out.println("Registered SSH keys to each gateway...");
 //                tokens = readTokens();
                 setup.getComputeResourceRegister().addComputeResources();
+                logger.info("Compute resources saved...");
+                System.out.println("Compute resources saved...");
                 setup.getComputeResourceRegister().registerGatewayResourceProfile();
+                logger.info("Gateway Profiles saved...");
+                System.out.println("Gateway Profiles saved...");
                 setup.getApplicationRegister().addApplications();
                 logger.info("Applications registered for each each gateway...");
             }else if (expExec){
                 tokens = readTokens();
                 experimentExecution = new ExperimentExecution(setup.getAiravata(), tokens,
setup.getTestFrameworkProps());
-//                experimentExecution.createEchoExperiment();
+                experimentExecution.createEchoExperiment();
                 experimentExecution.createAmberExperiment();
                 experimentExecution.launchExperiments();
                 experimentExecution.monitorExperiments();

http://git-wip-us.apache.org/repos/asf/airavata/blob/cf82465a/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 8b147cc..68723ac 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
@@ -56,7 +56,7 @@
             "resoureName": "stampede.tacc.xsede.org",
             "errorFeeds": {
                 "projectId": "TG-STA110014S",
-                "queueName": "normal",
+                "queueName": "normal1",
                 "walltime": 1,
                 "hostName": "trestles.sdsc.xsede.org"
             }


Mime
View raw message