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 06CF918A3D for ; Fri, 4 Dec 2015 21:01:30 +0000 (UTC) Received: (qmail 70275 invoked by uid 500); 4 Dec 2015 21:01:26 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 70222 invoked by uid 500); 4 Dec 2015 21:01:26 -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 70114 invoked by uid 99); 4 Dec 2015 21:01:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Dec 2015 21:01:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AD945E09AF; Fri, 4 Dec 2015 21:01:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Date: Fri, 04 Dec 2015 21:01:30 -0000 Message-Id: <86c01eb2cbe84eff9fcca72888726fff@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/54] [abbrv] airavata git commit: adding data storage interface http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java index e7d3ec6..1e6f325 100644 --- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java +++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23") public class Airavata { public interface Iface { @@ -1435,11 +1435,12 @@ public class Airavata { * * * @param authzToken - * @param computeResourceId + * @param resourceId + * @param dataMoveType * @param priorityOrder * @param localDataMovement */ - public String addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; + public String addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; /** * Update the given Local data movement details @@ -1490,11 +1491,12 @@ public class Airavata { * * * @param authzToken - * @param computeResourceId + * @param resourceId + * @param dataMoveType * @param priorityOrder * @param scpDataMovement */ - public String addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; + public String addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; /** * Update the given scp data movement details @@ -1528,7 +1530,7 @@ public class Airavata { */ public org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement getSCPDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; - public String addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; + public String addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; public boolean updateUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; @@ -1552,11 +1554,12 @@ public class Airavata { * * * @param authzToken - * @param computeResourceId + * @param resourceId + * @param dataMoveType * @param priorityOrder * @param gridFTPDataMovement */ - public String addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; + public String addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; /** * Update the given GridFTP data movement details to a compute resource @@ -2072,25 +2075,25 @@ public class Airavata { public void updateUnicoreJobSubmissionDetails(org.apache.airavata.model.security.AuthzToken authzToken, String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission unicoreJobSubmission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void updateLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getLocalDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void updateSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getSCPDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void updateUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getUnicoreDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void updateGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -5317,17 +5320,18 @@ public class Airavata { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateUnicoreJobSubmissionDetails failed: unknown result"); } - public String addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException + public String addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException { - send_addLocalDataMovementDetails(authzToken, computeResourceId, priorityOrder, localDataMovement); + send_addLocalDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement); return recv_addLocalDataMovementDetails(); } - public void send_addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement) throws org.apache.thrift.TException + public void send_addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement) throws org.apache.thrift.TException { addLocalDataMovementDetails_args args = new addLocalDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setComputeResourceId(computeResourceId); + args.setResourceId(resourceId); + args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setLocalDataMovement(localDataMovement); sendBase("addLocalDataMovementDetails", args); @@ -5428,17 +5432,18 @@ public class Airavata { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLocalDataMovement failed: unknown result"); } - public String addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException + public String addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException { - send_addSCPDataMovementDetails(authzToken, computeResourceId, priorityOrder, scpDataMovement); + send_addSCPDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement); return recv_addSCPDataMovementDetails(); } - public void send_addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement) throws org.apache.thrift.TException + public void send_addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement) throws org.apache.thrift.TException { addSCPDataMovementDetails_args args = new addSCPDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setComputeResourceId(computeResourceId); + args.setResourceId(resourceId); + args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setScpDataMovement(scpDataMovement); sendBase("addSCPDataMovementDetails", args); @@ -5539,17 +5544,18 @@ public class Airavata { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getSCPDataMovement failed: unknown result"); } - public String addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException + public String addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException { - send_addUnicoreDataMovementDetails(authzToken, computeResourceId, priorityOrder, unicoreDataMovement); + send_addUnicoreDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement); return recv_addUnicoreDataMovementDetails(); } - public void send_addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement) throws org.apache.thrift.TException + public void send_addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement) throws org.apache.thrift.TException { addUnicoreDataMovementDetails_args args = new addUnicoreDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setComputeResourceId(computeResourceId); + args.setResourceId(resourceId); + args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setUnicoreDataMovement(unicoreDataMovement); sendBase("addUnicoreDataMovementDetails", args); @@ -5650,17 +5656,18 @@ public class Airavata { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getUnicoreDataMovement failed: unknown result"); } - public String addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException + public String addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException { - send_addGridFTPDataMovementDetails(authzToken, computeResourceId, priorityOrder, gridFTPDataMovement); + send_addGridFTPDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement); return recv_addGridFTPDataMovementDetails(); } - public void send_addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement) throws org.apache.thrift.TException + public void send_addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement) throws org.apache.thrift.TException { addGridFTPDataMovementDetails_args args = new addGridFTPDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setComputeResourceId(computeResourceId); + args.setResourceId(resourceId); + args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setGridFTPDataMovement(gridFTPDataMovement); sendBase("addGridFTPDataMovementDetails", args); @@ -10175,22 +10182,24 @@ public class Airavata { } } - public void addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - addLocalDataMovementDetails_call method_call = new addLocalDataMovementDetails_call(authzToken, computeResourceId, priorityOrder, localDataMovement, resultHandler, this, ___protocolFactory, ___transport); + addLocalDataMovementDetails_call method_call = new addLocalDataMovementDetails_call(authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class addLocalDataMovementDetails_call extends org.apache.thrift.async.TAsyncMethodCall { private org.apache.airavata.model.security.AuthzToken authzToken; - private String computeResourceId; + private String resourceId; + private org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType; private int priorityOrder; private org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement; - public addLocalDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public addLocalDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.authzToken = authzToken; - this.computeResourceId = computeResourceId; + this.resourceId = resourceId; + this.dataMoveType = dataMoveType; this.priorityOrder = priorityOrder; this.localDataMovement = localDataMovement; } @@ -10199,7 +10208,8 @@ public class Airavata { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addLocalDataMovementDetails", org.apache.thrift.protocol.TMessageType.CALL, 0)); addLocalDataMovementDetails_args args = new addLocalDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setComputeResourceId(computeResourceId); + args.setResourceId(resourceId); + args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setLocalDataMovement(localDataMovement); args.write(prot); @@ -10289,22 +10299,24 @@ public class Airavata { } } - public void addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - addSCPDataMovementDetails_call method_call = new addSCPDataMovementDetails_call(authzToken, computeResourceId, priorityOrder, scpDataMovement, resultHandler, this, ___protocolFactory, ___transport); + addSCPDataMovementDetails_call method_call = new addSCPDataMovementDetails_call(authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class addSCPDataMovementDetails_call extends org.apache.thrift.async.TAsyncMethodCall { private org.apache.airavata.model.security.AuthzToken authzToken; - private String computeResourceId; + private String resourceId; + private org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType; private int priorityOrder; private org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement; - public addSCPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public addSCPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.authzToken = authzToken; - this.computeResourceId = computeResourceId; + this.resourceId = resourceId; + this.dataMoveType = dataMoveType; this.priorityOrder = priorityOrder; this.scpDataMovement = scpDataMovement; } @@ -10313,7 +10325,8 @@ public class Airavata { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addSCPDataMovementDetails", org.apache.thrift.protocol.TMessageType.CALL, 0)); addSCPDataMovementDetails_args args = new addSCPDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setComputeResourceId(computeResourceId); + args.setResourceId(resourceId); + args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setScpDataMovement(scpDataMovement); args.write(prot); @@ -10403,22 +10416,24 @@ public class Airavata { } } - public void addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - addUnicoreDataMovementDetails_call method_call = new addUnicoreDataMovementDetails_call(authzToken, computeResourceId, priorityOrder, unicoreDataMovement, resultHandler, this, ___protocolFactory, ___transport); + addUnicoreDataMovementDetails_call method_call = new addUnicoreDataMovementDetails_call(authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class addUnicoreDataMovementDetails_call extends org.apache.thrift.async.TAsyncMethodCall { private org.apache.airavata.model.security.AuthzToken authzToken; - private String computeResourceId; + private String resourceId; + private org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType; private int priorityOrder; private org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement; - public addUnicoreDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public addUnicoreDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.authzToken = authzToken; - this.computeResourceId = computeResourceId; + this.resourceId = resourceId; + this.dataMoveType = dataMoveType; this.priorityOrder = priorityOrder; this.unicoreDataMovement = unicoreDataMovement; } @@ -10427,7 +10442,8 @@ public class Airavata { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addUnicoreDataMovementDetails", org.apache.thrift.protocol.TMessageType.CALL, 0)); addUnicoreDataMovementDetails_args args = new addUnicoreDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setComputeResourceId(computeResourceId); + args.setResourceId(resourceId); + args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setUnicoreDataMovement(unicoreDataMovement); args.write(prot); @@ -10517,22 +10533,24 @@ public class Airavata { } } - public void addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - addGridFTPDataMovementDetails_call method_call = new addGridFTPDataMovementDetails_call(authzToken, computeResourceId, priorityOrder, gridFTPDataMovement, resultHandler, this, ___protocolFactory, ___transport); + addGridFTPDataMovementDetails_call method_call = new addGridFTPDataMovementDetails_call(authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class addGridFTPDataMovementDetails_call extends org.apache.thrift.async.TAsyncMethodCall { private org.apache.airavata.model.security.AuthzToken authzToken; - private String computeResourceId; + private String resourceId; + private org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType; private int priorityOrder; private org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement; - public addGridFTPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public addGridFTPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.authzToken = authzToken; - this.computeResourceId = computeResourceId; + this.resourceId = resourceId; + this.dataMoveType = dataMoveType; this.priorityOrder = priorityOrder; this.gridFTPDataMovement = gridFTPDataMovement; } @@ -10541,7 +10559,8 @@ public class Airavata { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addGridFTPDataMovementDetails", org.apache.thrift.protocol.TMessageType.CALL, 0)); addGridFTPDataMovementDetails_args args = new addGridFTPDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setComputeResourceId(computeResourceId); + args.setResourceId(resourceId); + args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setGridFTPDataMovement(gridFTPDataMovement); args.write(prot); @@ -14591,7 +14610,7 @@ public class Airavata { public addLocalDataMovementDetails_result getResult(I iface, addLocalDataMovementDetails_args args) throws org.apache.thrift.TException { addLocalDataMovementDetails_result result = new addLocalDataMovementDetails_result(); try { - result.success = iface.addLocalDataMovementDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.localDataMovement); + result.success = iface.addLocalDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.localDataMovement); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; } catch (org.apache.airavata.model.error.AiravataClientException ace) { @@ -14682,7 +14701,7 @@ public class Airavata { public addSCPDataMovementDetails_result getResult(I iface, addSCPDataMovementDetails_args args) throws org.apache.thrift.TException { addSCPDataMovementDetails_result result = new addSCPDataMovementDetails_result(); try { - result.success = iface.addSCPDataMovementDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.scpDataMovement); + result.success = iface.addSCPDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.scpDataMovement); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; } catch (org.apache.airavata.model.error.AiravataClientException ace) { @@ -14773,7 +14792,7 @@ public class Airavata { public addUnicoreDataMovementDetails_result getResult(I iface, addUnicoreDataMovementDetails_args args) throws org.apache.thrift.TException { addUnicoreDataMovementDetails_result result = new addUnicoreDataMovementDetails_result(); try { - result.success = iface.addUnicoreDataMovementDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.unicoreDataMovement); + result.success = iface.addUnicoreDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.unicoreDataMovement); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; } catch (org.apache.airavata.model.error.AiravataClientException ace) { @@ -14864,7 +14883,7 @@ public class Airavata { public addGridFTPDataMovementDetails_result getResult(I iface, addGridFTPDataMovementDetails_args args) throws org.apache.thrift.TException { addGridFTPDataMovementDetails_result result = new addGridFTPDataMovementDetails_result(); try { - result.success = iface.addGridFTPDataMovementDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.gridFTPDataMovement); + result.success = iface.addGridFTPDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.gridFTPDataMovement); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; } catch (org.apache.airavata.model.error.AiravataClientException ace) { @@ -22328,7 +22347,7 @@ public class Airavata { } public void start(I iface, addLocalDataMovementDetails_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { - iface.addLocalDataMovementDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.localDataMovement,resultHandler); + iface.addLocalDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.localDataMovement,resultHandler); } } @@ -22545,7 +22564,7 @@ public class Airavata { } public void start(I iface, addSCPDataMovementDetails_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { - iface.addSCPDataMovementDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.scpDataMovement,resultHandler); + iface.addSCPDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.scpDataMovement,resultHandler); } } @@ -22762,7 +22781,7 @@ public class Airavata { } public void start(I iface, addUnicoreDataMovementDetails_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { - iface.addUnicoreDataMovementDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.unicoreDataMovement,resultHandler); + iface.addUnicoreDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.unicoreDataMovement,resultHandler); } } @@ -22979,7 +22998,7 @@ public class Airavata { } public void start(I iface, addGridFTPDataMovementDetails_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { - iface.addGridFTPDataMovementDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.gridFTPDataMovement,resultHandler); + iface.addGridFTPDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.gridFTPDataMovement,resultHandler); } } @@ -140763,9 +140782,10 @@ public class Airavata { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addLocalDataMovementDetails_args"); private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceId", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField PRIORITY_ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("priorityOrder", org.apache.thrift.protocol.TType.I32, (short)3); - private static final org.apache.thrift.protocol.TField LOCAL_DATA_MOVEMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("localDataMovement", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField DATA_MOVE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMoveType", org.apache.thrift.protocol.TType.I32, (short)3); + private static final org.apache.thrift.protocol.TField PRIORITY_ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("priorityOrder", org.apache.thrift.protocol.TType.I32, (short)4); + private static final org.apache.thrift.protocol.TField LOCAL_DATA_MOVEMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("localDataMovement", org.apache.thrift.protocol.TType.STRUCT, (short)5); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -140774,16 +140794,26 @@ public class Airavata { } public org.apache.airavata.model.security.AuthzToken authzToken; // required - public String computeResourceId; // required + public String resourceId; // required + /** + * + * @see org.apache.airavata.model.appcatalog.computeresource.DMType + */ + public org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType; // required public int priorityOrder; // required public org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { AUTHZ_TOKEN((short)1, "authzToken"), - COMPUTE_RESOURCE_ID((short)2, "computeResourceId"), - PRIORITY_ORDER((short)3, "priorityOrder"), - LOCAL_DATA_MOVEMENT((short)4, "localDataMovement"); + RESOURCE_ID((short)2, "resourceId"), + /** + * + * @see org.apache.airavata.model.appcatalog.computeresource.DMType + */ + DATA_MOVE_TYPE((short)3, "dataMoveType"), + PRIORITY_ORDER((short)4, "priorityOrder"), + LOCAL_DATA_MOVEMENT((short)5, "localDataMovement"); private static final Map byName = new HashMap(); @@ -140800,11 +140830,13 @@ public class Airavata { switch(fieldId) { case 1: // AUTHZ_TOKEN return AUTHZ_TOKEN; - case 2: // COMPUTE_RESOURCE_ID - return COMPUTE_RESOURCE_ID; - case 3: // PRIORITY_ORDER + case 2: // RESOURCE_ID + return RESOURCE_ID; + case 3: // DATA_MOVE_TYPE + return DATA_MOVE_TYPE; + case 4: // PRIORITY_ORDER return PRIORITY_ORDER; - case 4: // LOCAL_DATA_MOVEMENT + case 5: // LOCAL_DATA_MOVEMENT return LOCAL_DATA_MOVEMENT; default: return null; @@ -140853,8 +140885,10 @@ public class Airavata { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class))); - tmpMap.put(_Fields.COMPUTE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("computeResourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.DATA_MOVE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("dataMoveType", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.appcatalog.computeresource.DMType.class))); tmpMap.put(_Fields.PRIORITY_ORDER, new org.apache.thrift.meta_data.FieldMetaData("priorityOrder", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.LOCAL_DATA_MOVEMENT, new org.apache.thrift.meta_data.FieldMetaData("localDataMovement", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -140868,13 +140902,15 @@ public class Airavata { public addLocalDataMovementDetails_args( org.apache.airavata.model.security.AuthzToken authzToken, - String computeResourceId, + String resourceId, + org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement) { this(); this.authzToken = authzToken; - this.computeResourceId = computeResourceId; + this.resourceId = resourceId; + this.dataMoveType = dataMoveType; this.priorityOrder = priorityOrder; setPriorityOrderIsSet(true); this.localDataMovement = localDataMovement; @@ -140888,8 +140924,11 @@ public class Airavata { if (other.isSetAuthzToken()) { this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken); } - if (other.isSetComputeResourceId()) { - this.computeResourceId = other.computeResourceId; + if (other.isSetResourceId()) { + this.resourceId = other.resourceId; + } + if (other.isSetDataMoveType()) { + this.dataMoveType = other.dataMoveType; } this.priorityOrder = other.priorityOrder; if (other.isSetLocalDataMovement()) { @@ -140904,7 +140943,8 @@ public class Airavata { @Override public void clear() { this.authzToken = null; - this.computeResourceId = null; + this.resourceId = null; + this.dataMoveType = null; setPriorityOrderIsSet(false); this.priorityOrder = 0; this.localDataMovement = null; @@ -140934,27 +140974,59 @@ public class Airavata { } } - public String getComputeResourceId() { - return this.computeResourceId; + public String getResourceId() { + return this.resourceId; } - public addLocalDataMovementDetails_args setComputeResourceId(String computeResourceId) { - this.computeResourceId = computeResourceId; + public addLocalDataMovementDetails_args setResourceId(String resourceId) { + this.resourceId = resourceId; return this; } - public void unsetComputeResourceId() { - this.computeResourceId = null; + public void unsetResourceId() { + this.resourceId = null; } - /** Returns true if field computeResourceId is set (has been assigned a value) and false otherwise */ - public boolean isSetComputeResourceId() { - return this.computeResourceId != null; + /** Returns true if field resourceId is set (has been assigned a value) and false otherwise */ + public boolean isSetResourceId() { + return this.resourceId != null; } - public void setComputeResourceIdIsSet(boolean value) { + public void setResourceIdIsSet(boolean value) { if (!value) { - this.computeResourceId = null; + this.resourceId = null; + } + } + + /** + * + * @see org.apache.airavata.model.appcatalog.computeresource.DMType + */ + public org.apache.airavata.model.appcatalog.computeresource.DMType getDataMoveType() { + return this.dataMoveType; + } + + /** + * + * @see org.apache.airavata.model.appcatalog.computeresource.DMType + */ + public addLocalDataMovementDetails_args setDataMoveType(org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType) { + this.dataMoveType = dataMoveType; + return this; + } + + public void unsetDataMoveType() { + this.dataMoveType = null; + } + + /** Returns true if field dataMoveType is set (has been assigned a value) and false otherwise */ + public boolean isSetDataMoveType() { + return this.dataMoveType != null; + } + + public void setDataMoveTypeIsSet(boolean value) { + if (!value) { + this.dataMoveType = null; } } @@ -141015,11 +141087,19 @@ public class Airavata { } break; - case COMPUTE_RESOURCE_ID: + case RESOURCE_ID: if (value == null) { - unsetComputeResourceId(); + unsetResourceId(); } else { - setComputeResourceId((String)value); + setResourceId((String)value); + } + break; + + case DATA_MOVE_TYPE: + if (value == null) { + unsetDataMoveType(); + } else { + setDataMoveType((org.apache.airavata.model.appcatalog.computeresource.DMType)value); } break; @@ -141047,8 +141127,11 @@ public class Airavata { case AUTHZ_TOKEN: return getAuthzToken(); - case COMPUTE_RESOURCE_ID: - return getComputeResourceId(); + case RESOURCE_ID: + return getResourceId(); + + case DATA_MOVE_TYPE: + return getDataMoveType(); case PRIORITY_ORDER: return Integer.valueOf(getPriorityOrder()); @@ -141069,8 +141152,10 @@ public class Airavata { switch (field) { case AUTHZ_TOKEN: return isSetAuthzToken(); - case COMPUTE_RESOURCE_ID: - return isSetComputeResourceId(); + case RESOURCE_ID: + return isSetResourceId(); + case DATA_MOVE_TYPE: + return isSetDataMoveType(); case PRIORITY_ORDER: return isSetPriorityOrder(); case LOCAL_DATA_MOVEMENT: @@ -141101,12 +141186,21 @@ public class Airavata { return false; } - boolean this_present_computeResourceId = true && this.isSetComputeResourceId(); - boolean that_present_computeResourceId = true && that.isSetComputeResourceId(); - if (this_present_computeResourceId || that_present_computeResourceId) { - if (!(this_present_computeResourceId && that_present_computeResourceId)) + boolean this_present_resourceId = true && this.isSetResourceId(); + boolean that_present_resourceId = true && that.isSetResourceId(); + if (this_present_resourceId || that_present_resourceId) { + if (!(this_present_resourceId && that_present_resourceId)) return false; - if (!this.computeResourceId.equals(that.computeResourceId)) + if (!this.resourceId.equals(that.resourceId)) + return false; + } + + boolean this_present_dataMoveType = true && this.isSetDataMoveType(); + boolean that_present_dataMoveType = true && that.isSetDataMoveType(); + if (this_present_dataMoveType || that_present_dataMoveType) { + if (!(this_present_dataMoveType && that_present_dataMoveType)) + return false; + if (!this.dataMoveType.equals(that.dataMoveType)) return false; } @@ -141140,10 +141234,15 @@ public class Airavata { if (present_authzToken) list.add(authzToken); - boolean present_computeResourceId = true && (isSetComputeResourceId()); - list.add(present_computeResourceId); - if (present_computeResourceId) - list.add(computeResourceId); + boolean present_resourceId = true && (isSetResourceId()); + list.add(present_resourceId); + if (present_resourceId) + list.add(resourceId); + + boolean present_dataMoveType = true && (isSetDataMoveType()); + list.add(present_dataMoveType); + if (present_dataMoveType) + list.add(dataMoveType.getValue()); boolean present_priorityOrder = true; list.add(present_priorityOrder); @@ -141176,12 +141275,22 @@ public class Airavata { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetComputeResourceId()).compareTo(other.isSetComputeResourceId()); + lastComparison = Boolean.valueOf(isSetResourceId()).compareTo(other.isSetResourceId()); if (lastComparison != 0) { return lastComparison; } - if (isSetComputeResourceId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.computeResourceId, other.computeResourceId); + if (isSetResourceId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceId, other.resourceId); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetDataMoveType()).compareTo(other.isSetDataMoveType()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetDataMoveType()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMoveType, other.dataMoveType); if (lastComparison != 0) { return lastComparison; } @@ -141234,11 +141343,19 @@ public class Airavata { } first = false; if (!first) sb.append(", "); - sb.append("computeResourceId:"); - if (this.computeResourceId == null) { + sb.append("resourceId:"); + if (this.resourceId == null) { sb.append("null"); } else { - sb.append(this.computeResourceId); + sb.append(this.resourceId); + } + first = false; + if (!first) sb.append(", "); + sb.append("dataMoveType:"); + if (this.dataMoveType == null) { + sb.append("null"); + } else { + sb.append(this.dataMoveType); } first = false; if (!first) sb.append(", "); @@ -141262,8 +141379,11 @@ public class Airavata { if (authzToken == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString()); } - if (computeResourceId == null) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'computeResourceId' was not present! Struct: " + toString()); + if (resourceId == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceId' was not present! Struct: " + toString()); + } + if (dataMoveType == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMoveType' was not present! Struct: " + toString()); } // alas, we cannot check 'priorityOrder' because it's a primitive and you chose the non-beans generator. if (localDataMovement == null) { @@ -141323,15 +141443,23 @@ public class Airavata { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // COMPUTE_RESOURCE_ID + case 2: // RESOURCE_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.computeResourceId = iprot.readString(); - struct.setComputeResourceIdIsSet(true); + struct.resourceId = iprot.readString(); + struct.setResourceIdIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // PRIORITY_ORDER + case 3: // DATA_MOVE_TYPE + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.dataMoveType = org.apache.airavata.model.appcatalog.computeresource.DMType.findByValue(iprot.readI32()); + struct.setDataMoveTypeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // PRIORITY_ORDER if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.priorityOrder = iprot.readI32(); struct.setPriorityOrderIsSet(true); @@ -141339,7 +141467,7 @@ public class Airavata { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // LOCAL_DATA_MOVEMENT + case 5: // LOCAL_DATA_MOVEMENT if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.localDataMovement = new org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement(); struct.localDataMovement.read(iprot); @@ -141371,9 +141499,14 @@ public class Airavata { struct.authzToken.write(oprot); oprot.writeFieldEnd(); } - if (struct.computeResourceId != null) { - oprot.writeFieldBegin(COMPUTE_RESOURCE_ID_FIELD_DESC); - oprot.writeString(struct.computeResourceId); + if (struct.resourceId != null) { + oprot.writeFieldBegin(RESOURCE_ID_FIELD_DESC); + oprot.writeString(struct.resourceId); + oprot.writeFieldEnd(); + } + if (struct.dataMoveType != null) { + oprot.writeFieldBegin(DATA_MOVE_TYPE_FIELD_DESC); + oprot.writeI32(struct.dataMoveType.getValue()); oprot.writeFieldEnd(); } oprot.writeFieldBegin(PRIORITY_ORDER_FIELD_DESC); @@ -141402,7 +141535,8 @@ public class Airavata { public void write(org.apache.thrift.protocol.TProtocol prot, addLocalDataMovementDetails_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; struct.authzToken.write(oprot); - oprot.writeString(struct.computeResourceId); + oprot.writeString(struct.resourceId); + oprot.writeI32(struct.dataMoveType.getValue()); oprot.writeI32(struct.priorityOrder); struct.localDataMovement.write(oprot); } @@ -141413,8 +141547,10 @@ public class Airavata { struct.authzToken = new org.apache.airavata.model.security.AuthzToken(); struct.authzToken.read(iprot); struct.setAuthzTokenIsSet(true); - struct.computeResourceId = iprot.readString(); - struct.setComputeResourceIdIsSet(true); + struct.resourceId = iprot.readString(); + struct.setResourceIdIsSet(true); + struct.dataMoveType = org.apache.airavata.model.appcatalog.computeresource.DMType.findByValue(iprot.readI32()); + struct.setDataMoveTypeIsSet(true); struct.priorityOrder = iprot.readI32(); struct.setPriorityOrderIsSet(true); struct.localDataMovement = new org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement(); @@ -144827,9 +144963,10 @@ public class Airavata { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addSCPDataMovementDetails_args"); private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceId", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField PRIORITY_ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("priorityOrder", org.apache.thrift.protocol.TType.I32, (short)3); - private static final org.apache.thrift.protocol.TField SCP_DATA_MOVEMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("scpDataMovement", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField DATA_MOVE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMoveType", org.apache.thrift.protocol.TType.I32, (short)3); + private static final org.apache.thrift.protocol.TField PRIORITY_ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("priorityOrder", org.apache.thrift.protocol.TType.I32, (short)4); + private static final org.apache.thrift.protocol.TField SCP_DATA_MOVEMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("scpDataMovement", org.apache.thrift.protocol.TType.STRUCT, (short)5); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -144838,16 +144975,26 @@ public class Airavata { } public org.apache.airavata.model.security.AuthzToken authzToken; // required - public String computeResourceId; // required + public String resourceId; // required + /** + * + * @see org.apache.airavata.model.appcatalog.computeresource.DMType + */ + public org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType; // required public int priorityOrder; // required public org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { AUTHZ_TOKEN((short)1, "authzToken"), - COMPUTE_RESOURCE_ID((short)2, "computeResourceId"), - PRIORITY_ORDER((short)3, "priorityOrder"), - SCP_DATA_MOVEMENT((short)4, "scpDataMovement"); + RESOURCE_ID((short)2, "resourceId"), + /** + * + * @see org.apache.airavata.model.appcatalog.computeresource.DMType + */ + DATA_MOVE_TYPE((short)3, "dataMoveType"), + PRIORITY_ORDER((short)4, "priorityOrder"), + SCP_DATA_MOVEMENT((short)5, "scpDataMovement"); private static final Map byName = new HashMap(); @@ -144864,11 +145011,13 @@ public class Airavata { switch(fieldId) { case 1: // AUTHZ_TOKEN return AUTHZ_TOKEN; - case 2: // COMPUTE_RESOURCE_ID - return COMPUTE_RESOURCE_ID; - case 3: // PRIORITY_ORDER + case 2: // RESOURCE_ID + return RESOURCE_ID; + case 3: // DATA_MOVE_TYPE + return DATA_MOVE_TYPE; + case 4: // PRIORITY_ORDER return PRIORITY_ORDER; - case 4: // SCP_DATA_MOVEMENT + case 5: // SCP_DATA_MOVEMENT return SCP_DATA_MOVEMENT; default: return null; @@ -144917,8 +145066,10 @@ public class Airavata { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class))); - tmpMap.put(_Fields.COMPUTE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("computeResourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.DATA_MOVE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("dataMoveType", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.appcatalog.computeresource.DMType.class))); tmpMap.put(_Fields.PRIORITY_ORDER, new org.apache.thrift.meta_data.FieldMetaData("priorityOrder", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.SCP_DATA_MOVEMENT, new org.apache.thrift.meta_data.FieldMetaData("scpDataMovement", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -144932,13 +145083,15 @@ public class Airavata { public addSCPDataMovementDetails_args( org.apache.airavata.model.security.AuthzToken authzToken, - String computeResourceId, + String resourceId, + org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement) { this(); this.authzToken = authzToken; - this.computeResourceId = computeResourceId; + this.resourceId = resourceId; + this.dataMoveType = dataMoveType; this.priorityOrder = priorityOrder; setPriorityOrderIsSet(true); this.scpDataMovement = scpDataMovement; @@ -144952,8 +145105,11 @@ public class Airavata { if (other.isSetAuthzToken()) { this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken); } - if (other.isSetComputeResourceId()) { - this.computeResourceId = other.computeResourceId; + if (other.isSetResourceId()) { + this.resourceId = other.resourceId; + } + if (other.isSetDataMoveType()) { + this.dataMoveType = other.dataMoveType; } this.priorityOrder = other.priorityOrder; if (other.isSetScpDataMovement()) { @@ -144968,7 +145124,8 @@ public class Airavata { @Override public void clear() { this.authzToken = null; - this.computeResourceId = null; + this.resourceId = null; + this.dataMoveType = null; setPriorityOrderIsSet(false); this.priorityOrder = 0; this.scpDataMovement = null; @@ -144998,27 +145155,59 @@ public class Airavata { } } - public String getComputeResourceId() { - return this.computeResourceId; + public String getResourceId() { + return this.resourceId; } - public addSCPDataMovementDetails_args setComputeResourceId(String computeResourceId) { - this.computeResourceId = computeResourceId; + public addSCPDataMovementDetails_args setResourceId(String resourceId) { + this.resourceId = resourceId; return this; } - public void unsetComputeResourceId() { - this.computeResourceId = null; + public void unsetResourceId() { + this.resourceId = null; } - /** Returns true if field computeResourceId is set (has been assigned a value) and false otherwise */ - public boolean isSetComputeResourceId() { - return this.computeResourceId != null; + /** Returns true if field resourceId is set (has been assigned a value) and false otherwise */ + public boolean isSetResourceId() { + return this.resourceId != null; } - public void setComputeResourceIdIsSet(boolean value) { + public void setResourceIdIsSet(boolean value) { if (!value) { - this.computeResourceId = null; + this.resourceId = null; + } + } + + /** + * + * @see org.apache.airavata.model.appcatalog.computeresource.DMType + */ + public org.apache.airavata.model.appcatalog.computeresource.DMType getDataMoveType() { + return this.dataMoveType; + } + + /** + * + * @see org.apache.airavata.model.appcatalog.computeresource.DMType + */ + public addSCPDataMovementDetails_args setDataMoveType(org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType) { + this.dataMoveType = dataMoveType; + return this; + } + + public void unsetDataMoveType() { + this.dataMoveType = null; + } + + /** Returns true if field dataMoveType is set (has been assigned a value) and false otherwise */ + public boolean isSetDataMoveType() { + return this.dataMoveType != null; + } + + public void setDataMoveTypeIsSet(boolean value) { + if (!value) { + this.dataMoveType = null; } } @@ -145079,11 +145268,19 @@ public class Airavata { } break; - case COMPUTE_RESOURCE_ID: + case RESOURCE_ID: if (value == null) { - unsetComputeResourceId(); + unsetResourceId(); } else { - setComputeResourceId((String)value); + setResourceId((String)value); + } + break; + + case DATA_MOVE_TYPE: + if (value == null) { + unsetDataMoveType(); + } else { + setDataMoveType((org.apache.airavata.model.appcatalog.computeresource.DMType)value); } break; @@ -145111,8 +145308,11 @@ public class Airavata { case AUTHZ_TOKEN: return getAuthzToken(); - case COMPUTE_RESOURCE_ID: - return getComputeResourceId(); + case RESOURCE_ID: + return getResourceId(); + + case DATA_MOVE_TYPE: + return getDataMoveType(); case PRIORITY_ORDER: return Integer.valueOf(getPriorityOrder()); @@ -145133,8 +145333,10 @@ public class Airavata { switch (field) { case AUTHZ_TOKEN: return isSetAuthzToken(); - case COMPUTE_RESOURCE_ID: - return isSetComputeResourceId(); + case RESOURCE_ID: + return isSetResourceId(); + case DATA_MOVE_TYPE: + return isSetDataMoveType(); case PRIORITY_ORDER: return isSetPriorityOrder(); case SCP_DATA_MOVEMENT: @@ -145165,12 +145367,21 @@ public class Airavata { return false; } - boolean this_present_computeResourceId = true && this.isSetComputeResourceId(); - boolean that_present_computeResourceId = true && that.isSetComputeResourceId(); - if (this_present_computeResourceId || that_present_computeResourceId) { - if (!(this_present_computeResourceId && that_present_computeResourceId)) + boolean this_present_resourceId = true && this.isSetResourceId(); + boolean that_present_resourceId = true && that.isSetResourceId(); + if (this_present_resourceId || that_present_resourceId) { + if (!(this_present_resourceId && that_present_resourceId)) return false; - if (!this.computeResourceId.equals(that.computeResourceId)) + if (!this.resourceId.equals(that.resourceId)) + return false; + } + + boolean this_present_dataMoveType = true && this.isSetDataMoveType(); + boolean that_present_dataMoveType = true && that.isSetDataMoveType(); + if (this_present_dataMoveType || that_present_dataMoveType) { + if (!(this_present_dataMoveType && that_present_dataMoveType)) + return false; + if (!this.dataMoveType.equals(that.dataMoveType)) return false; } @@ -145204,10 +145415,15 @@ public class Airavata { if (present_authzToken) list.add(authzToken); - boolean present_computeResourceId = true && (isSetComputeResourceId()); - list.add(present_computeResourceId); - if (present_computeResourceId) - list.add(computeResourceId); + boolean present_resourceId = true && (isSetResourceId()); + list.add(present_resourceId); + if (present_resourceId) + list.add(resourceId); + + boolean present_dataMoveType = true && (isSetDataMoveType()); + list.add(present_dataMoveType); + if (present_dataMoveType) + list.add(dataMoveType.getValue()); boolean present_priorityOrder = true; list.add(present_priorityOrder); @@ -145240,12 +145456,22 @@ public class Airavata { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetComputeResourceId()).compareTo(other.isSetComputeResourceId()); + lastComparison = Boolean.valueOf(isSetResourceId()).compareTo(other.isSetResourceId()); if (lastComparison != 0) { return lastComparison; } - if (isSetComputeResourceId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.computeResourceId, other.computeResourceId); + if (isSetResourceId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceId, other.resourceId); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetDataMoveType()).compareTo(other.isSetDataMoveType()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetDataMoveType()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMoveType, other.dataMoveType); if (lastComparison != 0) { return lastComparison; } @@ -145298,11 +145524,19 @@ public class Airavata { } first = false; if (!first) sb.append(", "); - sb.append("computeResourceId:"); - if (this.computeResourceId == null) { + sb.append("resourceId:"); + if (this.resourceId == null) { sb.append("null"); } else { - sb.append(this.computeResourceId); + sb.append(this.resourceId); + } + first = false; + if (!first) sb.append(", "); + sb.append("dataMoveType:"); + if (this.dataMoveType == null) { + sb.append("null"); + } else { + sb.append(this.dataMoveType); } first = false; if (!first) sb.append(", "); @@ -145326,8 +145560,11 @@ public class Airavata { if (authzToken == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString()); } - if (computeResourceId == null) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'computeResourceId' was not present! Struct: " + toString()); + if (resourceId == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceId' was not present! Struct: " + toString()); + } + if (dataMoveType == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMoveType' was not present! Struct: " + toString()); } // alas, we cannot check 'priorityOrder' because it's a primitive and you chose the non-beans generator. if (scpDataMovement == null) { @@ -145387,15 +145624,23 @@ public class Airavata { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // COMPUTE_RESOURCE_ID + case 2: // RESOURCE_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.computeResourceId = iprot.readString(); - struct.setComputeResourceIdIsSet(true); + struct.resourceId = iprot.readString(); + struct.setResourceIdIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // PRIORITY_ORDER + case 3: // DATA_MOVE_TYPE + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.dataMoveType = org.apache.airavata.model.appcatalog.computeresource.DMType.findByValue(iprot.readI32()); + struct.setDataMoveTypeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // PRIORITY_ORDER if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.priorityOrder = iprot.readI32(); struct.setPriorityOrderIsSet(true); @@ -145403,7 +145648,7 @@ public class Airavata { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // SCP_DATA_MOVEMENT + case 5: // SCP_DATA_MOVEMENT if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.scpDataMovement = new org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement(); struct.scpDataMovement.read(iprot); @@ -145435,9 +145680,14 @@ public class Airavata { struct.authzToken.write(oprot); oprot.writeFieldEnd(); } - if (struct.computeResourceId != null) { - oprot.writeFieldBegin(COMPUTE_RESOURCE_ID_FIELD_DESC); - oprot.writeString(struct.computeResourceId); + if (struct.resourceId != null) { + oprot.writeFieldBegin(RESOURCE_ID_FIELD_DESC); + oprot.writeString(struct.resourceId); + oprot.writeFieldEnd(); + } + if (struct.dataMoveType != null) { + oprot.writeFieldBegin(DATA_MOVE_TYPE_FIELD_DESC); + oprot.writeI32(struct.dataMoveType.getValue()); oprot.writeFieldEnd(); } oprot.writeFieldBegin(PRIORITY_ORDER_FIELD_DESC); @@ -145466,7 +145716,8 @@ public class Airavata { public void write(org.apache.thrift.protocol.TProtocol prot, addSCPDataMovementDetails_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; struct.authzToken.write(oprot); - oprot.writeString(struct.computeResourceId); + oprot.writeString(struct.resourceId); + oprot.writeI32(struct.dataMoveType.getValue()); oprot.writeI32(struct.priorityOrder); struct.scpDataMovement.write(oprot); } @@ -145477,8 +145728,10 @@ public class Airavata { struct.authzToken = new org.apache.airavata.model.security.AuthzToken(); struct.authzToken.read(iprot); struct.setAuthzTokenIsSet(true); - struct.computeResourceId = iprot.readString(); - struct.setComputeResourceIdIsSet(true); + struct.resourceId = iprot.readString(); + struct.setResourceIdIsSet(true); + struct.dataMoveType = org.apache.airavata.model.appcatalog.computeresource.DMType.findByValue(iprot.readI32()); + struct.setDataMoveTypeIsSet(true); struct.priorityOrder = iprot.readI32(); struct.setPriorityOrderIsSet(true); struct.scpDataMovement = new org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement(); @@ -148891,9 +149144,10 @@ public class Airavata { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addUnicoreDataMovementDetails_args"); private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceId", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField PRIORITY_ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("priorityOrder", org.apache.thrift.protocol.TType.I32, (short)3); - private static final org.apache.thrift.protocol.TField UNICORE_DATA_MOVEMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("unicoreDataMovement", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField DATA_MOVE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMoveType", org.apache.thrift.protocol.TType.I32, (short)3); + private static final org.apache.thrift.protocol.TField PRIORITY_ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("priorityOrder", org.apache.thrift.protocol.TType.I32, (short)4); + private static final org.apache.thrift.protocol.TField UNICORE_DATA_MOVEMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("unicoreDataMovement", org.apache.thrift.protocol.TType.STRUCT, (short)5); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -148902,16 +149156,26 @@ public class Airavata { } public org.apache.airavata.model.security.AuthzToken authzToken; // required - public String computeResourceId; // required + public String resourceId; // required + /** + * + * @see org.apache.airavata.model.appcatalog.computeresource.DMType + */ + public org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType; // required public int priorityOrder; // required public org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { AUTHZ_TOKEN((short)1, "authzToken"), - COMPUTE_RESOURCE_ID((short)2, "computeResourceId"), - PRIORITY_ORDER((short)3, "priorityOrder"), - UNICORE_DATA_MOVEMENT((short)4, "unicoreDataMovement"); + RESOURCE_ID((short)2, "resourceId"), + /** + * + * @see org.apache.airavata.model.appcatalog.computeresource.DMType + */ + DATA_MOVE_TYPE((short)3, "dataMoveType"), + PRIORITY_ORDER((short)4, "priorityOrder"), + UNICORE_DATA_MOVEMENT((short)5, "unicoreDataMovement"); private static final Map byName = new HashMap(); @@ -148928,11 +149192,13 @@ public class Airavata { switch(fieldId) { case 1: // AUTHZ_TOKEN return AUTHZ_TOKEN; - case 2: // COMPUTE_RESOURCE_ID - return COMPUTE_RESOURCE_ID; - case 3: // PRIORITY_ORDER + case 2: // RESOURCE_ID + return RESOURCE_ID; + case 3: // DATA_MOVE_TYPE + return DATA_MOVE_TYPE; + case 4: // PRIORITY_ORDER return PRIORITY_ORDER; - case 4: // UNICORE_DATA_MOVEMENT + case 5: // UNICORE_DATA_MOVEMENT return UNICORE_DATA_MOVEMENT; default: return null; @@ -148981,8 +149247,10 @@ public class Airavata { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class))); - tmpMap.put(_Fields.COMPUTE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("computeResourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.DATA_MOVE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("dataMoveType", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.appcatalog.computeresource.DMType.class))); tmpMap.put(_Fields.PRIORITY_ORDER, new org.apache.thrift.meta_data.FieldMetaData("priorityOrder", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.UNICORE_DATA_MOVEMENT, new org.apache.thrift.meta_data.FieldMetaData("unicoreDataMovement", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -148996,13 +149264,15 @@ public class Airavata { public addUnicoreDataMovementDetails_args( org.apache.airavata.model.security.Aut