introducing app catalog server/port configs and using the ini file to load server/port
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/65b084f2 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/65b084f2 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/65b084f2 Branch: refs/heads/master Commit: 65b084f2e6d34fcd700a849304163fd06ceb2d10 Parents: 2ce9c12 Author: Saminda Wijeratne <[email protected]> Authored: Fri May 23 13:17:03 2014 -0700 Committer: Saminda Wijeratne <[email protected]> Committed: Fri May 23 13:17:03 2014 -0700 ---------------------------------------------------------------------- client-samples/add-compute-resources.php | 9 ++++++--- client-samples/airavata-client-properties.ini | 6 ++++++ client-samples/list-application-interfaces.php | 7 +++++-- client-samples/list-compute-resources.php | 7 +++++-- 4 files changed, 22 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/65b084f2/client-samples/add-compute-resources.php ---------------------------------------------------------------------- diff --git a/client-samples/add-compute-resources.php b/client-samples/add-compute-resources.php index 6f5de40..e92b949 100644 --- a/client-samples/add-compute-resources.php +++ b/client-samples/add-compute-resources.php @@ -37,8 +37,11 @@ use Airavata\Model\AppCatalog\DataMovementProtocol; use Airavata\Model\AppCatalog\GSISSHJobSubmission; use Airavata\Model\AppCatalog\ResourceJobManager; -//$transport = new TSocket('gw111.iu.xsede.org', 8930); -$transport = new TSocket('localhost', 8931); +$airavataconfig = parse_ini_file("airavata-client-properties.ini"); + +$transport = new TSocket($airavataconfig['APP_CATALOG_SERVER'], $airavataconfig['APP_CATALOG_PORT']); +$transport->setRecvTimeout($airavataconfig['AIRAVATA_TIMEOUT']); + $protocol = new TBinaryProtocol($transport); $airavataclient = new ApplicationCatalogAPIClient($protocol); @@ -72,4 +75,4 @@ echo "Adding GSISSH protocol data to ".$compute_resource_id."..."; $airavataclient->addGSISSHJobSubmissionProtocol($compute_resource_id, $gsissh_protoco_data); echo "done\n"; $transport->close(); -?> \ No newline at end of file +?> http://git-wip-us.apache.org/repos/asf/airavata/blob/65b084f2/client-samples/airavata-client-properties.ini ---------------------------------------------------------------------- diff --git a/client-samples/airavata-client-properties.ini b/client-samples/airavata-client-properties.ini index ca4b6f6..b7ad4d7 100644 --- a/client-samples/airavata-client-properties.ini +++ b/client-samples/airavata-client-properties.ini @@ -9,3 +9,9 @@ AIRAVATA_PORT = 8930 ; Time out value to give enough breathing room for client to get synchronous responses back AIRAVATA_TIMEOUT = 5000 + +; Host which runs the Application Catalog Server +APP_CATALOG_SERVER = "gw111.iu.xsede.org" + +; Application Catalog Server thrift port +APP_CATALOG_PORT = 8931 http://git-wip-us.apache.org/repos/asf/airavata/blob/65b084f2/client-samples/list-application-interfaces.php ---------------------------------------------------------------------- diff --git a/client-samples/list-application-interfaces.php b/client-samples/list-application-interfaces.php index 473e033..32cef3f 100644 --- a/client-samples/list-application-interfaces.php +++ b/client-samples/list-application-interfaces.php @@ -36,8 +36,11 @@ use Airavata\Model\Workspace\Experiment\Experiment; use Airavata\Model\AppCatalog\JobSubmissionProtocol; use Airavata\Model\AppCatalog\DataMovementProtocol; -//$transport = new TSocket('gw111.iu.xsede.org', 8930); -$transport = new TSocket('localhost', 8931); +$airavataconfig = parse_ini_file("airavata-client-properties.ini"); + +$transport = new TSocket($airavataconfig['APP_CATALOG_SERVER'], $airavataconfig['APP_CATALOG_PORT']); +$transport->setRecvTimeout($airavataconfig['AIRAVATA_TIMEOUT']); + $protocol = new TBinaryProtocol($transport); $airavataclient = new ApplicationCatalogAPIClient($protocol); http://git-wip-us.apache.org/repos/asf/airavata/blob/65b084f2/client-samples/list-compute-resources.php ---------------------------------------------------------------------- diff --git a/client-samples/list-compute-resources.php b/client-samples/list-compute-resources.php index 4ff8a6f..985542f 100644 --- a/client-samples/list-compute-resources.php +++ b/client-samples/list-compute-resources.php @@ -36,8 +36,11 @@ use Airavata\Model\AppCatalog\JobSubmissionProtocol; use Airavata\Model\AppCatalog\DataMovementProtocol; use Airavata\Model\AppCatalog\ResourceJobManager; -//$transport = new TSocket('gw111.iu.xsede.org', 8930); -$transport = new TSocket('localhost', 8931); +$airavataconfig = parse_ini_file("airavata-client-properties.ini"); + +$transport = new TSocket($airavataconfig['APP_CATALOG_SERVER'], $airavataconfig['APP_CATALOG_PORT']); +$transport->setRecvTimeout($airavataconfig['AIRAVATA_TIMEOUT']); + $protocol = new TBinaryProtocol($transport); $airavataclient = new ApplicationCatalogAPIClient($protocol);
