airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject airavata git commit: Using the tables from compute resoueces
Date Wed, 11 Nov 2015 16:46:15 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop 5b9a48d57 -> c96f66b52


Using the tables from compute resoueces


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

Branch: refs/heads/develop
Commit: c96f66b528daa97cdeb06b03fa7143fd6b039be1
Parents: 5b9a48d
Author: smarru <smarru@apache.org>
Authored: Wed Nov 11 11:46:12 2015 -0500
Committer: smarru <smarru@apache.org>
Committed: Wed Nov 11 11:46:12 2015 -0500

----------------------------------------------------------------------
 .../airavata-api/app_catalog_models.thrift      |   1 +
 .../airavata-api/storage_resource_model.thrift  | 120 +------------------
 2 files changed, 3 insertions(+), 118 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/c96f66b5/thrift-interface-descriptions/airavata-api/app_catalog_models.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/app_catalog_models.thrift b/thrift-interface-descriptions/airavata-api/app_catalog_models.thrift
index ad3cfe1..149b129 100644
--- a/thrift-interface-descriptions/airavata-api/app_catalog_models.thrift
+++ b/thrift-interface-descriptions/airavata-api/app_catalog_models.thrift
@@ -19,6 +19,7 @@
  */
 
 include "compute_resource_model.thrift"
+include "storage_resource_model.thrift"
 include "application_deployment_model.thrift"
 include "application_interface_model.thrift"
 include "gateway_resource_profile_model.thrift"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/c96f66b5/thrift-interface-descriptions/airavata-api/storage_resource_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/storage_resource_model.thrift b/thrift-interface-descriptions/airavata-api/storage_resource_model.thrift
index 655d90d..f66b88f 100644
--- a/thrift-interface-descriptions/airavata-api/storage_resource_model.thrift
+++ b/thrift-interface-descriptions/airavata-api/storage_resource_model.thrift
@@ -19,129 +19,13 @@
  */
 
 include "airavata_commons.thrift"
+include "compute_resource_model.thrift"
 
 namespace java org.apache.airavata.model.appcatalog.storageresource
 namespace php Airavata.Model.AppCatalog.StorageResource
 namespace cpp apache.airavata.model.appcatalog.storageresource
 namespace py apache.airavata.model.appcatalog.storageresource
 
-
-/**
- * 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,
-    LOCAL
-}
-
-/**
- * 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 {
-    LOCAL,
-    SCP,
-    SFTP,
-    GridFTP,
-    UNICORE_STORAGE_SERVICE
-}
-
-/**
- * Data Movement through Secured Copy
- *
- * alternativeSCPHostName:
- *  If the login to scp is different than the hostname itself, specify it here
- *
- * sshPort:
- *  If a non-default port needs to used, specify it.
-*/
-struct SCPDataMovement {
-    1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID,
-    2: required SecurityProtocol securityProtocol,
-    3: optional string alternativeSCPHostName,
-    4: optional i32 sshPort = 22
-}
-
-/**
- * Data Movement through GridFTP
- *
- * alternativeSCPHostName:
- *  If the login to scp is different than the hostname itself, specify it here
- *
- * sshPort:
- *  If a non-default port needs to used, specify it.
-*/
-struct GridFTPDataMovement {
-    1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID,
-    2: required SecurityProtocol securityProtocol,
-    3: required list<string> gridFTPEndPoints
-}
-
-/**
- * Data Movement through UnicoreStorage
- *
- * unicoreEndPointURL:
- *  unicoreGateway End Point. The provider will query this service to fetch required service
end points.
-*/
-struct UnicoreDataMovement {
-    1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID,
-    2: required SecurityProtocol securityProtocol,
-    3: required string unicoreEndPointURL
-}
-
-/**
- * LOCAL
- *
- * alternativeSCPHostName:
- *  If the login to scp is different than the hostname itself, specify it here
- *
- * sshPort:
- *  If a non-defualt port needs to used, specify it.
-*/
-struct LOCALDataMovement {
-    1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID,
-}
-
-
-/**
- * Data Movement Interfaces
- *
- * dataMovementInterfaceId: The Data Movement Interface has to be previously registered and
referenced here.
- *
- * priorityOrder:
- *  For resources with multiple interfaces, the priority order should be selected.
- *   Lower the numerical number, higher the priority
- *
-*/
-struct DataMovementInterface {
-    1: required string dataMovementInterfaceId,
-    2: required DataMovementProtocol dataMovementProtocol,
-    3: required i32 priorityOrder = 0,
-}
-
 /**
  * Storage Resource Description
  *
@@ -164,5 +48,5 @@ struct StorageResourceDescription {
     2: required string hostName,
     3: optional string storageResourceDescription,
     4: optional bool enabled,
-    5: optional list<DataMovementInterface> dataMovementInterfaces,
+    5: optional list<compute_resource_model.DataMovementInterface> dataMovementInterfaces,
 }


Mime
View raw message