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/05/15 20:58:38 UTC
[3/4] airavata-php-gateway git commit: ability update default node,
cpu and walltimes from CR and app deployment definitions
ability update default node, cpu and walltimes from CR and app deployment definitions
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/badb6a85
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/badb6a85
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/badb6a85
Branch: refs/heads/develop
Commit: badb6a85f115294b3bcd2c6ec91c72d0c49fed28
Parents: 753a340
Author: scnakandala <su...@gmail.com>
Authored: Mon May 15 15:48:50 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon May 15 15:48:50 2017 -0400
----------------------------------------------------------------------
app/controllers/ComputeResourceController.php | 4 +
app/libraries/Airavata/API/Airavata.php | 11335 ++++++++++-------
app/libraries/Airavata/API/Error/Types.php | 82 +
.../Model/AppCatalog/AppDeployment/Types.php | 25 +-
.../Model/AppCatalog/ComputeResource/Types.php | 94 +
.../Airavata/Model/Application/Io/Types.php | 6 +-
.../Airavata/Model/Data/Replica/Types.php | 572 +-
.../Airavata/Model/Messaging/Event/Types.php | 2 +
app/libraries/Airavata/Model/User/Types.php | 279 +-
app/storage/.gitignore | 0
app/storage/cache/.gitignore | 0
app/storage/logs/.gitignore | 0
app/storage/meta/.gitignore | 0
app/storage/sessions/.gitignore | 0
app/storage/views/.gitignore | 0
app/views/partials/deployment-block.blade.php | 15 +
app/views/resource/edit.blade.php | 20 +
app/views/resource/view.blade.php | 20 +
18 files changed, 7573 insertions(+), 4881 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/app/controllers/ComputeResourceController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ComputeResourceController.php b/app/controllers/ComputeResourceController.php
index c40270c..e296888 100755
--- a/app/controllers/ComputeResourceController.php
+++ b/app/controllers/ComputeResourceController.php
@@ -95,6 +95,10 @@ class ComputeResourceController extends BaseController
$computeDescription->ipAddresses = array_unique(array_filter(Input::get("ips")));
$computeDescription->resourceDescription = Input::get("description");
$computeDescription->maxMemoryPerNode = Input::get("maxMemoryPerNode");
+ $computeDescription->cpusPerNode = Input::get("cpusPerNode");
+ $computeDescription->defaultNodeCount = Input::get("defaultNodeCount");
+ $computeDescription->defaultCPUCount = Input::get("defaultCPUCount");
+ $computeDescription->defaultWalltime = Input::get("defaultWalltime");
//var_dump( $computeDescription); exit;
$computeResource = CRUtilities::register_or_update_compute_resource($computeDescription, true);