airavata-php-gateway git commit: default values should only be read from the queue

[scnakandala]

Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop caab014ce -> fe8cd3e20


default values should only be read from the queue


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/fe8cd3e2
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/fe8cd3e2
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/fe8cd3e2

Branch: refs/heads/develop
Commit: fe8cd3e20399401eea9e2d30787593593d9b4357
Parents: caab014
Author: scnakandala <supun.nakand...@gmail.com>
Authored: Mon May 22 14:42:45 2017 -0400
Committer: scnakandala <supun.nakand...@gmail.com>
Committed: Mon May 22 14:42:45 2017 -0400

----------------------------------------------------------------------
 app/controllers/ExperimentController.php | 70 +++++++++++++--------------
 1 file changed, 34 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/fe8cd3e2/app/controllers/ExperimentController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ExperimentController.php 
b/app/controllers/ExperimentController.php
index 438d592..6d7a874 100755
--- a/app/controllers/ExperimentController.php
+++ b/app/controllers/ExperimentController.php
@@ -454,51 +454,49 @@ class ExperimentController extends BaseController
 
     public function getQueueView()
     {
-        $appId = Session::get('exp_create_app_id');
+//        $appId = Session::get('exp_create_app_id');
         $computeResourceId = Input::get("crId");
-        $appDeployments = 
Airavata::getAllApplicationDeployments(Session::get('authz-token'), 
Session::get("gateway_id"));
+//        $appDeployments = 
Airavata::getAllApplicationDeployments(Session::get('authz-token'), 
Session::get("gateway_id"));
 
         $nodeCount = Config::get('pga_config.airavata')["node-count"];
         $cpuCount = Config::get('pga_config.airavata')["total-cpu-count"];
         $wallTimeLimit = Config::get('pga_config.airavata')["wall-time-limit"];
+        $queueName = Config::get('pga_config.airavata')["queue-name"];
 
-        $crResource = CRUtilities::get_compute_resource($computeResourceId);
-        $cpusPerNode = $crResource->cpusPerNode;
-        if($crResource->defaultNodeCount > 0){
-            $nodeCount = $crResource->defaultNodeCount;
-        }
-        if($crResource->defaultCPUCount > 0){
-            $cpuCount = $crResource->defaultCPUCount;
-        }
-        if($crResource->defaultWalltime > 0){
-            $wallTimeLimit = $crResource->defaultWalltime;
-        }
-
-        $correctAppDeployment = null;
-        foreach($appDeployments as $appDeployment){
-            if($appDeployment->computeHostId == $computeResourceId && 
$appDeployment->appModuleId == $appId){
-                $correctAppDeployment = $appDeployment;
-                break;
-            }
-        }
-
-        if($correctAppDeployment != null){
-            if($correctAppDeployment->defaultNodeCount > 0){
-                $nodeCount = $correctAppDeployment->defaultNodeCount;
-            }
-            if($correctAppDeployment->defaultCPUCount > 0){
-                $cpuCount = $correctAppDeployment->defaultCPUCount;
-            }
-            if($correctAppDeployment->defaultWalltime > 0) {
-                $wallTimeLimit = $correctAppDeployment->defaultWalltime;
-            }
-        }
+//        $crResource = CRUtilities::get_compute_resource($computeResourceId);
+//        $cpusPerNode = $crResource->cpusPerNode;
+//        if($crResource->defaultNodeCount > 0){
+//            $nodeCount = $crResource->defaultNodeCount;
+//        }
+//        if($crResource->defaultCPUCount > 0){
+//            $cpuCount = $crResource->defaultCPUCount;
+//        }
+//        if($crResource->defaultWalltime > 0){
+//            $wallTimeLimit = $crResource->defaultWalltime;
+//        }
+
+//        $correctAppDeployment = null;
+//        foreach($appDeployments as $appDeployment){
+//            if($appDeployment->computeHostId == $computeResourceId && 
$appDeployment->appModuleId == $appId){
+//                $correctAppDeployment = $appDeployment;
+//                break;
+//            }
+//        }
+//
+//        if($correctAppDeployment != null){
+//            if($correctAppDeployment->defaultNodeCount > 0){
+//                $nodeCount = $correctAppDeployment->defaultNodeCount;
+//            }
+//            if($correctAppDeployment->defaultCPUCount > 0){
+//                $cpuCount = $correctAppDeployment->defaultCPUCount;
+//            }
+//            if($correctAppDeployment->defaultWalltime > 0) {
+//                $wallTimeLimit = $correctAppDeployment->defaultWalltime;
+//            }
+//        }
 
         $queues = 
ExperimentUtilities::getQueueDatafromResourceId($computeResourceId);
 
-        $queueName = Config::get('pga_config.airavata')["queue-name"];
-
-
         $userComputeResourcePreferences = 
URPUtilities::get_all_user_compute_resource_prefs();
         $userHasComputeResourcePreference = 
array_key_exists($computeResourceId, $userComputeResourcePreferences);