You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2015/03/03 18:31:42 UTC
[1/2] airavata git commit: Adding a resource user name to compute
resource preference - AIRAVATA-1617
Repository: airavata
Updated Branches:
refs/heads/master 25cf3c97b -> f9f63a025
Adding a resource user name to compute resource preference - AIRAVATA-1617
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3df0250e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3df0250e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3df0250e
Branch: refs/heads/master
Commit: 3df0250ed0c46dff4daf013292f8178eec8634ed
Parents: 25cf3c9
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Mar 3 12:29:17 2015 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Mar 3 12:29:17 2015 -0500
----------------------------------------------------------------------
.../computeResourceModel.thrift | 5 -----
.../gatewayResourceProfileModel.thrift | 20 +++++++++-----------
2 files changed, 9 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/3df0250e/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
index 4747fbc..cb924e9 100644
--- a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
@@ -340,7 +340,6 @@ struct UnicoreJobSubmission {
3: required string unicoreEndPointURL
}
-
/**
* Provider name
**/
@@ -364,10 +363,6 @@ struct CloudJobSubmission {
6: required string userAccountName
}
-
-
-
-
/**
* Job Submission Interfaces
*
http://git-wip-us.apache.org/repos/asf/airavata/blob/3df0250e/airavata-api/thrift-interface-descriptions/gatewayResourceProfileModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/gatewayResourceProfileModel.thrift b/airavata-api/thrift-interface-descriptions/gatewayResourceProfileModel.thrift
index 83c808c..3f384c6 100644
--- a/airavata-api/thrift-interface-descriptions/gatewayResourceProfileModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/gatewayResourceProfileModel.thrift
@@ -32,6 +32,9 @@ include "computeResourceModel.thrift"
* overridebyAiravata:
* If turned true, Airavata will override the preferences of better alternatives exist.
*
+ * loginUserName:
+ * If turned true, Airavata will override the preferences of better alternatives exist.
+ *
* preferredJobSubmissionProtocol:
* For resources with multiple job submission protocols, the gateway can pick a preferred option.
*
@@ -53,11 +56,12 @@ include "computeResourceModel.thrift"
struct ComputeResourcePreference {
1: required string computeResourceId,
2: required bool overridebyAiravata = 1,
- 3: optional computeResourceModel.JobSubmissionProtocol preferredJobSubmissionProtocol,
- 4: optional computeResourceModel.DataMovementProtocol preferredDataMovementProtocol,
- 5: optional string preferredBatchQueue,
- 6: optional string scratchLocation,
- 7: optional string allocationProjectNumber
+ 3: optional string loginUserName,
+ 4: optional computeResourceModel.JobSubmissionProtocol preferredJobSubmissionProtocol,
+ 5: optional computeResourceModel.DataMovementProtocol preferredDataMovementProtocol,
+ 6: optional string preferredBatchQueue,
+ 7: optional string scratchLocation,
+ 8: optional string allocationProjectNumber
}
/**
@@ -66,12 +70,6 @@ struct ComputeResourcePreference {
* gatewayID:
* Unique identifier for the gateway assigned by Airavata. Corelate this to Airavata Admin API Gateway Registration.
*
- * gatewayName:
- * Name of the Gateway.
- *
- * gatewayDescription:
- * A user friendly description of the gateway.
- *
* computeResourcePreferences:
* List of resource preferences for each of the registered compute resources.
*
[2/2] airavata git commit: API Methods to manage credentials -
AIRAVATA-1616
Posted by sm...@apache.org.
API Methods to manage credentials - AIRAVATA-1616
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f9f63a02
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f9f63a02
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f9f63a02
Branch: refs/heads/master
Commit: f9f63a02573a6d53b4203a33ff485a50c2844037
Parents: 3df0250
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Mar 3 12:31:35 2015 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Mar 3 12:31:35 2015 -0500
----------------------------------------------------------------------
.../airavataAPI.thrift | 37 ++++++++++++++++++++
1 file changed, 37 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f9f63a02/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
index cce3563..0c88e8e 100644
--- a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
+++ b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
@@ -101,6 +101,43 @@ service Airavata {
2: airavataErrors.AiravataClientException ace,
3: airavataErrors.AiravataSystemException ase)
+
+ /**
+ * Airavata Adminstrative Funcationality
+ **/
+
+
+ /**
+ * Generate and Register SSH Key Pair with Airavata Credential Store.
+ *
+ * @param gatewayId
+ * The identifier for the requested experiment. This is returned during the create experiment step.
+ *
+ * @param userName
+ * The User for which the credential should be registered. For community accounts, this user is the name of the
+ * community user name. For computational resources, this user name need not be the same user name on resoruces.
+ *
+ * @return airavataCredStoreToken
+ * An SSH Key pair is generated and stored in the credential store and associated with users or community account
+ * belonging to a gateway.
+ *
+ **/
+
+ string generateAndRegisterSSHKeys (1: required string gatewayId, 2: required string userName)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
+
+ string getSSHPubKey (1: required string airavataCredStoreToken)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
+
+ map<string, string> getAllUserSSHPubKeys (1: required string userName)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
+
/**
* Create a Project
*