Repository: airavata Updated Branches: refs/heads/master d233abda3 -> 7e022eff0
fixing gsissh protocol data retrieving issue Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3eac761c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3eac761c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3eac761c Branch: refs/heads/master Commit: 3eac761cd1b8e32902d7b84efe05869a8e73bf68 Parents: 650e545 Author: Saminda Wijeratne <[email protected]> Authored: Fri May 23 11:32:12 2014 -0700 Committer: Saminda Wijeratne <[email protected]> Committed: Fri May 23 11:32:12 2014 -0700 ---------------------------------------------------------------------- .../api/server/handler/ApplicationCatalogHandler.java | 1 + .../main/resources/samples/list-compute-resources.php | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/3eac761c/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java index 6b205bb..050748d 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java @@ -215,6 +215,7 @@ public class ApplicationCatalogHandler implements Iface { d.setPostJobCommands(Arrays.asList(gsisshHostType.getPostJobCommandsArray())); d.setPreJobCommands(Arrays.asList(gsisshHostType.getPreJobCommandsArray())); d.setSshPort(gsisshHostType.getPort()); + d.setResourceJobManager(ResourceJobManager.SLURM); } else { throw new Exception("Saved job protocol is not GSISSH"); } http://git-wip-us.apache.org/repos/asf/airavata/blob/3eac761c/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/samples/list-compute-resources.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/samples/list-compute-resources.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/samples/list-compute-resources.php index fa71430..4ff8a6f 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/samples/list-compute-resources.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/samples/list-compute-resources.php @@ -34,9 +34,10 @@ use Airavata\API\AppCatalog\ApplicationCatalogAPIClient; use Airavata\Model\Workspace\Experiment\Experiment; 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('gw111.iu.xsede.org', 8931); +$transport = new TSocket('localhost', 8931); $protocol = new TBinaryProtocol($transport); $airavataclient = new ApplicationCatalogAPIClient($protocol); @@ -62,6 +63,13 @@ foreach($id_list as $id){ $globus_data=$airavataclient->getGlobusJobSubmissionProtocol($protocol_data_id); echo "\t\t\tGate Keeper Endpoint(s) : ".implode(",",($globus_data->globusGateKeeperEndPoint))."\n"; break; + case JobSubmissionProtocol::GSISSH: + $gsissh_data=$airavataclient->getGSISSHJobSubmissionProtocol($protocol_data_id); + echo "\t\t\tResource Job Manager : ".ResourceJobManager::$__names[$gsissh_data->resourceJobManager]."\n"; + echo "\t\t\tInstalled Path : ".$gsissh_data->installedPath."\n"; + echo "\t\t\tSSH port : ".$gsissh_data->sshPort."\n"; + echo "\t\t\tMonitor Mode : ".$gsissh_data->monitorMode."\n"; + break; } } echo "\t"."Data Movement Data : ".count($compute_resource->dataMovementProtocols)."\n"; @@ -87,4 +95,3 @@ $transport->close(); ?> -
