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 2015/12/18 15:52:44 UTC
airavata-php-gateway git commit: adding storageId when assembling the
experiment
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master cdcc0efac -> 33bd2a7b4
adding storageId when assembling the experiment
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/33bd2a7b
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/33bd2a7b
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/33bd2a7b
Branch: refs/heads/master
Commit: 33bd2a7b4a51bc77d233c2fcfb908b641906d20d
Parents: cdcc0ef
Author: scnakandala <su...@gmail.com>
Authored: Fri Dec 18 09:52:37 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Fri Dec 18 09:52:37 2015 -0500
----------------------------------------------------------------------
app/config/pga_config.php.template | 7 ++++++-
app/libraries/ExperimentUtilities.php | 12 +-----------
2 files changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/33bd2a7b/app/config/pga_config.php.template
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php.template b/app/config/pga_config.php.template
index 44b81ce..041004d 100644
--- a/app/config/pga_config.php.template
+++ b/app/config/pga_config.php.template
@@ -156,7 +156,12 @@ return array(
/**
* Life time of app catalog data cache in minutes
*/
- 'app-catalog-cache-duration' => 5
+ 'app-catalog-cache-duration' => 5,
+
+ /**
+ * Gateway data store resource id
+ */
+ 'gateway-data-store-resource-id' => ''
],
/**
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/33bd2a7b/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 14bbb4c..72fdd74 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -183,6 +183,7 @@ class ExperimentUtilities
$userConfigData = new UserConfigurationDataModel();
$userConfigData->computationalResourceScheduling = $scheduling;
+ $userConfigData->storageId = Config::get('pga_config.airavata')['gateway-data-store-resource-id'];
$userConfigData->airavataAutoSchedule = isset($_POST['enable-auto-scheduling']) ? true : false;
if (isset($_POST["userDN"])) {
$userConfigData->generateCert = 1;
@@ -195,18 +196,7 @@ class ExperimentUtilities
if (ExperimentUtilities::$experimentPath == null) {
ExperimentUtilities::create_experiment_folder_path();
}
-
-// $advHandling = new AdvancedOutputDataHandling();
- $hostName = $_SERVER['SERVER_NAME'];
- $expPathConstant = 'file://' . Config::get('pga_config.airavata')['ssh-user'] . '@' . $hostName . ':' . Config::get('pga_config.airavata')['experiment-data-absolute-path'];
-
-// $advHandling->outputDataDir = str_replace(Config::get('pga_config.airavata')['experiment-data-absolute-path'],
-// $expPathConstant, ExperimentUtilities::$experimentPath);
-// $userConfigData->advanceOutputDataHandling = $advHandling;
-
- //TODO: replace constructor with a call to airvata to get a prepopulated experiment template
$experiment = new ExperimentModel();
-
// required
$experiment->projectId = $_POST['project'];
$experiment->userName = Session::get('username');