airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [44/61] [abbrv] airavata git commit: updating the resource layer to support new custom node/cpu/walltime configurations
Date Wed, 24 May 2017 21:34:54 GMT
updating the resource layer to support new custom node/cpu/walltime configurations


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

Branch: refs/heads/master
Commit: e988672bce256cdc650f90d0f8000f0b154fda98
Parents: 56bc4be
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Mon May 15 10:49:45 2017 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Mon May 15 10:49:45 2017 -0400

----------------------------------------------------------------------
 .../core/app/catalog/impl/ApplicationDeploymentImpl.java    | 2 ++
 .../registry/core/app/catalog/util/AppCatalogJPAUtils.java  | 5 +++++
 .../core/app/catalog/util/AppCatalogThriftConversion.java   | 9 +++++++++
 3 files changed, 16 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/e988672b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationDeploymentImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationDeploymentImpl.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationDeploymentImpl.java
index 3ab169b..cfe3fe1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationDeploymentImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationDeploymentImpl.java
@@ -65,6 +65,7 @@ public class ApplicationDeploymentImpl implements ApplicationDeployment
{
             deploymentResource.setDefaultQueueName(deploymentDescription.getDefaultQueueName());
             deploymentResource.setDefaultCPUCount(deploymentDescription.getDefaultCPUCount());
             deploymentResource.setDefaultNodeCount(deploymentDescription.getDefaultNodeCount());
+            deploymentResource.setDefaultWalltime(deploymentDescription.getDefaultWalltime());
             deploymentResource.setEditableByUser(deploymentDescription.isEditableByUser());
             ApplicationParallelismType parallelism = deploymentDescription.getParallelism();
             if (parallelism != null){
@@ -173,6 +174,7 @@ public class ApplicationDeploymentImpl implements ApplicationDeployment
{
             existingDep.setDefaultQueueName(updatedDeployment.getDefaultQueueName());
             existingDep.setDefaultCPUCount(updatedDeployment.getDefaultCPUCount());
             existingDep.setDefaultNodeCount(updatedDeployment.getDefaultNodeCount());
+            existingDep.setDefaultWalltime(updatedDeployment.getDefaultWalltime());
             existingDep.setEditableByUser(updatedDeployment.isEditableByUser());
             if (updatedDeployment.getParallelism() != null){
                 existingDep.setParallelism(updatedDeployment.getParallelism().toString());

http://git-wip-us.apache.org/repos/asf/airavata/blob/e988672b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
index ab00192..04cf776 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
@@ -541,6 +541,10 @@ public class AppCatalogJPAUtils {
             computeResourceResource.setCreatedTime(o.getCreationTime());
             computeResourceResource.setEnabled(o.getEnabled());
             computeResourceResource.setMaxMemoryPerNode(o.getMaxMemoryPerNode());
+            computeResourceResource.setCpusPerNode(o.getCpusPerNode());
+            computeResourceResource.setDefaultNodeCount(o.getDefaultNodeCount());
+            computeResourceResource.setDefaultCPUCount(o.getDefaultCPUCount());
+            computeResourceResource.setDefaultWalltime(o.getDefaultWalltime());
             computeResourceResource.setGatewayUsageExec(o.getGatewayUsageExec());
             computeResourceResource.setGatewayUsageModLoadCMD(o.getGatewayUsageModLoadCMD());
             computeResourceResource.setGatewayUsageReporting(o.isGatewayUsageReporting());
@@ -780,6 +784,7 @@ public class AppCatalogJPAUtils {
             resource.setDefaultQueueName(o.getDefaultQueueName());
             resource.setDefaultNodeCount(o.getDefaultNodeCount());
             resource.setDefaultCPUCount(o.getDefaultCPUCount());
+            resource.setDefaultWalltime(o.getDefaultWalltime());
             resource.setEditableByUser(o.isEditableByUser());
             resource.setModuleResource((AppModuleResource) createApplicationModule(o.getApplicationModule()));
             resource.setHostResource((ComputeResourceResource) createComputeResource(o.getComputeResource()));

http://git-wip-us.apache.org/repos/asf/airavata/blob/e988672b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
index 0e9acc1..690f6d2 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
@@ -51,6 +51,10 @@ public class AppCatalogThriftConversion {
         resource.setResourceDescription(description.getResourceDescription());
         resource.setResourceId(description.getComputeResourceId());
         resource.setMaxMemoryPerNode(description.getMaxMemoryPerNode());
+        resource.setCpusPerNode(description.getCpusPerNode());
+        resource.setDefaultNodeCount(description.getDefaultNodeCount());
+        resource.setDefaultCPUCount(description.getDefaultCPUCount());
+        resource.setDefaultWalltime(description.getDefaultWallltime());
         resource.setEnabled(description.isEnabled());
         resource.setGatewayUsageReporting(description.isGatewayUsageReporting());
         resource.setGatewayUsageExec(description.getGatewayUsageExecutable());
@@ -73,6 +77,10 @@ public class AppCatalogThriftConversion {
         description.setHostName(resource.getHostName());
         description.setResourceDescription(resource.getResourceDescription());
         description.setMaxMemoryPerNode(resource.getMaxMemoryPerNode());
+        description.setCpusPerNode(resource.getCpusPerNode());
+        description.setDefaultNodeCount(resource.getDefaultNodeCount());
+        description.setDefaultCPUCount(resource.getDefaultCPUCount());
+        description.setDefaultWallltime(resource.getDefaultWalltime());
         description.setEnabled(resource.isEnabled());
         description.setGatewayUsageReporting(resource.isGatewayUsageReporting());
         description.setGatewayUsageExecutable(resource.getGatewayUsageExec());
@@ -724,6 +732,7 @@ public class AppCatalogThriftConversion {
         description.setDefaultQueueName(resource.getDefaultQueueName());
         description.setDefaultCPUCount(resource.getDefaultCPUCount());
         description.setDefaultNodeCount(resource.getDefaultNodeCount());
+        description.setDefaultWalltime(resource.getDefaultWalltime());
         description.setEditableByUser(resource.isEditableByUser());
 
         ModuleLoadCmdResource cmdResource = new ModuleLoadCmdResource();


Mime
View raw message