You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/01/27 20:41:22 UTC

[06/11] airavata git commit: code cleanup

code cleanup


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

Branch: refs/heads/develop
Commit: 6c4ac5a128b8ea2dced763862f77188e0793754a
Parents: cd2abca
Author: Ajinkya Dhamnaskar <ad...@umail.iu.edu>
Authored: Sun Dec 18 13:49:05 2016 -0500
Committer: Ajinkya Dhamnaskar <ad...@umail.iu.edu>
Committed: Sun Dec 18 13:49:05 2016 -0500

----------------------------------------------------------------------
 .../main/resources/airavata-client.properties   | 55 --------------------
 .../main/resources/test-framework.properties    | 45 ----------------
 .../src/main/resources/test-framework.yaml      | 49 -----------------
 3 files changed, 149 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/6c4ac5a1/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
deleted file mode 100644
index d41d5b0..0000000
--- a/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-client.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-###########################################################################
-#
-#  This properties file provides configuration for Airavata Clients: 
-#  XBaya and Airavata API
-#
-###########################################################################
-
-
-
-###########################################################################
-# Airavata Thrift Server configurations
-###########################################################################
-thrift.server.host=gw56.iu.xsede.org
-thrift.server.port=8930
-
-###########################################################################
-# Credential Store module Configuration
-###########################################################################
-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/exp_catalog16
-credential.store.jdbc.user=gtaDevUser
-credential.store.jdbc.password=gtaDevPWD
-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://airavata:airavata@gw56.iu.xsede.org:5672/messaging
-
-
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c4ac5a1/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.properties
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.properties b/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.properties
deleted file mode 100644
index 65a6554..0000000
--- a/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Test environment related properties
-numberof.gateways=10
-generic.gateway.name=testGateway
-generic.gateway.domain=.airavata.org
-users.per.gateway=10
-compute.resoure.list=trestles.sdsc.xsede.org,stampede.tacc.xsede.org,bigred2.uits.iu.edu
-login.usernames=ogce,ogce,cgateway
-application.list=amber_sander,echo
-ssh.pub.key.location=/Users/chathuri/.ssh/id_dsa.pub
-ssh.private.key.location=/Users/chathuri/.ssh/id_dsa
-ssh.password=
-ssh.username=ogce
-token.file.location=/tmp/
-result.file.location=/tmp/test_framework_results/
-gateways.toskip=default,php_reference_gateway,ultrascan,umass
-test.user=testUser
-test.project=testProject
-
-# Application Inputs
-# Amber input file locations
-02_Heat.rst_location=/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES/02_Heat.rst
-03_Prod.in_location=/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES/03_Prod.in
-prmtop_location=/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES/prmtop
-
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c4ac5a1/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.yaml
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.yaml b/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.yaml
deleted file mode 100644
index 6c1a6e6..0000000
--- a/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-gcount: 10
-gname: testGateway
-gdomain: .airavata.org
-testUserName: testUser
-testProjectName : test.project
-sshPubKeyLoc : /Users/chathuri/.ssh/id_dsa.pub
-sshPrivateKeyLoc: /Users/chathuri/.ssh/id_dsa
-sshPassword: password
-sshUsername: ogce
-tokenFileLoc : /tmp/
-resultFileLoc : /tmp/test_framework_results/
-skippedGateways : defaultphp_reference_gatewayultrascanumass
-resources :
-        -name : trestles.sdsc.xsede.org
-        loginUser : ogce
-        -name : stampede.tacc.xsede.org
-        loginUser : ogce
-        -name : bigred2.uits.iu.edu
-        loginUser : cgateway
-
-applications :
-    -name :amber
-      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
-      
-    
-
-errors :
-    name :badinputs
-        application : amber
-        errorFeeds :
-            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
-        
-    
-    name :error.configuration
-        application : amber
-        errorFeeds :
-            projectId : sds128
-            queueName : normal
-            walltime : 10
-            hostName : trestles.sdsc.xsede.org
-        
-    
-
-