Repository: airavata-php-gateway Updated Branches: refs/heads/develop c72500f26 -> ec716283f
setting queue specific defaults in get queueView method 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/ec716283 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ec716283 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ec716283 Branch: refs/heads/develop Commit: ec716283fcebc40e2e989873b4c6bd1c65463d12 Parents: c72500f Author: scnakandala <[email protected]> Authored: Mon May 22 14:29:28 2017 -0400 Committer: scnakandala <[email protected]> Committed: Mon May 22 14:29:28 2017 -0400 ---------------------------------------------------------------------- app/controllers/ExperimentController.php | 34 ++++++++++++++++++++------- 1 file changed, 25 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ec716283/app/controllers/ExperimentController.php ---------------------------------------------------------------------- diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php index e025251..b41d4f0 100755 --- a/app/controllers/ExperimentController.php +++ b/app/controllers/ExperimentController.php @@ -484,7 +484,7 @@ class ExperimentController extends BaseController if($correctAppDeployment != null){ if($correctAppDeployment->defaultNodeCount > 0){ - + $nodeCount = $correctAppDeployment->defaultNodeCount; } if($correctAppDeployment->defaultCPUCount > 0){ $cpuCount = $correctAppDeployment->defaultCPUCount; @@ -495,25 +495,40 @@ class ExperimentController extends BaseController } $queues = ExperimentUtilities::getQueueDatafromResourceId($computeResourceId); - $queueDefaults = array("queueName" => Config::get('pga_config.airavata')["queue-name"], - "nodeCount" => $nodeCount, - "cpuCount" => $cpuCount, - "wallTimeLimit" => $wallTimeLimit - ); + + $queueName = Config::get('pga_config.airavata')["queue-name"]; + $userComputeResourcePreferences = URPUtilities::get_all_user_compute_resource_prefs(); $userHasComputeResourcePreference = array_key_exists($computeResourceId, $userComputeResourcePreferences); + if ($userHasComputeResourcePreference) { - $queueDefaults["queueName"] = $userComputeResourcePreferences[$computeResourceId]->preferredBatchQueue; + $queueName = $userComputeResourcePreferences[$computeResourceId]->preferredBatchQueue; }else{ foreach($queues as $aQueue){ if($aQueue->isDefaultQueue){ - $queueDefaults["queueName"] = $aQueue->queueName; + $queueName = $aQueue->queueName; + if($aQueue->defaultNodeCount > 0){ + $nodeCount = $aQueue->defaultNodeCount; + } + if($aQueue->defauktCPUCount > 0){ + $cpuCount = $aQueue->defaultCPUCount; + } + if($aQueue->defaultWalltime > 0){ + $wallTimeLimit = $aQueue->defaultWalltime; + } break; } } } + + $queueDefaults = array("queueName" => $queueName, + "nodeCount" => $nodeCount, + "cpuCount" => $cpuCount, + "wallTimeLimit" => $wallTimeLimit + ); + return View::make("partials/experiment-queue-block", array("queues" => $queues, "queueDefaults" => $queueDefaults, "useUserCRPref" => $userHasComputeResourcePreference, "userHasComputeResourcePreference" => $userHasComputeResourcePreference, @@ -542,7 +557,8 @@ class ExperimentController extends BaseController $can_write = array(); foreach ($expContainer as $experiment) { if(Config::get('pga_config.airavata')["data-sharing-enabled"]){ - $can_write[$experiment['experiment']->experimentId] = SharingUtilities::userCanWrite(Session::get("username"), $experiment['experiment']->experimentId, ResourceType::EXPERIMENT); + $can_write[$experiment['experiment']->experimentId] = SharingUtilities::userCanWrite(Session::get("username"), + $experiment['experiment']->experimentId, ResourceType::EXPERIMENT); } else { $can_write[$experiment['experiment']->experimentId] = true; }
