airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject svn commit: r1328986 - in /incubator/airavata/trunk/modules: distribution/src/main/resources/conf/ test-suite/src/test/java/org/apache/airavata/test/suite/gfac/ test-suite/src/test/resources/
Date Sun, 22 Apr 2012 22:50:06 GMT
Author: smarru
Date: Sun Apr 22 22:50:05 2012
New Revision: 1328986

URL: http://svn.apache.org/viewvc?rev=1328986&view=rev
Log:
updating hosts with ember and adding template information. 

Modified:
    incubator/airavata/trunk/modules/distribution/src/main/resources/conf/host.xml
    incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderMPIRangerTest.java
    incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderPwscfRangerTest.java
    incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java
    incubator/airavata/trunk/modules/test-suite/src/test/resources/gram.properties.template

Modified: incubator/airavata/trunk/modules/distribution/src/main/resources/conf/host.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/src/main/resources/conf/host.xml?rev=1328986&r1=1328985&r2=1328986&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/src/main/resources/conf/host.xml (original)
+++ incubator/airavata/trunk/modules/distribution/src/main/resources/conf/host.xml Sun Apr
22 22:50:05 2012
@@ -39,5 +39,12 @@
         <gram.endpoint>trestles.sdsc.edu:2119/jobmanager-pbs</gram.endpoint>
         <gridftp.endpoint>gsiftp://trestles-dm1.sdsc.xsede.org:2811/</gridftp.endpoint>
     </server>
