Skip to content
Permalink
Browse files
Adding thrift as a local library with TLS support enabled
  • Loading branch information
scnakandala committed Sep 5, 2015
1 parent f4514f2 commit 8923665031044afe99d9ea31bd86fbcc7d97fb23
Show file tree
Hide file tree
Showing 52 changed files with 6,772 additions and 13 deletions.
@@ -69,14 +69,14 @@ return array(
'service-url' => 'https://idp.scigap.org:7443/',

/**
* Path to the server certificate file
* Enable HTTPS server verification
*/
'cafile-path' => app_path() . '/resources/security/idp_scigap_org.pem',
'verify-peer' => true,

/**
* Enable HTTPS server verification
* Path to the server certificate file
*/
'verify-peer' => true,
'cafile-path' => app_path() . '/resources/security/idp_scigap_org.pem',

/**
* Allow self signed server certificates
@@ -91,10 +91,12 @@ return array(
* *****************************************************************
*/
'airavata' => [

/**
* Airavata API server location
* Airavata API server location. Use tls:// as the protocol to
* connect TLS enabled Airavata
*/
'airavata-server' => 'gw111.iu.xsede.org',
'airavata-server' => 'gw56.iu.xsede.org',

/**
* Airavata API server port
@@ -7,7 +7,7 @@ class ExperimentController extends BaseController
* Limit used in fetching paginated results
* @var int
*/
var $limit = 10;
var $limit = 20;

/**
* Instantiate a new ExperimentController Instance
@@ -61,7 +61,7 @@ public static function get_experiments_of_time_range($inputs)
$expContainer = array();
$expNum = 0;
foreach ($experiments as $experiment) {
$expValue = ExperimentUtilities::get_experiment_summary_values($experiment, ProjectUtilities::get_project($experiment->projectId), true);
$expValue = ExperimentUtilities::get_experiment_summary_values($experiment, true);
$expContainer[$expNum]['experiment'] = $experiment;
$expValue["editable"] = false;
$expContainer[$expNum]['expValue'] = $expValue;
@@ -38,6 +38,20 @@ public function register()
$this->app['airavata'] = $this->app->share(function($app)
{
try{
// $options = array();
// if(Config::get('pga_config.airavata')['verify-peer']){
// $options = array(
// 'verify-peer'=>Config::get('pga_config.airavata')['verify-peer'],
// 'certfile'=>Config::get('pga_config.airavata')['cafile-path'],
// 'selfsign'=> Config::get('pga_config.airavata')['allow-self-signed-cert']
// );
// }
//
// $transport = new TSSLSocket(
// Config::get('pga_config.airavata')['airavata-server'],
// Config::get('pga_config.airavata')['airavata-port'],
// $options
// );
$transport = new TSocket(
Config::get('pga_config.airavata')['airavata-server'],
Config::get('pga_config.airavata')['airavata-port']
@@ -620,7 +620,7 @@ public static function list_output_files($experiment, $expStatus)
echo "Experiment hasn't completed. Experiment Status is : " . $expStatus;
}

public static function get_experiment_summary_values($experimentSummary, $project, $forSearch = false)
public static function get_experiment_summary_values($experimentSummary, $forSearch = false)
{
// var_dump( $experimentSummary); exit;
$expVal = array();
@@ -840,7 +840,7 @@ public static function get_expsearch_results_with_pagination($inputs, $limit, $o
$expContainer = array();
$expNum = 0;
foreach ($experiments as $experiment) {
$expValue = ExperimentUtilities::get_experiment_summary_values($experiment, ProjectUtilities::get_project($experiment->projectId), true);
$expValue = ExperimentUtilities::get_experiment_summary_values($experiment, true);
$expContainer[$expNum]['experiment'] = $experiment;
if ($expValue["experimentStatusString"] == "FAILED")
$expValue["editable"] = false;
@@ -943,7 +943,7 @@ public static function get_all_user_experiments_with_pagination($limit, $offset)
$expContainer = array();
$expNum = 0;
foreach ($experiments as $experiment) {
$expValue = ExperimentUtilities::get_experiment_summary_values($experiment, ProjectUtilities::get_project($experiment->projectId), true);
$expValue = ExperimentUtilities::get_experiment_summary_values($experiment, true);
$expContainer[$expNum]['experiment'] = $experiment;
if ($expValue["experimentStatusString"] == "FAILED")
$expValue["editable"] = false;

0 comments on commit 8923665

Please sign in to comment.