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/09/21 22:28:47 UTC
airavata git commit: test framework to work with master
Repository: airavata
Updated Branches:
refs/heads/master ba8538ddf -> d6b735b56
test framework to work with master
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d6b735b5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d6b735b5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d6b735b5
Branch: refs/heads/master
Commit: d6b735b56459153e06df263182d4deafb238aab0
Parents: ba8538d
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Mon Sep 21 16:28:41 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Mon Sep 21 16:28:41 2015 -0400
----------------------------------------------------------------------
.../ApplicationRegister.java | 12 +++--
.../ExperimentExecution.java | 8 ++--
.../FrameworkBootstrapping.java | 6 +--
.../utils/TestFrameworkConstants.java | 2 +-
.../main/resources/airavata-client.properties | 10 ++---
.../src/main/resources/test-framework.json | 46 ++++++--------------
6 files changed, 31 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d6b735b5/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 c02daa5..3ad1d59 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
@@ -58,12 +58,12 @@ public class ApplicationRegister {
public ApplicationRegister(Airavata.Client airavata, TestFrameworkProps props) throws Exception {
this.airavata = airavata;
+ authzToken = new AuthzToken("emptyToken");
allGateways = getAllGateways(airavata);
applicationInterfaceListPerGateway = new HashMap<String, String>();
applicationDeployementListPerGateway = new HashMap<String, String>();
FrameworkUtils frameworkUtils = FrameworkUtils.getInstance();
gatewaysToAvoid = frameworkUtils.getGatewayListToAvoid(props.getSkippedGateways());
- authzToken = new AuthzToken("emptyToken");
}
public List<Gateway> getAllGateways(Airavata.Client client) throws Exception{
@@ -82,8 +82,6 @@ public class ApplicationRegister {
String resourceName = allComputeResourceNames.get(resourceId);
if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.STAMPEDE_RESOURCE_NAME)){
stampedeResourceId = resourceId;
- }else if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.TRESTLES_RESOURCE_NAME)){
- trestlesResourceId = resourceId;
}else if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.BR2_RESOURCE_NAME)){
br2ResourceId = resourceId;
}else if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.GORDEN_RESOURCE_NAME)){
@@ -92,10 +90,10 @@ public class ApplicationRegister {
alamoResourceId = resourceId;
}
}
- addUltrascanApplication();
-// addAmberApplication();
-// addEchoApplication();
-// addLAMMPSApplication();
+// addUltrascanApplication();
+ addAmberApplication();
+ addEchoApplication();
+ addLAMMPSApplication();
}
protected void addAmberApplication () throws Exception{
http://git-wip-us.apache.org/repos/asf/airavata/blob/d6b735b5/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 ab5b521..49af1ce 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
@@ -78,10 +78,10 @@ public class ExperimentExecution {
TestFrameworkProps props) throws Exception {
this.airavata = airavata;
this.csTokens = tokenMap;
+ authzToken = new AuthzToken("emptyToken");
this.appInterfaceMap = getApplicationMap(tokenMap);
this.propertyReader = new PropertyReader();
this.properties = props;
- authzToken = new AuthzToken("emptyToken");
FrameworkUtils frameworkUtils = FrameworkUtils.getInstance();
testUser = props.getTestUserName();
gatewaysToAvoid = frameworkUtils.getGatewayListToAvoid(properties.getSkippedGateways());
@@ -331,7 +331,7 @@ public class ExperimentExecution {
experimentsWithTokens.put(experimentId, token);
experimentsWithGateway.put(experimentId, gatewayId);
} else if (hostName.equals(TestFrameworkConstants.AppcatalogConstants.BR2_RESOURCE_NAME)) {
- ComputationalResourceSchedulingModel scheduling = ExperimentModelUtil.createComputationResourceScheduling(hostId, 4, 1, 1, "normal", 20, 0);
+ ComputationalResourceSchedulingModel scheduling = ExperimentModelUtil.createComputationResourceScheduling(hostId, 4, 1, 1, "cpu", 20, 0);
UserConfigurationDataModel userConfigurationData = new UserConfigurationDataModel();
userConfigurationData.setAiravataAutoSchedule(false);
userConfigurationData.setOverrideManualScheduledParams(false);
@@ -483,7 +483,7 @@ public class ExperimentExecution {
createAmberWithErrorInputs(gatewayId, token, projectID, id, appId);
createAmberWithErrorUserConfig(gatewayId, token, projectID, id, appId);
} else if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.BR2_RESOURCE_NAME)) {
- ComputationalResourceSchedulingModel scheduling = ExperimentModelUtil.createComputationResourceScheduling(id, 4, 1, 1, "normal", 20, 0);
+ ComputationalResourceSchedulingModel scheduling = ExperimentModelUtil.createComputationResourceScheduling(id, 4, 1, 1, "cpu", 20, 0);
UserConfigurationDataModel userConfigurationData = new UserConfigurationDataModel();
userConfigurationData.setAiravataAutoSchedule(false);
userConfigurationData.setOverrideManualScheduledParams(false);
@@ -667,7 +667,7 @@ public class ExperimentExecution {
experimentsWithTokens.put(experimentId, token);
experimentsWithGateway.put(experimentId, gatewayId);
} else if (resourceName.equals(TestFrameworkConstants.AppcatalogConstants.BR2_RESOURCE_NAME)) {
- ComputationalResourceSchedulingModel scheduling = ExperimentModelUtil.createComputationResourceScheduling(id, 4, 1, 1, "normal", 20, 0);
+ ComputationalResourceSchedulingModel scheduling = ExperimentModelUtil.createComputationResourceScheduling(id, 4, 1, 1, "cpu", 20, 0);
UserConfigurationDataModel userConfigurationData = new UserConfigurationDataModel();
userConfigurationData.setAiravataAutoSchedule(false);
userConfigurationData.setOverrideManualScheduledParams(false);
http://git-wip-us.apache.org/repos/asf/airavata/blob/d6b735b5/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 d4878fd..3f6c73f 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
@@ -82,9 +82,9 @@ public class FrameworkBootstrapping {
}else if (expExec){
tokens = readTokens();
experimentExecution = new ExperimentExecution(setup.getAiravata(), tokens, setup.getTestFrameworkProps());
- experimentExecution.createUltrascanExperiment();
-// experimentExecution.createEchoExperiment();
-// experimentExecution.createAmberExperiment();
+// experimentExecution.createUltrascanExperiment();
+ experimentExecution.createEchoExperiment();
+ experimentExecution.createAmberExperiment();
experimentExecution.launchExperiments();
experimentExecution.monitorExperiments();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/d6b735b5/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 f3cd66f..6d1c100 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
@@ -69,7 +69,7 @@ public class TestFrameworkConstants {
}
public static final class AppcatalogConstants {
- public static final String AMBER_APP_NAME = "amber_sander";
+ public static final String AMBER_APP_NAME = "Amber_Sander";
public static final String ECHO_NAME = "Echo";
public static final String ULTRASCAN = "Ultrascan";
public static final String ESPRESSO_NAME = "ESPRESSO";
http://git-wip-us.apache.org/repos/asf/airavata/blob/d6b735b5/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-client.properties
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-client.properties b/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-client.properties
index 90024c1..d41d5b0 100644
--- a/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-client.properties
+++ b/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-client.properties
@@ -30,7 +30,7 @@
###########################################################################
# Airavata Thrift Server configurations
###########################################################################
-thrift.server.host=gw153.iu.xsede.org
+thrift.server.host=gw56.iu.xsede.org
thrift.server.port=8930
###########################################################################
@@ -39,9 +39,9 @@ thrift.server.port=8930
credential.store.keystore.url=/Users/chathuri/dev/airavata/credential-store/oa4mp/airavata_sym.jks
credential.store.keystore.alias=airavata
credential.store.keystore.password=airavata
-credential.store.jdbc.url=jdbc:mysql://gw85.iu.xsede.org:3306/airavata_gw153
-credential.store.jdbc.user=SciGaP15Deploy
-credential.store.jdbc.password=SciGaP15Deploy
+credential.store.jdbc.url=jdbc:mysql://gw85.iu.xsede.org:3306/exp_catalog16
+credential.store.jdbc.user=gtaDevUser
+credential.store.jdbc.password=gtaDevPWD
credential.store.jdbc.driver=com.mysql.jdbc.Driver
@@ -49,7 +49,7 @@ credential.store.jdbc.driver=com.mysql.jdbc.Driver
# rabbitMQ related properties - monitoring is done with rabbitMQ
######################################################################
rabbitmq.exchange.name=airavata_rabbitmq_exchange
-rabbitmq.broker.url=amqp://localhost:5672
+rabbitmq.broker.url=amqp://airavata:airavata@gw56.iu.xsede.org:5672/messaging
http://git-wip-us.apache.org/repos/asf/airavata/blob/d6b735b5/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 3a3556a..6f9183c 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
@@ -2,46 +2,26 @@
"gcount": 1,
"gname": "testGateway",
"gdomain": ".airavata.org",
- "testUserName": "testUser",
+ "testUserName": "admin",
"testProjectName": "test.project",
"sshPubKeyLoc": "/Users/chathuri/Desktop/ssh_gw111/id_rsa.pub",
"sshPrivateKeyLoc": "/Users/chathuri/Desktop/ssh_gw111/id_rsa",
"sshPassword": "ultrascan",
- "sshUsername": "us3",
+ "sshUsername": "ogce",
"tokenFileLoc": "/tmp/",
"resultFileLoc": "/tmp/test_framework_results/",
- "skippedGateways": "default,php_reference_gateway,umass",
- "injectErrors" : true,
- "numberOfIterations" : 10,
+ "skippedGateways": "php_reference_gateway,umass",
+ "injectErrors" : false,
+ "numberOfIterations" : 1,
"resources": [
{
- "name": "trestles.sdsc.xsede.org",
- "loginUser": "us3"
-
- },
- {
"name": "stampede.tacc.xsede.org",
- "loginUser": "us3"
-
- },
- {
- "name": "gordon.sdsc.edu",
- "loginUser": "us3"
-
- },
- {
- "name": "alamo.uthscsa.edu",
- "loginUser": "us3"
+ "loginUser": "ogce"
},
{
"name": "comet.sdsc.edu",
- "loginUser": "us3"
-
- },
- {
- "name": "lonestar.tacc.utexas.edu",
- "loginUser": "us3"
+ "loginUser": "ogce"
},
{
@@ -54,9 +34,9 @@
{
"name": "amber_sander",
"inputs": {
- "heatRst": "/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES/02_Heat.rst",
- "prodIn": "/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES/03_Prod.in",
- "prmtop": "/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES/prmtop"
+ "Heat-Restart-File": "/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES1/02_Heat.rst",
+ "Parameter-Topology-File": "/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES1/03_Prod.in",
+ "Production-Control-File": "/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES1/prmtop"
}
},
{
@@ -74,9 +54,9 @@
"application": "amber_sander",
"resoureName": "stampede.tacc.xsede.org",
"errorFeeds": {
- "heatRst": "/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES1/02_Heat.rst",
- "prodIn": "/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES1/03_Prod.in",
- "prmtop": "/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES1/prmtop"
+ "Heat-Restart-File": "/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES1/02_Heat.rst",
+ "Parameter-Topology-File": "/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES1/03_Prod.in",
+ "Production-Control-File": "/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES1/prmtop"
}
},
{