+    
+    <server>
+        <name>ember</name>
+        <host>ember.ncsa.teragrid.org</host>
+        <gram.endpoint>grid-ember.ncsa.teragrid.org:2811/</gram.endpoint>
+        <gridftp.endpoint>gsiftp://grid-ember.ncsa.teragrid.org:2811/</gridftp.endpoint>
+    </server>
 
 </servers>
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderMPIRangerTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderMPIRangerTest.java?rev=1328986&r1=1328985&r2=1328986&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderMPIRangerTest.java
(original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderMPIRangerTest.java
Sun Apr 22 22:50:05 2012
@@ -63,10 +63,10 @@ public class GramProviderMPIRangerTest {
         properties.load(url.openStream());
         HostDescription host = new HostDescription();
         host.getType().changeType(GlobusHostType.type);
-        host.getType().setHostName(properties.getProperty("gram.name"));
-        host.getType().setHostAddress(properties.getProperty("gram.host"));
+        host.getType().setHostName(properties.getProperty("host.commom.name"));
+        host.getType().setHostAddress(properties.getProperty("host.fqdn.name"));
         ((GlobusHostType) host.getType()).setGridFTPEndPointArray(new String[]{properties.getProperty("gridftp.endpoint")});
-        ((GlobusHostType) host.getType()).setGlobusGateKeeperEndPointArray(new String[]{properties.getProperty("globus.endpoints")});
+        ((GlobusHostType) host.getType()).setGlobusGateKeeperEndPointArray(new String[]{properties.getProperty("gram.endpoints")});
 
         /* Application */
         ApplicationDeploymentDescription appDesc = new ApplicationDeploymentDescription(GramApplicationDeploymentType.type);
@@ -76,12 +76,12 @@ public class GramProviderMPIRangerTest {
         ApplicationDeploymentDescriptionType.ApplicationName name = appDesc.getType().addNewApplicationName();
         name.setStringValue("EchoMPILocal");
         app.setExecutableLocation("/share/home/01437/ogce/airavata-test/mpi-hellow-world");
-        app.setScratchWorkingDirectory(properties.getProperty("scratch.directory"));
+        app.setScratchWorkingDirectory(properties.getProperty("scratch.working.directory"));
         app.setCpuCount(16);
         app.setJobType(MigrationUtil.getJobTypeEnum("MPI"));
         //app.setMinMemory();
         ProjectAccountType projectAccountType = ((GramApplicationDeploymentType) appDesc.getType()).addNewProjectAccount();
-        projectAccountType.setProjectAccountNumber(properties.getProperty("project.name"));
+        projectAccountType.setProjectAccountNumber(properties.getProperty("allocation.charge.number"));
 
         /* Service */
         ServiceDescription serv = new ServiceDescription();
@@ -131,7 +131,7 @@ public class GramProviderMPIRangerTest {
             gsiSecurityContext.setMyproxyUserName(properties.getProperty("myproxy.username"));
             gsiSecurityContext.setMyproxyPasswd(properties.getProperty("myproxy.password"));
             gsiSecurityContext.setMyproxyLifetime(14400);
-            gsiSecurityContext.setTrustedCertLoc(properties.getProperty("certificate.path"));
+            gsiSecurityContext.setTrustedCertLoc(properties.getProperty("ca.certificates.directory"));
 
             ct.addSecurityContext(MYPROXY, gsiSecurityContext);
 

Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderPwscfRangerTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderPwscfRangerTest.java?rev=1328986&r1=1328985&r2=1328986&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderPwscfRangerTest.java
(original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderPwscfRangerTest.java
Sun Apr 22 22:50:05 2012
@@ -42,10 +42,10 @@ public class GramProviderPwscfRangerTest
         properties.load(url.openStream());
         HostDescription host = new HostDescription();
         host.getType().changeType(GlobusHostType.type);
-        host.getType().setHostName(properties.getProperty("gram.name"));
-        host.getType().setHostAddress(properties.getProperty("gram.host"));
+        host.getType().setHostName(properties.getProperty("host.commom.name"));
+        host.getType().setHostAddress(properties.getProperty("host.fqdn.name"));
         ((GlobusHostType) host.getType()).setGridFTPEndPointArray(new String[]{properties.getProperty("gridftp.endpoint")});
-        ((GlobusHostType) host.getType()).setGlobusGateKeeperEndPointArray(new String[]{properties.getProperty("globus.endpoints")});
+        ((GlobusHostType) host.getType()).setGlobusGateKeeperEndPointArray(new String[]{properties.getProperty("gram.endpoints")});
 
         /* Application */
         ApplicationDeploymentDescription appDesc = new ApplicationDeploymentDescription(GramApplicationDeploymentType.type);
@@ -54,13 +54,13 @@ public class GramProviderPwscfRangerTest
         ApplicationDeploymentDescriptionType.ApplicationName name = appDesc.getType().addNewApplicationName();
         name.setStringValue("MockPwscfMPI");
         app.setExecutableLocation("/share/home/01437/ogce/airavata-test/applications/MockPwscf/pwscf.w");
-        app.setScratchWorkingDirectory(properties.getProperty("scratch.directory"));
+        app.setScratchWorkingDirectory(properties.getProperty("scratch.working.directory"));
         app.setStaticWorkingDirectory("/share/home/01437/ogce/airavata-test/applications/MockPwscf");
         app.setCpuCount(4);
         app.setJobType(MigrationUtil.getJobTypeEnum("MPI"));
         app.setMaxWallTime(9);
         ProjectAccountType projectAccountType = ((GramApplicationDeploymentType) appDesc.getType()).addNewProjectAccount();
-        projectAccountType.setProjectAccountNumber(properties.getProperty("project.name"));
+        projectAccountType.setProjectAccountNumber(properties.getProperty("allocation.charge.number"));
 
         /* Service */
         ServiceDescription serv = new ServiceDescription();
@@ -110,7 +110,7 @@ public class GramProviderPwscfRangerTest
             gsiSecurityContext.setMyproxyUserName(properties.getProperty("myproxy.username"));
             gsiSecurityContext.setMyproxyPasswd(properties.getProperty("myproxy.password"));
             gsiSecurityContext.setMyproxyLifetime(14400);
-            gsiSecurityContext.setTrustedCertLoc(properties.getProperty("certificate.path"));
+            gsiSecurityContext.setTrustedCertLoc(properties.getProperty("ca.certificates.directory"));
 
             ct.addSecurityContext(MYPROXY, gsiSecurityContext);
 

Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java?rev=1328986&r1=1328985&r2=1328986&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java
(original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java
Sun Apr 22 22:50:05 2012
@@ -68,10 +68,10 @@ public class GramProviderTest {
         properties.load(url.openStream());
         HostDescription host = new HostDescription();
         host.getType().changeType(GlobusHostType.type);
-        host.getType().setHostName(properties.getProperty("gram.name"));
-        host.getType().setHostAddress(properties.getProperty("gram.host"));
+        host.getType().setHostName(properties.getProperty("host.commom.name"));
+        host.getType().setHostAddress(properties.getProperty("host.fqdn.name"));
         ((GlobusHostType) host.getType()).setGridFTPEndPointArray(new String[]{properties.getProperty("gridftp.endpoint")});
-        ((GlobusHostType) host.getType()).setGlobusGateKeeperEndPointArray(new String[]{properties.getProperty("globus.endpoints")});
+        ((GlobusHostType) host.getType()).setGlobusGateKeeperEndPointArray(new String[]{properties.getProperty("gram.endpoints")});
 
 
         /*
@@ -84,10 +84,10 @@ public class GramProviderTest {
         ApplicationDeploymentDescriptionType.ApplicationName name = appDesc.getType().addNewApplicationName();
         name.setStringValue("EchoLocal");
         app.setExecutableLocation("/bin/echo");
-        app.setScratchWorkingDirectory(properties.getProperty("scratch.directory"));
+        app.setScratchWorkingDirectory(properties.getProperty("scratch.working.directory"));
         app.setCpuCount(1);
         ProjectAccountType projectAccountType = ((GramApplicationDeploymentType) appDesc.getType()).addNewProjectAccount();
-        projectAccountType.setProjectAccountNumber(properties.getProperty("project.name"));
+        projectAccountType.setProjectAccountNumber(properties.getProperty("allocation.charge.number"));
         QueueType queueType = app.addNewQueue();
         queueType.setQueueName("development");
         /*
@@ -142,7 +142,7 @@ public class GramProviderTest {
             gsiSecurityContext.setMyproxyUserName(properties.getProperty("myproxy.username"));
             gsiSecurityContext.setMyproxyPasswd(properties.getProperty("myproxy.password"));
             gsiSecurityContext.setMyproxyLifetime(14400);
-            gsiSecurityContext.setTrustedCertLoc(properties.getProperty("certificate.path"));
+            gsiSecurityContext.setTrustedCertLoc(properties.getProperty("ca.certificates.directory"));
 
             ct.addSecurityContext(MYPROXY, gsiSecurityContext);
 

Modified: incubator/airavata/trunk/modules/test-suite/src/test/resources/gram.properties.template
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/resources/gram.properties.template?rev=1328986&r1=1328985&r2=1328986&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/resources/gram.properties.template
(original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/resources/gram.properties.template
Sun Apr 22 22:50:05 2012
@@ -16,13 +16,50 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-gram.name=
-gram.host=
-gridftp.endpoint=
-globus.endpoints=
-project.name=
+
+# The myproxy server to retrieve the grid credentials
 myproxy.server=
+# Example: XSEDE myproxy server
+#myproxy.server=myproxy.teragrid.org
+
+# The user name and password to fetch grid proxy
 myproxy.username=
 myproxy.password=
-certificate.path=
-scratch.directory=
+
+#Directory with Grid Certification Authority certificates and CRL's
+# The certificates for XSEDE can be downloaded from http://software.xsede.org/security/xsede-certs.tar.gz
+ca.certificates.directory=
+
+# On computational grids, an allocation is awarded with a charge number. On XSEDE, the numbers
are typically of
+#  the format TG-DIS123456
+allocation.charge.number=
+
+# The scratch space with ample space to create temporary working directory on target compute
cluster
+scratch.working.directory=
+
+# Name, FQDN, and gram and gridftp end points of the remote compute cluster 
+host.commom.name=
+host.fqdn.name=
+gridftp.endpoint=
+gram.endpoints=
+
+# Example compute hosts on XSEDE 
+#host.commom.name=Ranger
+#host.fqdn.name=ranger.tacc.teragrid.org
+#gridftp.endpoint=gsiftp://gridftp.ranger.tacc.teragrid.org:2811/
+#gram.endpoints=gatekeeper.ranger.tacc.teragrid.org:2119/jobmanager-sge
+
+#host.commom.name=Lonestar
+#host.fqdn.name=lonestar4.tacc.teragrid.org
+#gridftp.endpoint=gsiftp://gridftp1.ls4.tacc.utexas.edu:2811/
+#gram.endpoints=gridftp1.ls4.tacc.utexas.edu:2119/jobmanager-sge
+
+#host.commom.name=Trestles
+#host.fqdn.name=trestles.sdsc.teragrid.org
+#gridftp.endpoint=gsiftp://trestles.sdsc.edu:2811/
+#gram.endpoints=trestles.sdsc.edu:2119/jobmanager-pbs
+
+#host.commom.name=Ember
+#host.fqdn.name=ember.ncsa.teragrid.org
+#gridftp.endpoint=grid-ember.ncsa.teragrid.org:2811/
+#gram.endpoints=grid-ember.ncsa.teragrid.org:2120/jobmanager-pbs



Mime
View raw message