airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [12/14] airavata git commit: Adding getkeys by gateway api methods - AIRAVATA-1874
Date Wed, 09 Dec 2015 05:09:05 GMT
Adding getkeys by gateway api methods - AIRAVATA-1874


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6a9a1254
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6a9a1254
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6a9a1254

Branch: refs/heads/master
Commit: 6a9a12542fab7f5c2b87fda5841e4e582a83740d
Parents: dd32d06
Author: smarru <smarru@apache.org>
Authored: Tue Dec 8 23:39:33 2015 -0500
Committer: smarru <smarru@apache.org>
Committed: Tue Dec 8 23:53:26 2015 -0500

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |    16 +
 .../java/org/apache/airavata/api/Airavata.java  | 36527 +++++++++++------
 .../main/resources/lib/airavata/Airavata.cpp    | 11861 ++++--
 .../src/main/resources/lib/airavata/Airavata.h  |   163 +
 .../lib/airavata/Airavata_server.skeleton.cpp   |     5 +
 .../resources/lib/Airavata/API/Airavata.php     |  8267 ++--
 .../lib/apache/airavata/api/Airavata-remote     |     7 +
 .../lib/apache/airavata/api/Airavata.py         |  5825 ++-
 .../org/apache/airavata/model/Workflow.java     |     2 +-
 .../ApplicationDeploymentDescription.java       |     2 +-
 .../appdeployment/ApplicationModule.java        |     2 +-
 .../appcatalog/appdeployment/CommandObject.java |     2 +-
 .../appcatalog/appdeployment/SetEnvPaths.java   |     2 +-
 .../ApplicationInterfaceDescription.java        |     2 +-
 .../appcatalog/computeresource/BatchQueue.java  |     2 +-
 .../computeresource/CloudJobSubmission.java     |    24 +-
 .../ComputeResourceDescription.java             |   240 +-
 .../computeresource/GlobusJobSubmission.java    |    56 +-
 .../computeresource/JobSubmissionInterface.java |     2 +-
 .../computeresource/LOCALSubmission.java        |    24 +-
 .../computeresource/ResourceJobManager.java     |     2 +-
 .../computeresource/SSHJobSubmission.java       |    56 +-
 .../computeresource/UnicoreJobSubmission.java   |    24 +-
 .../ComputeResourcePreference.java              |    22 +-
 .../gatewayprofile/GatewayResourceProfile.java  |   273 +-
 .../application/io/InputDataObjectType.java     |     2 +-
 .../application/io/OutputDataObjectType.java    |     2 +-
 .../airavata/model/commons/ErrorModel.java      |     2 +-
 .../model/commons/ValidationResults.java        |     2 +-
 .../airavata/model/commons/ValidatorResult.java |     2 +-
 .../model/error/AiravataClientException.java    |     2 +-
 .../model/error/AiravataSystemException.java    |     2 +-
 .../model/error/AuthenticationException.java    |     4 +-
 .../model/error/AuthorizationException.java     |     2 +-
 .../error/ExperimentNotFoundException.java      |     2 +-
 .../model/error/InvalidRequestException.java    |     2 +-
 .../model/error/LaunchValidationException.java  |     2 +-
 .../model/error/ProjectNotFoundException.java   |     2 +-
 .../airavata/model/error/TimedOutException.java |     2 +-
 .../airavata/model/error/ValidationResults.java |     2 +-
 .../airavata/model/error/ValidatorResult.java   |     2 +-
 .../model/experiment/ExperimentModel.java       |   256 +-
 .../model/experiment/ExperimentStatistics.java  |   218 +-
 .../experiment/ExperimentSummaryModel.java      |     2 +-
 .../experiment/UserConfigurationDataModel.java  |   116 +-
 .../org/apache/airavata/model/job/JobModel.java |     2 +-
 .../event/ExperimentStatusChangeEvent.java      |     2 +-
 .../model/messaging/event/JobIdentifier.java    |     2 +-
 .../messaging/event/JobStatusChangeEvent.java   |     2 +-
 .../event/JobStatusChangeRequestEvent.java      |     2 +-
 .../airavata/model/messaging/event/Message.java |     2 +-
 .../messaging/event/ProcessIdentifier.java      |     2 +-
 .../event/ProcessStatusChangeEvent.java         |     2 +-
 .../event/ProcessStatusChangeRequestEvent.java  |     2 +-
 .../messaging/event/ProcessSubmitEvent.java     |     2 +-
 .../messaging/event/ProcessTerminateEvent.java  |     2 +-
 .../model/messaging/event/TaskIdentifier.java   |     2 +-
 .../messaging/event/TaskOutputChangeEvent.java  |     2 +-
 .../messaging/event/TaskStatusChangeEvent.java  |     2 +-
 .../event/TaskStatusChangeRequestEvent.java     |     2 +-
 .../airavata/model/process/ProcessModel.java    |   323 +-
 .../ComputationalResourceSchedulingModel.java   |     2 +-
 .../airavata/model/security/AuthzToken.java     |     2 +-
 .../airavata/model/status/ExperimentStatus.java |     2 +-
 .../apache/airavata/model/status/JobStatus.java |     2 +-
 .../airavata/model/status/ProcessStatus.java    |     2 +-
 .../airavata/model/status/TaskStatus.java       |     2 +-
 .../model/task/DataStagingTaskModel.java        |     2 +-
 .../model/task/EnvironmentSetupTaskModel.java   |    24 +-
 .../model/task/JobSubmissionTaskModel.java      |     2 +-
 .../airavata/model/task/MonitorTaskModel.java   |     2 +-
 .../apache/airavata/model/task/TaskModel.java   |   170 +-
 .../airavata/model/workspace/Gateway.java       |     2 +-
 .../apache/airavata/model/workspace/Group.java  |     2 +-
 .../airavata/model/workspace/Project.java       |     2 +-
 .../apache/airavata/model/workspace/User.java   |     2 +-
 distribution/src/main/assembly/bin-assembly.xml |     1 +
 .../credential/store/credential/Credential.java |     5 +
 .../server/CredentialStoreServerHandler.java    |    28 +-
 .../store/cpi/CredentialStoreService.java       |  1021 +-
 .../store/datamodel/CertificateCredential.java  |     2 +-
 .../store/datamodel/CommunityUser.java          |     2 +-
 .../store/datamodel/PasswordCredential.java     |     2 +-
 .../store/datamodel/SSHCredential.java          |    70 +-
 .../exception/CredentialStoreException.java     |     2 +-
 .../credentialStoreCPI.thrift                   |     2 +-
 .../airavata-api/airavata_api.thrift            |     6 +
 87 files changed, 43208 insertions(+), 22540 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/6a9a1254/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 9f0e7cc..4124a92 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -308,6 +308,22 @@ public class AiravataServerHandler implements Airavata.Iface {
         }
     }
 
+    @Override
+    public Map<String, String> getAllGatewaySSHPubKeys(AuthzToken authzToken, String
gatewayId) throws InvalidRequestException, AiravataClientException, AiravataSystemException,
TException {
+        try {
+            if (csClient == null){
+                csClient = getCredentialStoreServiceClient();
+            }
+            return csClient.getAllSSHKeysForGateway(gatewayId);
+        }catch (Exception e){
+            logger.error("Error occurred while retrieving SSH public keys for gateway : "
+ gatewayId , e);
+            AiravataSystemException exception = new AiravataSystemException();
+            exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+            exception.setMessage("Error occurred while retrieving SSH public keys for gateway
: " + gatewayId + ". More info : " + e.getMessage());
+            throw exception;
+        }
+    }
+
     /**
      * Create a Project
      *


Mime
View raw message