Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 06EA012D2C for ; Sun, 11 May 2014 01:45:42 +0000 (UTC) Received: (qmail 60999 invoked by uid 500); 10 May 2014 21:56:19 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 58655 invoked by uid 500); 10 May 2014 21:56:14 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 57520 invoked by uid 99); 10 May 2014 21:56:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 May 2014 21:56:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1865A94101E; Thu, 8 May 2014 19:53:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: smarru@apache.org To: commits@airavata.apache.org Message-Id: <8e95fdc90d324ebd97df1cf9e89ceb51@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Updated Compute Resource for discussion - AIRAVATA-1015 Date: Thu, 8 May 2014 19:53:15 +0000 (UTC) Repository: airavata Updated Branches: refs/heads/master 4b4bd903a -> 2fce90ee8 Updated Compute Resource for discussion - AIRAVATA-1015 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2fce90ee Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2fce90ee Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2fce90ee Branch: refs/heads/master Commit: 2fce90ee80f621fa0ccc360b45d81d67ca2d3bc9 Parents: 4b4bd90 Author: Suresh Marru Authored: Thu May 8 15:53:10 2014 -0400 Committer: Suresh Marru Committed: Thu May 8 15:53:10 2014 -0400 ---------------------------------------------------------------------- .../computeResourceDescription.thrift | 74 ++++++++++++-------- 1 file changed, 43 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/2fce90ee/airavata-api/thrift-interface-descriptions/computeResourceDescription.thrift ---------------------------------------------------------------------- diff --git a/airavata-api/thrift-interface-descriptions/computeResourceDescription.thrift b/airavata-api/thrift-interface-descriptions/computeResourceDescription.thrift index 3cac1d3..c004cea 100644 --- a/airavata-api/thrift-interface-descriptions/computeResourceDescription.thrift +++ b/airavata-api/thrift-interface-descriptions/computeResourceDescription.thrift @@ -20,6 +20,8 @@ namespace java org.apache.airavata.model.appcatalog.computeresource +const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS" + /** * Enumeration of local resource job managers supported by Airavata * @@ -104,10 +106,7 @@ enum SecurityProtocol { struct SSHJobSubmission { 1: required SecurityProtocol securityProtocol, 2: required ResourceJobManager resourceJobManager, - 3: optional i32 sshPort = 22, - - //6: optional list preJobCommands, - //7: optional list postJobCommands, + 3: optional i32 sshPort = 22 } struct SCPDataMovement { @@ -115,26 +114,8 @@ struct SCPDataMovement { 2: optional i32 sshPort = 22, } - -struct ec2HostType -{ - 1 : required list imageID, - 2 : required list instanceID, -} - -struct globusHostType -{ - 1 : required list gridFTPEndPoint, - 2 : required list globusGateKeeperEndPoint, -} - -struct UnicoreHostType -{ - 1 : required list unicoreBESEndPoint, -} - /** - * Computational Resource Description + * Job Submission Protocols * * resourceId: * @@ -154,13 +135,44 @@ struct UnicoreHostType * Option to specify a prefered data movement mechanism of the available options. * */ +struct JobSubmissionProtocols { + 1: required bool isEmpty = 0, + 2: optional JobSubmissionProtocol preferedJobSubmissionProtocol, + 3: optional SSHJobSubmission sshJobSubmissionInfo, + 4: optional string globusGRAMHost, + 5: optional i32 globusGRAMPort = 2119, + 6: optional string unicoreBESEndPoint +} + +/** + * Computational Resource Description + * + * resourceId: + * + * hostName: + * Fully Qualified Host Name. + * + * 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 computeResourceDescription { - 1: required string resourceId, - 2: required string hostName, - 3: optional string ipAddress, - 4: optional string resourceDescription, - 5: optional JobSubmissionProtocol preferedJobSubmissionProtocol, - 6: optional DataMovementProtocol preferedDataMovementProtocol, - 7: optional SSHJobSubmission SSHJobSubmission, +struct ComputeResourceDescription { + 1: required bool isEmpty = 0, + 2: required string resourceId = DEFAULT_ID, + 3: required string hostName, + 4: optional string ipAddress, + 5: optional string resourceDescription, + 6: required JobSubmissionProtocols jobSubmissionProtocols, + 7: required DataMovementProtocol dataMovementProtocols } \ No newline at end of file