You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by he...@apache.org on 2012/03/05 21:18:52 UTC
svn commit: r1297212 -
/incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java
Author: heshan
Date: Mon Mar 5 20:18:52 2012
New Revision: 1297212
URL: http://svn.apache.org/viewvc?rev=1297212&view=rev
Log:
AIRAVATA-309 Migrating the gram applications.
Modified:
incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java
Modified: incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java?rev=1297212&r1=1297211&r2=1297212&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java (original)
+++ incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java Mon Mar 5 20:18:52 2012
@@ -165,19 +165,36 @@ public class MigrationUtil {
*/
public static ApplicationDeploymentDescription createAppDeploymentDescription(ApplicationBean appBean) {
ApplicationDeploymentDescription appDesc = new ApplicationDeploymentDescription();
- ApplicationDeploymentDescriptionType app = appDesc.getType();
- ApplicationDeploymentDescriptionType.ApplicationName name =
- ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
- name.setStringValue(appBean.getApplicationName());
- app.setApplicationName(name);
- app.setExecutableLocation(appBean.getExecutable());
- app.setScratchWorkingDirectory(appBean.getTmpDir());
-// TODO : following are not there in the OGCE schema
-// app.setInputDataDirectory("/tmp/input");
-// app.setOutputDataDirectory("/tmp/output");
-// app.setStandardOutput("/tmp/echo.stdout");
-// app.setStandardError("/tmp/echo.stdout");
+ if(appBean.getJobType() != null) {
+ appDesc.getType().changeType(GramApplicationDeploymentType.type);
+ GramApplicationDeploymentType gram = (GramApplicationDeploymentType) appDesc.getType();
+ ApplicationDeploymentDescriptionType.ApplicationName name =
+ ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
+ name.setStringValue(appBean.getApplicationName());
+
+ gram.setApplicationName(name);
+ gram.setExecutableLocation(appBean.getExecutable());
+ gram.setScratchWorkingDirectory(appBean.getTmpDir());
+
+ gram.setJobType(getJobTypeEnum(appBean.getJobType()));
+ // TODO : verify the following
+ ProjectAccountType projectAccount = gram.getProjectAccount();
+ projectAccount.setProjectAccountNumber(appBean.getProjectName());
+ projectAccount.setProjectAccountDescription(appBean.getPcount().toString());
+ QueueType queueName = gram.getQueue();
+ queueName.setQueueName(appBean.getQueue());
+
+ } else {
+ ApplicationDeploymentDescriptionType app = appDesc.getType();
+ ApplicationDeploymentDescriptionType.ApplicationName name =
+ ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
+ name.setStringValue(appBean.getApplicationName());
+
+ app.setApplicationName(name);
+ app.setExecutableLocation(appBean.getExecutable());
+ app.setScratchWorkingDirectory(appBean.getTmpDir());
+ }
return appDesc;
}
@@ -201,4 +218,23 @@ public class MigrationUtil {
app.setScratchWorkingDirectory(appBean.getTmpDir());
return appDesc;
}
+
+ private static JobTypeType.Enum getJobTypeEnum(String jobTypeString){
+ for (JobTypeType.Enum jtype : getJobTypes()) {
+ if (jtype.toString().equalsIgnoreCase(jobTypeString)){
+ return jtype;
+ }
+ }
+ return null;
+ }
+
+ private static List<JobTypeType.Enum> getJobTypes() {
+ List<JobTypeType.Enum> jobTypes;
+ jobTypes = new ArrayList<JobTypeType.Enum>();
+ jobTypes.add(JobTypeType.OPEN_MP);
+ jobTypes.add(JobTypeType.MPI);
+ jobTypes.add(JobTypeType.SERIAL);
+ jobTypes.add(JobTypeType.SINGLE);
+ return jobTypes;
+ }
}