Author: chathuri
Date: Fri Jan 4 15:33:52 2013
New Revision: 1428930
URL: http://svn.apache.org/viewvc?rev=1428930&view=rev
Log:
fixing AIRAVATA-694, AIRAVATA-692 and AIRAVATA-690
Modified:
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ApplicationDescriptor.java
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java
Modified:
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ApplicationDescriptor.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ApplicationDescriptor.java?rev=1428930&r1=1428929&r2=1428930&view=diff
==============================================================================
---
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ApplicationDescriptor.java
(original)
+++
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ApplicationDescriptor.java
Fri Jan 4 15:33:52 2013
@@ -32,6 +32,7 @@ public class ApplicationDescriptor {
private String workingDir;
private String jobType;
private String projectNumber;
+ private String projectDescription;
private String queueName;
private int maxWallTime;
private int cpuCount;
@@ -170,4 +171,12 @@ public class ApplicationDescriptor {
public void setServiceDescriptor(ServiceDescriptor serviceDescriptor) {
this.serviceDescriptor = serviceDescriptor;
}
+
+ public String getProjectDescription() {
+ return projectDescription;
+ }
+
+ public void setProjectDescription(String projectDescription) {
+ this.projectDescription = projectDescription;
+ }
}
Modified:
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java?rev=1428930&r1=1428929&r2=1428930&view=diff
==============================================================================
---
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java
(original)
+++
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java
Fri Jan 4 15:33:52 2013
@@ -125,9 +125,8 @@ public class DescriptorUtil {
String[] gridFTPEndPointArray =
globusHostType.getGridFTPEndPointArray();
for (int i = 0; i < gridFTPEndPointArray.length ; i++){
- gridFTPEndPoint.add(globusGateKeeperEndPointArray[i]);
+ gridFTPEndPoint.add(gridFTPEndPointArray[i]);
}
-
}else if (hostDescriptionType instanceof GsisshHostType){
GsisshHostType gsisshHostType = (GsisshHostType)
hostDescriptionType;
hostType.add(HostTypes.GSISSH_HOST_TYPE);
@@ -257,7 +256,7 @@ public class DescriptorUtil {
name.setStringValue(applicationDescriptor.getName());
applicationDescription.getType().setApplicationName(name);
applicationDescription.getType().setExecutableLocation(applicationDescriptor.getExecutablePath());
-
applicationDescription.getType().setOutputDataDirectory(applicationDescriptor.getWorkingDir());
+
applicationDescription.getType().setScratchWorkingDirectory(applicationDescriptor.getWorkingDir());
//set advanced options according app desc type
if(applicationDescriptor.getApplicationDescType() != null &&
!applicationDescriptor.getApplicationDescType().isEmpty()){
@@ -265,8 +264,14 @@ public class DescriptorUtil {
ApplicationDescription appDesc = new
ApplicationDescription(HpcApplicationDeploymentType.type);
appDesc.getType().setApplicationName(name);
appDesc.getType().setExecutableLocation(applicationDescriptor.getExecutablePath());
-
appDesc.getType().setOutputDataDirectory(applicationDescriptor.getWorkingDir());
+
appDesc.getType().setScratchWorkingDirectory(applicationDescriptor.getWorkingDir());
HpcApplicationDeploymentType app =
(HpcApplicationDeploymentType) appDesc.getType();
+
+ ProjectAccountType projectAccountType =
app.addNewProjectAccount();
+
projectAccountType.setProjectAccountNumber(applicationDescriptor.getProjectNumber());
+
projectAccountType.setProjectAccountDescription(applicationDescriptor.getProjectDescription());
+ app.setProjectAccount(projectAccountType);
+
app.setCpuCount(applicationDescriptor.getCpuCount());
app.setJobType(JobTypeType.Enum.forString(applicationDescriptor.getJobType()));
app.setMaxMemory(applicationDescriptor.getMaxMemory());
@@ -274,6 +279,11 @@ public class DescriptorUtil {
app.setMaxWallTime(applicationDescriptor.getMaxWallTime());
app.setNodeCount(applicationDescriptor.getNodeCount());
app.setProcessorsPerNode(applicationDescriptor.getProcessorsPerNode());
+
+ QueueType queueType = app.addNewQueue();
+ queueType.setQueueName(applicationDescriptor.getQueueName());
+ app.setQueue(queueType);
+
return appDesc;
}
}
@@ -284,9 +294,10 @@ public class DescriptorUtil {
ApplicationDescriptor applicationDescriptor = new
ApplicationDescriptor();
applicationDescriptor.setName(applicationDescription.getType().getApplicationName().getStringValue());
applicationDescriptor.setExecutablePath(applicationDescription.getType().getExecutableLocation());
-
applicationDescriptor.setWorkingDir(applicationDescription.getType().getOutputDataDirectory());
+
applicationDescriptor.setWorkingDir(applicationDescription.getType().getScratchWorkingDirectory());
if(applicationDescription.getType() != null){
if(applicationDescription.getType() instanceof
HpcApplicationDeploymentType){
+
applicationDescriptor.setApplicationDescType(ApplicationDescriptorTypes.HPC_APP_DEP_DESC_TYPE);
HpcApplicationDeploymentType gramApplicationDeploymentType =
(HpcApplicationDeploymentType) applicationDescription.getType();
if(gramApplicationDeploymentType != null){
applicationDescriptor.setCpuCount(gramApplicationDeploymentType.getCpuCount());
@@ -294,9 +305,13 @@ public class DescriptorUtil {
applicationDescriptor.setMaxMemory(gramApplicationDeploymentType.getMaxMemory());
applicationDescriptor.setMinMemory(gramApplicationDeploymentType.getMinMemory());
applicationDescriptor.setMaxWallTime(gramApplicationDeploymentType.getMaxWallTime());
+
applicationDescriptor.setJobType(gramApplicationDeploymentType.getJobType().toString());
+
applicationDescriptor.setProjectNumber(gramApplicationDeploymentType.getProjectAccount().getProjectAccountNumber());
+
applicationDescriptor.setProjectDescription(gramApplicationDeploymentType.getProjectAccount().getProjectAccountDescription());
if(gramApplicationDeploymentType.getQueue() != null){
applicationDescriptor.setQueueName(gramApplicationDeploymentType.getQueue().getQueueName());
}
+
applicationDescriptor.setProcessorsPerNode(gramApplicationDeploymentType.getProcessorsPerNode());
}
}
}
