airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject git commit: Sync'ing with new app catalog models.
Date Thu, 26 Jun 2014 20:06:16 GMT
Repository: airavata
Updated Branches:
  refs/heads/master fdb3daa5e -> dde984af9


Sync'ing with new app catalog models.


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

Branch: refs/heads/master
Commit: dde984af95ea301e731bc8e29745c964322df6c3
Parents: fdb3daa
Author: Suresh Marru <smarru@apache.org>
Authored: Thu Jun 26 16:06:08 2014 -0400
Committer: Suresh Marru <smarru@apache.org>
Committed: Thu Jun 26 16:06:08 2014 -0400

----------------------------------------------------------------------
 .../applicationInterfaceModel.thrift            |  24 +---
 .../gatewayProfileModel.thrift                  | 124 -------------------
 2 files changed, 6 insertions(+), 142 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/dde984af/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift b/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
index f9f3ca4..907dfa6 100644
--- a/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
@@ -46,7 +46,7 @@ struct InputDataObjectType {
     3: optional DataType type,
     4: optional string metaData
     5: optional string applicationParameter,
-    5: optional string applicationUIDescription
+    6: optional string applicationUIDescription
 }
 
 /**
@@ -63,29 +63,17 @@ struct OutputDataObjectType {
 /**
  * Application Interface Description
  *
- * resourceId:
  *
- * hostName:
- *   Fully Qualified Host Name.
+ * appDeploymentId:
+ *   Corelated the interface to a particular application deployment
  *
- * ipAddress:
- *   IP Addresse of the Hostname.
- *
- * resourceDescription:
- *  A user friendly description of the hostname.
- *
- * JobSubmissionProtocols:
- *  A computational resources may have one or more ways of submitting Jobs. This structure
- *  will hold all available mechanisms to interact with the resource.
- *
- * DataMovementProtocol:
- *  Option to specify a prefered data movement mechanism of the available options.
  *
 */
 struct ApplicationInterfaceDescription {
     1: required bool isEmpty = 0,
     2: required string applicationInterfaceId = DEFAULT_ID,
     3: required string applicationName,
-    7: optional list<InputDataObjectType> applicationInputs,
-    8: optional list<outputDataObjectType> applicationOutputs,
+    4: optional string appDeploymentId,
+    5: optional list<InputDataObjectType> applicationInputs,
+    6: optional list<outputDataObjectType> applicationOutputs,
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/dde984af/airavata-api/thrift-interface-descriptions/gatewayProfileModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/gatewayProfileModel.thrift b/airavata-api/thrift-interface-descriptions/gatewayProfileModel.thrift
index b48f8b2..2b7a02d 100644
--- a/airavata-api/thrift-interface-descriptions/gatewayProfileModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/gatewayProfileModel.thrift
@@ -24,130 +24,6 @@ namespace php Airavata.Model.AppCatalog
 const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS"
 
 /**
- * Enumeration of local resource job managers supported by Airavata
- *
- * FORK:
- *  Forking of commands without any job manager
- *
- * PBS:
- *  Job manager supporting the Portal Batch System (PBS) protocol. Some examples include
TORQUE, PBSPro, Grid Engine.
- *
- * UGE:
- *  Univa Grid Engine, a variation of PBS implementation.
- *
- * SLURM:
- *  The Simple Linux Utility for Resource Management is a open source workload manager.
- *
-*/
-enum ResourceJobManager {
-    FORK,
-    PBS,
-    UGE,
-    SLURM
-}
-
-/**
- * Enumeration of Airavata supported Job Submission Mechanisms for High Perforamance Computing
Clusters.
- *
- * SSH:
- *  Execute remote job submission commands using via secure shell protocol.
- *
- * GRAM:
- *  Execute remote jobs via Globus GRAM service.
- *
- * UNICORE:
- *  Execute remote jobs via Unicore services
- *
-*/
-enum JobSubmissionProtocol {
-    SSH,
-    GSISSH,
-    GRAM,
-    UNICORE
-}
-
-/**
- * Enumeration of data movement supported by Airavata
- *
- * SCP:
- *  Job manager supporting the Portal Batch System (PBS) protocol. Some examples include
TORQUE, PBSPro, Grid Engine.
- *
- * SFTP:
- *  The Simple Linux Utility for Resource Management is a open source workload manager.
- *
- * GridFTP:
- *  Globus File Transfer Protocol
- *
- * UNICORE_STORAGE_SERVICE:
- *  Storage Service Provided by Unicore
- *
-*/
-enum DataMovementProtocol {
-    SCP,
-    SFTP,
-    GridFTP,
-    UNICORE_STORAGE_SERVICE
-}
-
-/**
- * Enumeration of security authentication and authorization mechanisms supported by Airavata.
This enumeration just
- *  describes the supported mechanism. The corresponding security credentials are registered
with Airavata Credential
- *  store.
- *
- * USERNAME_PASSWORD:
- *  A User Name.
- *
- * SSH_KEYS:
- *  SSH Keys
- *
-*/
-enum SecurityProtocol {
-    USERNAME_PASSWORD,
-    SSH_KEYS,
-    GSI,
-    KERBEROS,
-    OAUTH
-}
-
-
-
-struct SCPDataMovement {
-    1: required string dataMovementDataID = DEFAULT_ID,
-    2: required SecurityProtocol securityProtocol,
-    3: optional i32 sshPort = 22
-}
-
-struct GridFTPDataMovement {
-    1: required string dataMovementDataID = DEFAULT_ID,
-    2: required SecurityProtocol securityProtocol,
-    3: required list<string>  gridFTPEndPoint
-}
-
-struct SSHJobSubmission {
-    1: required string jobSubmissionDataID = DEFAULT_ID,
-    2: required ResourceJobManager resourceJobManager,
-    3: optional i32 sshPort = 22
-}
-
-struct GlobusJobSubmission {
-    1: required string jobSubmissionDataID = DEFAULT_ID,
-    2: required SecurityProtocol securityProtocol,
-    3: required ResourceJobManager resourceJobManager,
-    4: optional list<string> globusGateKeeperEndPoint
-}
-
-struct GSISSHJobSubmission {
-    1: required string jobSubmissionDataID = DEFAULT_ID,
-    2: required ResourceJobManager resourceJobManager,
-    3: optional i32 sshPort = 22,
-    4: optional set<string> exports,
-    5: optional list<string> preJobCommands,
-    6: optional list<string> postJobCommands,
-    7: optional string installedPath,
-    8: optional string monitorMode
-}
-
-/**
  * Gateway Profile
  *
  * resourceId:


Mime
View raw message